From 8e3fbf4e98fc1689aa356f8476b5c20f078ed499 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sun, 4 Sep 2016 10:38:53 -0700 Subject: [PATCH 01/35] Add mystery gift database &search Closes #227 --- PKHeX/MainWindow/Main.Designer.cs | 89 +- PKHeX/MainWindow/Main.cs | 13 +- PKHeX/MainWindow/Main.resx | 421 ++-- PKHeX/MysteryGifts/MysteryGift.cs | 16 +- PKHeX/MysteryGifts/PGF.cs | 19 +- PKHeX/MysteryGifts/PGT.cs | 21 +- PKHeX/MysteryGifts/WC6.cs | 19 +- PKHeX/PKHeX.csproj | 10 + PKHeX/Properties/Resources.Designer.cs | 10 + PKHeX/Properties/Resources.resx | 3 + PKHeX/Resources/img/Program/gift.png | Bin 0 -> 617 bytes PKHeX/Subforms/SAV_MysteryGiftDB.Designer.cs | 1716 +++++++++++++++++ PKHeX/Subforms/SAV_MysteryGiftDB.cs | 351 ++++ PKHeX/Subforms/SAV_MysteryGiftDB.resx | 420 ++++ PKHeX/Subforms/Save Editors/SAV_Wondercard.cs | 4 +- 15 files changed, 2853 insertions(+), 259 deletions(-) create mode 100644 PKHeX/Resources/img/Program/gift.png create mode 100644 PKHeX/Subforms/SAV_MysteryGiftDB.Designer.cs create mode 100644 PKHeX/Subforms/SAV_MysteryGiftDB.cs create mode 100644 PKHeX/Subforms/SAV_MysteryGiftDB.resx diff --git a/PKHeX/MainWindow/Main.Designer.cs b/PKHeX/MainWindow/Main.Designer.cs index 3213eec8f..d48ef9d03 100644 --- a/PKHeX/MainWindow/Main.Designer.cs +++ b/PKHeX/MainWindow/Main.Designer.cs @@ -78,6 +78,8 @@ public void InitializeComponent() this.MT_Level = new System.Windows.Forms.MaskedTextBox(); this.DEV_Ability = new System.Windows.Forms.ComboBox(); this.Tab_Met = new System.Windows.Forms.TabPage(); + this.L_MetTimeOfDay = new System.Windows.Forms.Label(); + this.CB_MetTimeOfDay = new System.Windows.Forms.ComboBox(); this.CHK_AsEgg = new System.Windows.Forms.CheckBox(); this.CHK_Fateful = new System.Windows.Forms.CheckBox(); this.GB_EggConditions = new System.Windows.Forms.GroupBox(); @@ -233,6 +235,7 @@ public void InitializeComponent() this.Menu_DumpBoxes = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_Report = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_Database = new System.Windows.Forms.ToolStripMenuItem(); + this.Menu_MGDatabase = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_BatchEditor = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_Other = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_OpenSDF = new System.Windows.Forms.ToolStripMenuItem(); @@ -363,8 +366,6 @@ 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.L_MetTimeOfDay = new System.Windows.Forms.Label(); - this.CB_MetTimeOfDay = new System.Windows.Forms.ComboBox(); this.tabMain.SuspendLayout(); this.Tab_Main.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.Label_IsShiny)).BeginInit(); @@ -1069,6 +1070,33 @@ public void InitializeComponent() this.Tab_Met.Text = "Met"; this.Tab_Met.UseVisualStyleBackColor = true; // + // L_MetTimeOfDay + // + this.L_MetTimeOfDay.Location = new System.Drawing.Point(25, 165); + this.L_MetTimeOfDay.Name = "L_MetTimeOfDay"; + this.L_MetTimeOfDay.Size = new System.Drawing.Size(77, 13); + this.L_MetTimeOfDay.TabIndex = 10; + this.L_MetTimeOfDay.Text = "Time of Day:"; + this.L_MetTimeOfDay.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.L_MetTimeOfDay.Visible = false; + // + // CB_MetTimeOfDay + // + this.CB_MetTimeOfDay.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.CB_MetTimeOfDay.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_MetTimeOfDay.DropDownWidth = 150; + this.CB_MetTimeOfDay.FormattingEnabled = true; + this.CB_MetTimeOfDay.Items.AddRange(new object[] { + "(None)", + "Morning", + "Day", + "Night"}); + this.CB_MetTimeOfDay.Location = new System.Drawing.Point(105, 162); + this.CB_MetTimeOfDay.Name = "CB_MetTimeOfDay"; + this.CB_MetTimeOfDay.Size = new System.Drawing.Size(122, 21); + this.CB_MetTimeOfDay.TabIndex = 11; + this.CB_MetTimeOfDay.Visible = false; + // // CHK_AsEgg // this.CHK_AsEgg.AutoSize = true; @@ -2762,7 +2790,7 @@ public void InitializeComponent() this.Menu_ShowdownExportBattleBox}); this.Menu_Showdown.Image = global::PKHeX.Properties.Resources.showdown; this.Menu_Showdown.Name = "Menu_Showdown"; - this.Menu_Showdown.Size = new System.Drawing.Size(143, 22); + this.Menu_Showdown.Size = new System.Drawing.Size(152, 22); this.Menu_Showdown.Text = "Showdown"; // // Menu_ShowdownImportPKM @@ -2809,7 +2837,7 @@ public void InitializeComponent() this.Menu_OpenCache}); this.Menu_CyberGadget.Image = global::PKHeX.Properties.Resources.other; this.Menu_CyberGadget.Name = "Menu_CyberGadget"; - this.Menu_CyberGadget.Size = new System.Drawing.Size(143, 22); + this.Menu_CyberGadget.Size = new System.Drawing.Size(152, 22); this.Menu_CyberGadget.Text = "CyberGadget"; // // Menu_OpenTemp @@ -2835,17 +2863,18 @@ public void InitializeComponent() this.Menu_DumpBoxes, this.Menu_Report, this.Menu_Database, + this.Menu_MGDatabase, this.Menu_BatchEditor}); this.Menu_Data.Image = global::PKHeX.Properties.Resources.data; this.Menu_Data.Name = "Menu_Data"; - this.Menu_Data.Size = new System.Drawing.Size(143, 22); + this.Menu_Data.Size = new System.Drawing.Size(152, 22); this.Menu_Data.Text = "Data"; // // Menu_LoadBoxes // this.Menu_LoadBoxes.Image = global::PKHeX.Properties.Resources.load; this.Menu_LoadBoxes.Name = "Menu_LoadBoxes"; - this.Menu_LoadBoxes.Size = new System.Drawing.Size(151, 22); + this.Menu_LoadBoxes.Size = new System.Drawing.Size(182, 22); this.Menu_LoadBoxes.Text = "Load Boxes"; this.Menu_LoadBoxes.Click += new System.EventHandler(this.mainMenuBoxLoad); // @@ -2853,7 +2882,7 @@ public void InitializeComponent() // this.Menu_DumpBoxes.Image = global::PKHeX.Properties.Resources.dump; this.Menu_DumpBoxes.Name = "Menu_DumpBoxes"; - this.Menu_DumpBoxes.Size = new System.Drawing.Size(151, 22); + this.Menu_DumpBoxes.Size = new System.Drawing.Size(182, 22); this.Menu_DumpBoxes.Text = "Dump Boxes"; this.Menu_DumpBoxes.Click += new System.EventHandler(this.mainMenuBoxDump); // @@ -2863,7 +2892,7 @@ public void InitializeComponent() 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; - this.Menu_Report.Size = new System.Drawing.Size(151, 22); + this.Menu_Report.Size = new System.Drawing.Size(182, 22); this.Menu_Report.Text = "Box Data &Report"; this.Menu_Report.Click += new System.EventHandler(this.mainMenuBoxReport); // @@ -2873,17 +2902,27 @@ public void InitializeComponent() 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; - this.Menu_Database.Size = new System.Drawing.Size(151, 22); + this.Menu_Database.Size = new System.Drawing.Size(182, 22); this.Menu_Database.Text = "PK6 &Database"; this.Menu_Database.Click += new System.EventHandler(this.mainMenuDatabase); // + // Menu_MGDatabase + // + this.Menu_MGDatabase.Image = global::PKHeX.Properties.Resources.gift; + 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; + this.Menu_MGDatabase.Size = new System.Drawing.Size(182, 22); + this.Menu_MGDatabase.Text = "&Mystery Gift Database"; + this.Menu_MGDatabase.Click += new System.EventHandler(this.mainMenuMysteryDM); + // // Menu_BatchEditor // this.Menu_BatchEditor.Image = global::PKHeX.Properties.Resources.settings; 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; - this.Menu_BatchEditor.Size = new System.Drawing.Size(151, 22); + this.Menu_BatchEditor.Size = new System.Drawing.Size(182, 22); this.Menu_BatchEditor.Text = "Batch Editor"; this.Menu_BatchEditor.Click += new System.EventHandler(this.manMenuBatchEditor); // @@ -2894,7 +2933,7 @@ public void InitializeComponent() this.Menu_OpenSDB}); this.Menu_Other.Image = global::PKHeX.Properties.Resources.other; this.Menu_Other.Name = "Menu_Other"; - this.Menu_Other.Size = new System.Drawing.Size(143, 22); + this.Menu_Other.Size = new System.Drawing.Size(152, 22); this.Menu_Other.Text = "Other"; // // Menu_OpenSDF @@ -4611,33 +4650,6 @@ public void InitializeComponent() this.L_UpdateAvailable.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.L_UpdateAvailable.Visible = false; // - // L_MetTimeOfDay - // - this.L_MetTimeOfDay.Location = new System.Drawing.Point(25, 165); - this.L_MetTimeOfDay.Name = "L_MetTimeOfDay"; - this.L_MetTimeOfDay.Size = new System.Drawing.Size(77, 13); - this.L_MetTimeOfDay.TabIndex = 10; - this.L_MetTimeOfDay.Text = "Time of Day:"; - this.L_MetTimeOfDay.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.L_MetTimeOfDay.Visible = false; - // - // CB_MetTimeOfDay - // - this.CB_MetTimeOfDay.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.CB_MetTimeOfDay.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.CB_MetTimeOfDay.DropDownWidth = 150; - this.CB_MetTimeOfDay.FormattingEnabled = true; - this.CB_MetTimeOfDay.Items.AddRange(new object[] { - "(None)", - "Morning", - "Day", - "Night"}); - this.CB_MetTimeOfDay.Location = new System.Drawing.Point(105, 162); - this.CB_MetTimeOfDay.Name = "CB_MetTimeOfDay"; - this.CB_MetTimeOfDay.Size = new System.Drawing.Size(122, 21); - this.CB_MetTimeOfDay.TabIndex = 11; - this.CB_MetTimeOfDay.Visible = false; - // // Main // this.AllowDrop = true; @@ -5121,6 +5133,7 @@ public void InitializeComponent() private System.Windows.Forms.LinkLabel L_UpdateAvailable; private System.Windows.Forms.Label L_MetTimeOfDay; public System.Windows.Forms.ComboBox CB_MetTimeOfDay; + private System.Windows.Forms.ToolStripMenuItem Menu_MGDatabase; } } diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index f7a889044..ab9df59cc 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -208,7 +208,7 @@ public Main() public static string WorkingDirectory => Environment.CurrentDirectory; public static string DatabasePath => Path.Combine(WorkingDirectory, "db"); - private static string WC6DatabasePath => Path.Combine(WorkingDirectory, "wc6"); + public static string WC6DatabasePath => Path.Combine(WorkingDirectory, "wc6"); private static string BackupPath => Path.Combine(WorkingDirectory, "bak"); private static string ThreadPath => @"https://projectpokemon.org/forums/showthread.php?36986"; private static string VersionPath => @"https://raw.githubusercontent.com/kwsch/PKHeX/master/PKHeX/Resources/text/version.txt"; @@ -327,6 +327,15 @@ private void mainMenuDatabase(object sender, EventArgs e) Util.Alert("PKHeX's database was not found.", $"Please dump all boxes from a save file, then ensure the '{DatabasePath}' folder exists."); } + private void mainMenuMysteryDM(object sender, EventArgs e) + { + var z = Application.OpenForms.Cast
().FirstOrDefault(form => form.GetType() == typeof(SAV_MysteryGiftDB)) as SAV_MysteryGiftDB; + if (z != null) + { Util.CenterToForm(z, this); z.BringToFront(); return; } + + new SAV_MysteryGiftDB(this).Show(); + + } private void mainMenuUnicode(object sender, EventArgs e) { unicode = Menu_Unicode.Checked; @@ -1048,7 +1057,7 @@ private static void refreshWC6DB() for (int i = 0; i < wc6full.Length; i += WC6.SizeFull) { byte[] data = new byte[WC6.SizeFull]; - Array.Copy(wc6bin, i, data, 0, WC6.SizeFull); + Array.Copy(wc6full, i, data, 0, WC6.SizeFull); wc6db.Add(new WC6(data)); } diff --git a/PKHeX/MainWindow/Main.resx b/PKHeX/MainWindow/Main.resx index 08b78235e..6659fcbca 100644 --- a/PKHeX/MainWindow/Main.resx +++ b/PKHeX/MainWindow/Main.resx @@ -252,6 +252,155 @@ True + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + + + iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAHhJREFUKFNjQAf/BQQ6oEzc4L+QUOh/QcH///n5jaFCmAAoKfhPUPAuWKGg4BkM + xSCroJLYMbJT/gkIzMSmCCQOVYIAQIkzKIqAzoBKoQIk98EUvoNKIQDII2AFAgKrgGwlMA3iY3gIKAAK + GigXDIB8F3QxIgADAwC7NFU/mWb72QAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAHhJREFUKFNjQAf/BQQ6oEzc4L+QUOh/QcH///n5jaFCmAAoKfhPUPAuWKGg4BkM + xSCroJLYMbJT/gkIzMSmCCQOVYIAQIkzKIqAzoBKoQIk98EUvoNKIQDII2AFAgKrgGwlMA3iY3gIKAAK + GigXDIB8F3QxIgADAwC7NFU/mWb72QAAAABJRU5ErkJggg== + + + + True + + + True + + + True + + + True + + + True + True @@ -261,6 +410,63 @@ True + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + True @@ -462,194 +668,6 @@ True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - - - iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAHhJREFUKFNjQAf/BQQ6oEzc4L+QUOh/QcH///n5jaFCmAAoKfhPUPAuWKGg4BkM - xSCroJLYMbJT/gkIzMSmCCQOVYIAQIkzKIqAzoBKoQIk98EUvoNKIQDII2AFAgKrgGwlMA3iY3gIKAAK - GigXDIB8F3QxIgADAwC7NFU/mWb72QAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAHhJREFUKFNjQAf/BQQ6oEzc4L+QUOh/QcH///n5jaFCmAAoKfhPUPAuWKGg4BkM - xSCroJLYMbJT/gkIzMSmCCQOVYIAQIkzKIqAzoBKoQIk98EUvoNKIQDII2AFAgKrgGwlMA3iY3gIKAAK - GigXDIB8F3QxIgADAwC7NFU/mWb72QAAAABJRU5ErkJggg== - - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - True @@ -806,6 +824,24 @@ True + + True + + + True + + + True + + + True + + + True + + + True + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAeZJREFUOE+1 @@ -1068,6 +1104,15 @@ True + + True + + + True + + + True + True diff --git a/PKHeX/MysteryGifts/MysteryGift.cs b/PKHeX/MysteryGifts/MysteryGift.cs index a8e1d07af..95933c87d 100644 --- a/PKHeX/MysteryGifts/MysteryGift.cs +++ b/PKHeX/MysteryGifts/MysteryGift.cs @@ -42,8 +42,10 @@ internal static MysteryGift getMysteryGift(byte[] data) } public abstract string Extension { get; } + public string FileName => getCardHeader() + "." + Extension; public virtual byte[] Data { get; set; } public abstract PKM convertToPKM(SaveFile SAV); + public abstract int Format { get; } public MysteryGift Clone() { @@ -64,6 +66,18 @@ public MysteryGift Clone() public virtual int Quantity { get { return 1; } set { } } public bool Empty => Data.SequenceEqual(new byte[Data.Length]); - public string getCardHeader() => (CardID > 0 ? $"Card #: {CardID.ToString("0000")}" : "N/A") + $" - {CardTitle.Replace('\u3000',' ').Trim()}" + Environment.NewLine; + public string getCardHeader() => (CardID > 0 ? $"Card #: {CardID.ToString("0000")}" : "N/A") + $" - {CardTitle.Replace('\u3000',' ').Trim()}"; + + // Search Properties + public virtual int Species { get { return -1; } set { } } + public virtual int[] Moves => new int[0]; + public virtual bool IsShiny => false; + public virtual bool IsEgg { get { return false; } set { } } + public virtual int HeldItem { get { return -1; } set { } } + public bool Gen7 => Format == 7; + public bool Gen6 => Format == 6; + public bool Gen5 => Format == 5; + public bool Gen4 => Format == 4; + public bool Gen3 => Format == 3; } } diff --git a/PKHeX/MysteryGifts/PGF.cs b/PKHeX/MysteryGifts/PGF.cs index f58b383e5..60a83281f 100644 --- a/PKHeX/MysteryGifts/PGF.cs +++ b/PKHeX/MysteryGifts/PGF.cs @@ -6,7 +6,8 @@ namespace PKHeX public sealed class PGF : MysteryGift { internal const int Size = 0xCC; - public override string Extension => ".pgf"; + public override string Extension => "pgf"; + public override int Format => 5; public PGF(byte[] data = null) { @@ -41,12 +42,13 @@ public PGF(byte[] data = null) public bool RIB1_7 { get { return (RIB1 & (1 << 7)) == 1 << 7; } set { RIB1 = (byte)(RIB1 & ~(1 << 7) | (value ? 1 << 7 : 0)); } } // Empty public int Pokéball { get { return Data[0x0E]; } set { Data[0x0E] = (byte)value; } } - public int HeldItem { get { return BitConverter.ToUInt16(Data, 0x10); } set { BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x10); } } + public override int HeldItem { get { return BitConverter.ToUInt16(Data, 0x10); } set { BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x10); } } public int Move1 { get { return BitConverter.ToUInt16(Data, 0x12); } set { BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x12); } } public int Move2 { get { return BitConverter.ToUInt16(Data, 0x14); } set { BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x14); } } public int Move3 { get { return BitConverter.ToUInt16(Data, 0x16); } set { BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x16); } } public int Move4 { get { return BitConverter.ToUInt16(Data, 0x18); } set { BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x18); } } - public int Species { get { return BitConverter.ToUInt16(Data, 0x1A); } set { BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x1A); } } + public override int Species { get { return BitConverter.ToUInt16(Data, 0x1A); } + } public int Form { get { return Data[0x1C]; } set { Data[0x1C] = (byte)value; } } public int Language { get { return Data[0x1D]; } set { Data[0x1D] = (byte)value; } } public string Nickname @@ -79,7 +81,7 @@ public string Nickname set { Encoding.Unicode.GetBytes(value.PadRight(0x08, (char)0xFFFF)).CopyTo(Data, 0x4A); } } public int OTGender { get { return Data[0x5A]; } set { Data[0x5A] = (byte)value; } } public int Level { get { return Data[0x5B]; } set { Data[0x5C] = (byte)value; } } - public bool IsEgg { get { return Data[0x5C] == 1; } set { Data[0x5C] = (byte)(value ? 1 : 0); } } + public override bool IsEgg { get { return Data[0x5C] == 1; } set { Data[0x5C] = (byte)(value ? 1 : 0); } } // Unused 0x5D 0x5E 0x5F public override string CardTitle { @@ -142,16 +144,9 @@ public override int CardID public int[] IVs => new[] { IV_HP, IV_ATK, IV_DEF, IV_SPE, IV_SPA, IV_SPD }; public bool IsNicknamed => Nickname.Length > 0; - public int[] Moves + public override int[] Moves { get { return new[] { Move1, Move2, Move3, Move4 }; } - set - { - if (value.Length > 0) Move1 = value[0]; - if (value.Length > 1) Move2 = value[1]; - if (value.Length > 2) Move3 = value[2]; - if (value.Length > 3) Move4 = value[3]; - } } public override bool IsPokémon { get { return CardType == 1; } set { if (value) CardType = 1; } } public override bool IsItem { get { return CardType == 2; } set { if (value) CardType = 2; } } diff --git a/PKHeX/MysteryGifts/PGT.cs b/PKHeX/MysteryGifts/PGT.cs index 25c935e3c..98e1c65a2 100644 --- a/PKHeX/MysteryGifts/PGT.cs +++ b/PKHeX/MysteryGifts/PGT.cs @@ -11,7 +11,8 @@ namespace PKHeX public sealed class PCD : MysteryGift { internal const int Size = 0x358; // 856 - public override string Extension => ".pcd"; + public override string Extension => "pcd"; + public override int Format => 4; public PCD(byte[] data = null) { @@ -50,6 +51,12 @@ public override string CardTitle } } + public override int Species => Gift.PK.Species; + public override int[] Moves => Gift.PK.Moves; + public override bool IsShiny => Gift.PK.IsShiny; + public override bool IsEgg => Gift.PK.IsEgg; + public override int HeldItem => Gift.PK.HeldItem; + public override PKM convertToPKM(SaveFile SAV) { return Gift.convertToPKM(SAV); @@ -58,7 +65,8 @@ public override PKM convertToPKM(SaveFile SAV) public class PGT : MysteryGift { internal const int Size = 0x104; // 260 - public override string Extension => ".pgt"; + public override string Extension => "pgt"; + public override int Format => 4; private enum GiftType { @@ -103,7 +111,7 @@ private void refreshData(byte[] data) public byte Slot { get { return Data[2]; } set { Data[2] = value; } } public byte Detail { get { return Data[3]; } set { Data[3] = value; } } public override int Item { get { return BitConverter.ToUInt16(Data, 0x4); } set { BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x4); } } - private PK4 PK; + public PK4 PK; private byte[] Unknown; private byte[] RAW; @@ -118,11 +126,16 @@ public override byte[] Data private GiftType PGTGiftType { get { return (GiftType)Data[0]; } set {Data[0] = (byte)value; } } public bool IsHatched => PGTGiftType == GiftType.Pokémon; - public bool IsEgg => PGTGiftType == GiftType.PokémonEgg; + public override bool IsEgg => PGTGiftType == GiftType.PokémonEgg; public bool IsManaphyEgg => PGTGiftType == GiftType.ManaphyEgg; public override bool IsItem { get { return PGTGiftType == GiftType.Item; } set { if (value) CardType = (int)GiftType.Item; } } public override bool IsPokémon { get { return PGTGiftType == GiftType.Pokémon || PGTGiftType == GiftType.PokémonEgg || PGTGiftType == GiftType.ManaphyEgg; } set { } } + public override int Species => PK.Species; + public override int[] Moves => PK.Moves; + public override bool IsShiny => PK.IsShiny; + public override int HeldItem => PK.HeldItem; + public override PKM convertToPKM(SaveFile SAV) { if (!IsPokémon) diff --git a/PKHeX/MysteryGifts/WC6.cs b/PKHeX/MysteryGifts/WC6.cs index 37305bb4e..9541d1d17 100644 --- a/PKHeX/MysteryGifts/WC6.cs +++ b/PKHeX/MysteryGifts/WC6.cs @@ -9,7 +9,8 @@ public sealed class WC6 : MysteryGift internal const int Size = 0x108; internal const int SizeFull = 0x310; internal const uint EonTicketConst = 0x225D73C2; - public override string Extension => ".wc6"; + public override string Extension => "wc6"; + public override int Format => 6; public WC6(byte[] data = null) { @@ -94,6 +95,7 @@ public WC6(byte[] data = null) // Pokémon Properties public override bool IsPokémon { get { return CardType == 0; } set { if (value) CardType = 0; } } + public override bool IsShiny { get { return PIDType == 2; } } public int TID { get { return BitConverter.ToUInt16(Data, 0x68); } set { BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x68); } } @@ -109,7 +111,7 @@ public WC6(byte[] data = null) public int Pokéball { get { return Data[0x76]; } set { Data[0x76] = (byte)value; } } - public int HeldItem { + public override int HeldItem { get { return BitConverter.ToUInt16(Data, 0x78); } set { BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x78); } } public int Move1 { @@ -124,7 +126,7 @@ public WC6(byte[] data = null) public int Move4 { get { return BitConverter.ToUInt16(Data, 0x80); } set { BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x80); } } - public int Species { + public override int Species { get { return BitConverter.ToUInt16(Data, 0x82); } set { BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x82); } } public int Form { @@ -174,7 +176,7 @@ public WC6(byte[] data = null) get { return Util.TrimFromZero(Encoding.Unicode.GetString(Data, 0xB6, 0x1A)); } set { Encoding.Unicode.GetBytes(value.PadRight(value.Length + 1, '\0')).CopyTo(Data, 0xB6); } } public int Level { get { return Data[0xD0]; } set { Data[0xD0] = (byte)value; } } - public bool IsEgg { get { return Data[0xD1] == 1; } set { Data[0xD1] = (byte)(value ? 1 : 0); } } + public override bool IsEgg { get { return Data[0xD1] == 1; } set { Data[0xD1] = (byte)(value ? 1 : 0); } } public uint PID { get { return BitConverter.ToUInt32(Data, 0xD4); } set { BitConverter.GetBytes(value).CopyTo(Data, 0xD4); } } @@ -218,16 +220,9 @@ public WC6(byte[] data = null) public int[] IVs => new[] { IV_HP, IV_ATK, IV_DEF, IV_SPE, IV_SPA, IV_SPD }; public bool IsNicknamed => Nickname.Length > 0; - public int[] Moves + public override int[] Moves { get { return new[] {Move1, Move2, Move3, Move4}; } - set - { - if (value.Length > 0) Move1 = value[0]; - if (value.Length > 1) Move2 = value[1]; - if (value.Length > 2) Move3 = value[2]; - if (value.Length > 3) Move4 = value[3]; - } } public int[] RelearnMoves { diff --git a/PKHeX/PKHeX.csproj b/PKHeX/PKHeX.csproj index 27edae06b..a5eaa88f4 100644 --- a/PKHeX/PKHeX.csproj +++ b/PKHeX/PKHeX.csproj @@ -213,6 +213,12 @@ SAV_SimplePokedex.cs + + Form + + + SAV_MysteryGiftDB.cs + Form @@ -370,6 +376,9 @@ SAV_SimplePokedex.cs + + SAV_MysteryGiftDB.cs + SAV_Database.cs @@ -2756,6 +2765,7 @@ + diff --git a/PKHeX/Properties/Resources.Designer.cs b/PKHeX/Properties/Resources.Designer.cs index bcdc7efb3..4536a233d 100644 --- a/PKHeX/Properties/Resources.Designer.cs +++ b/PKHeX/Properties/Resources.Designer.cs @@ -10982,6 +10982,16 @@ internal class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap gift { + get { + object obj = ResourceManager.GetObject("gift", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/PKHeX/Properties/Resources.resx b/PKHeX/Properties/Resources.resx index dd7542c63..0b33dc3b6 100644 --- a/PKHeX/Properties/Resources.resx +++ b/PKHeX/Properties/Resources.resx @@ -6415,4 +6415,7 @@ ..\Resources\img\Pokemon Sprites\172_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\img\Program\gift.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/PKHeX/Resources/img/Program/gift.png b/PKHeX/Resources/img/Program/gift.png new file mode 100644 index 0000000000000000000000000000000000000000..ce760c3ca9a1bd915e4348d8f7ebda9cbefa9b6f GIT binary patch literal 617 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl47zG1-LR^7dk^lz>2PY>7BO@bL zT`n#TtgNieV1TR!C=OT8#>NUXfrW(yE&^cy)c~~swF9N#dVy>gE$s!I18p;pa{?$p!q-rK=ASC_M1R{U`dc)FoVhC zk8?!D7k+tUxFSQi^S-La;}(J3#Vs4S84E95PUYEL&&WRa)uO65&+=c*WMgSv^`W-r zU59x?Q$xWY2w>%8;^i-S^5p5WCq<1d#osSnKL#{>o2QFoh(x$=uc9Awpafg`x4-L? zHcy)3G+FPZq6NcB$AlePOu@ZJ3K^tUFfl5+ZpfEkH2c8wXTrvetNs}T+X`IxwVj#q zF3aw?$p6-hE`QdWQ?L8w(an8#cScA}_dXu-Xky(~FXwx#Hy64vdN^nGd|AY`=lU$K znj?p&<}q%%c0(v-Z`<#)XKqcIz5Bsuo`mG+MIXEjm{jJTIe0PO_LJ4JxV5YgzF0F% qK709}*oDan^Q2|JGwjsN-=DwA + /// 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_MysteryGiftDB)); + this.SCR_Box = new System.Windows.Forms.VScrollBar(); + this.bpkx30 = new System.Windows.Forms.PictureBox(); + this.bpkx29 = new System.Windows.Forms.PictureBox(); + this.bpkx28 = new System.Windows.Forms.PictureBox(); + this.bpkx27 = new System.Windows.Forms.PictureBox(); + this.bpkx26 = new System.Windows.Forms.PictureBox(); + this.bpkx25 = new System.Windows.Forms.PictureBox(); + this.bpkx24 = new System.Windows.Forms.PictureBox(); + this.bpkx23 = new System.Windows.Forms.PictureBox(); + this.bpkx22 = new System.Windows.Forms.PictureBox(); + this.bpkx21 = new System.Windows.Forms.PictureBox(); + this.bpkx20 = new System.Windows.Forms.PictureBox(); + this.bpkx19 = new System.Windows.Forms.PictureBox(); + this.bpkx18 = new System.Windows.Forms.PictureBox(); + this.bpkx17 = new System.Windows.Forms.PictureBox(); + this.bpkx16 = new System.Windows.Forms.PictureBox(); + this.bpkx15 = new System.Windows.Forms.PictureBox(); + this.bpkx14 = new System.Windows.Forms.PictureBox(); + this.bpkx13 = new System.Windows.Forms.PictureBox(); + this.bpkx12 = new System.Windows.Forms.PictureBox(); + this.bpkx11 = new System.Windows.Forms.PictureBox(); + this.bpkx10 = new System.Windows.Forms.PictureBox(); + this.bpkx9 = new System.Windows.Forms.PictureBox(); + this.bpkx8 = new System.Windows.Forms.PictureBox(); + this.bpkx7 = new System.Windows.Forms.PictureBox(); + this.bpkx6 = new System.Windows.Forms.PictureBox(); + this.bpkx5 = new System.Windows.Forms.PictureBox(); + this.bpkx4 = new System.Windows.Forms.PictureBox(); + this.bpkx3 = new System.Windows.Forms.PictureBox(); + this.bpkx2 = new System.Windows.Forms.PictureBox(); + this.bpkx1 = new System.Windows.Forms.PictureBox(); + this.bpkx60 = new System.Windows.Forms.PictureBox(); + this.bpkx59 = new System.Windows.Forms.PictureBox(); + this.bpkx58 = new System.Windows.Forms.PictureBox(); + this.bpkx57 = new System.Windows.Forms.PictureBox(); + this.bpkx56 = new System.Windows.Forms.PictureBox(); + this.bpkx55 = new System.Windows.Forms.PictureBox(); + this.bpkx54 = new System.Windows.Forms.PictureBox(); + this.bpkx53 = new System.Windows.Forms.PictureBox(); + this.bpkx52 = new System.Windows.Forms.PictureBox(); + this.bpkx51 = new System.Windows.Forms.PictureBox(); + this.bpkx50 = new System.Windows.Forms.PictureBox(); + this.bpkx49 = new System.Windows.Forms.PictureBox(); + this.bpkx48 = new System.Windows.Forms.PictureBox(); + this.bpkx47 = new System.Windows.Forms.PictureBox(); + this.bpkx46 = new System.Windows.Forms.PictureBox(); + this.bpkx45 = new System.Windows.Forms.PictureBox(); + this.bpkx44 = new System.Windows.Forms.PictureBox(); + this.bpkx43 = new System.Windows.Forms.PictureBox(); + this.bpkx42 = new System.Windows.Forms.PictureBox(); + this.bpkx41 = new System.Windows.Forms.PictureBox(); + this.bpkx40 = new System.Windows.Forms.PictureBox(); + this.bpkx39 = new System.Windows.Forms.PictureBox(); + this.bpkx38 = new System.Windows.Forms.PictureBox(); + this.bpkx37 = new System.Windows.Forms.PictureBox(); + this.bpkx36 = new System.Windows.Forms.PictureBox(); + this.bpkx35 = new System.Windows.Forms.PictureBox(); + this.bpkx34 = new System.Windows.Forms.PictureBox(); + this.bpkx33 = new System.Windows.Forms.PictureBox(); + this.bpkx32 = new System.Windows.Forms.PictureBox(); + this.bpkx31 = new System.Windows.Forms.PictureBox(); + this.menuStrip1 = new System.Windows.Forms.MenuStrip(); + this.Menu_Close = new System.Windows.Forms.ToolStripMenuItem(); + this.Menu_Exit = new System.Windows.Forms.ToolStripMenuItem(); + this.Menu_Tools = new System.Windows.Forms.ToolStripMenuItem(); + this.Menu_SearchSettings = new System.Windows.Forms.ToolStripMenuItem(); + this.Menu_SearchBoxes = new System.Windows.Forms.ToolStripMenuItem(); + this.Menu_SearchDatabase = new System.Windows.Forms.ToolStripMenuItem(); + this.Menu_SearchLegal = new System.Windows.Forms.ToolStripMenuItem(); + this.Menu_SearchIllegal = new System.Windows.Forms.ToolStripMenuItem(); + this.Menu_SearchAdvanced = new System.Windows.Forms.ToolStripMenuItem(); + this.Menu_OpenDB = new System.Windows.Forms.ToolStripMenuItem(); + this.Menu_Export = new System.Windows.Forms.ToolStripMenuItem(); + this.P_Results = new System.Windows.Forms.Panel(); + this.PAN_Box = new System.Windows.Forms.Panel(); + this.bpkx66 = new System.Windows.Forms.PictureBox(); + this.bpkx65 = new System.Windows.Forms.PictureBox(); + this.bpkx64 = new System.Windows.Forms.PictureBox(); + this.bpkx63 = new System.Windows.Forms.PictureBox(); + this.bpkx62 = new System.Windows.Forms.PictureBox(); + this.bpkx61 = new System.Windows.Forms.PictureBox(); + this.CB_HeldItem = new System.Windows.Forms.ComboBox(); + this.CB_Species = new System.Windows.Forms.ComboBox(); + this.CB_Move4 = new System.Windows.Forms.ComboBox(); + this.CB_Move3 = new System.Windows.Forms.ComboBox(); + this.CB_Move2 = new System.Windows.Forms.ComboBox(); + this.CB_Move1 = new System.Windows.Forms.ComboBox(); + this.Label_HeldItem = new System.Windows.Forms.Label(); + this.Label_Species = new System.Windows.Forms.Label(); + this.B_Search = new System.Windows.Forms.Button(); + this.L_Move1 = new System.Windows.Forms.Label(); + this.L_Move2 = new System.Windows.Forms.Label(); + this.L_Move3 = new System.Windows.Forms.Label(); + this.L_Move4 = new System.Windows.Forms.Label(); + this.B_Reset = new System.Windows.Forms.Button(); + this.L_Count = new System.Windows.Forms.Label(); + this.L_Viewed = new System.Windows.Forms.Label(); + this.FLP_Egg = new System.Windows.Forms.FlowLayoutPanel(); + this.CHK_IsEgg = new System.Windows.Forms.CheckBox(); + this.CHK_Shiny = new System.Windows.Forms.CheckBox(); + this.TLP_Filters = new System.Windows.Forms.TableLayoutPanel(); + this.FLP_Format = new System.Windows.Forms.FlowLayoutPanel(); + this.CB_FormatComparator = new System.Windows.Forms.ComboBox(); + this.CB_Format = new System.Windows.Forms.ComboBox(); + this.L_Format = new System.Windows.Forms.Label(); + this.FLP_Level = new System.Windows.Forms.FlowLayoutPanel(); + this.RTB_Instructions = new System.Windows.Forms.RichTextBox(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx30)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx29)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx28)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx27)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx26)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx25)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx24)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx23)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx22)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx21)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx20)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx19)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx18)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx17)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx16)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx15)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx14)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx13)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx12)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx11)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx10)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx9)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx8)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx7)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx6)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx60)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx59)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx58)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx57)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx56)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx55)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx54)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx53)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx52)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx51)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx50)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx49)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx48)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx47)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx46)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx45)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx44)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx43)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx42)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx41)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx40)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx39)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx38)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx37)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx36)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx35)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx34)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx33)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx32)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx31)).BeginInit(); + this.menuStrip1.SuspendLayout(); + this.P_Results.SuspendLayout(); + this.PAN_Box.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx66)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx65)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx64)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx63)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx62)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx61)).BeginInit(); + this.FLP_Egg.SuspendLayout(); + this.TLP_Filters.SuspendLayout(); + this.FLP_Format.SuspendLayout(); + this.SuspendLayout(); + // + // SCR_Box + // + this.SCR_Box.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Right))); + this.SCR_Box.LargeChange = 1; + this.SCR_Box.Location = new System.Drawing.Point(256, 3); + this.SCR_Box.Name = "SCR_Box"; + this.SCR_Box.Size = new System.Drawing.Size(24, 344); + this.SCR_Box.TabIndex = 1; + this.SCR_Box.Scroll += new System.Windows.Forms.ScrollEventHandler(this.updateScroll); + // + // bpkx30 + // + this.bpkx30.BackColor = System.Drawing.Color.Transparent; + this.bpkx30.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx30.Location = new System.Drawing.Point(207, 126); + this.bpkx30.Name = "bpkx30"; + this.bpkx30.Size = new System.Drawing.Size(42, 32); + this.bpkx30.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx30.TabIndex = 59; + this.bpkx30.TabStop = false; + // + // bpkx29 + // + this.bpkx29.BackColor = System.Drawing.Color.Transparent; + this.bpkx29.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx29.Location = new System.Drawing.Point(166, 126); + this.bpkx29.Name = "bpkx29"; + this.bpkx29.Size = new System.Drawing.Size(42, 32); + this.bpkx29.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx29.TabIndex = 58; + this.bpkx29.TabStop = false; + // + // bpkx28 + // + this.bpkx28.BackColor = System.Drawing.Color.Transparent; + this.bpkx28.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx28.Location = new System.Drawing.Point(125, 126); + this.bpkx28.Name = "bpkx28"; + this.bpkx28.Size = new System.Drawing.Size(42, 32); + this.bpkx28.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx28.TabIndex = 57; + this.bpkx28.TabStop = false; + // + // bpkx27 + // + this.bpkx27.BackColor = System.Drawing.Color.Transparent; + this.bpkx27.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx27.Location = new System.Drawing.Point(84, 126); + this.bpkx27.Name = "bpkx27"; + this.bpkx27.Size = new System.Drawing.Size(42, 32); + this.bpkx27.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx27.TabIndex = 56; + this.bpkx27.TabStop = false; + // + // bpkx26 + // + this.bpkx26.BackColor = System.Drawing.Color.Transparent; + this.bpkx26.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx26.Location = new System.Drawing.Point(43, 126); + this.bpkx26.Name = "bpkx26"; + this.bpkx26.Size = new System.Drawing.Size(42, 32); + this.bpkx26.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx26.TabIndex = 55; + this.bpkx26.TabStop = false; + // + // bpkx25 + // + this.bpkx25.BackColor = System.Drawing.Color.Transparent; + this.bpkx25.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx25.Location = new System.Drawing.Point(2, 126); + this.bpkx25.Name = "bpkx25"; + this.bpkx25.Size = new System.Drawing.Size(42, 32); + this.bpkx25.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx25.TabIndex = 54; + this.bpkx25.TabStop = false; + // + // bpkx24 + // + this.bpkx24.BackColor = System.Drawing.Color.Transparent; + this.bpkx24.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx24.Location = new System.Drawing.Point(207, 95); + this.bpkx24.Name = "bpkx24"; + this.bpkx24.Size = new System.Drawing.Size(42, 32); + this.bpkx24.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx24.TabIndex = 53; + this.bpkx24.TabStop = false; + // + // bpkx23 + // + this.bpkx23.BackColor = System.Drawing.Color.Transparent; + this.bpkx23.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx23.Location = new System.Drawing.Point(166, 95); + this.bpkx23.Name = "bpkx23"; + this.bpkx23.Size = new System.Drawing.Size(42, 32); + this.bpkx23.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx23.TabIndex = 52; + this.bpkx23.TabStop = false; + // + // bpkx22 + // + this.bpkx22.BackColor = System.Drawing.Color.Transparent; + this.bpkx22.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx22.Location = new System.Drawing.Point(125, 95); + this.bpkx22.Name = "bpkx22"; + this.bpkx22.Size = new System.Drawing.Size(42, 32); + this.bpkx22.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx22.TabIndex = 51; + this.bpkx22.TabStop = false; + // + // bpkx21 + // + this.bpkx21.BackColor = System.Drawing.Color.Transparent; + this.bpkx21.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx21.Location = new System.Drawing.Point(84, 95); + this.bpkx21.Name = "bpkx21"; + this.bpkx21.Size = new System.Drawing.Size(42, 32); + this.bpkx21.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx21.TabIndex = 50; + this.bpkx21.TabStop = false; + // + // bpkx20 + // + this.bpkx20.BackColor = System.Drawing.Color.Transparent; + this.bpkx20.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx20.Location = new System.Drawing.Point(43, 95); + this.bpkx20.Name = "bpkx20"; + this.bpkx20.Size = new System.Drawing.Size(42, 32); + this.bpkx20.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx20.TabIndex = 49; + this.bpkx20.TabStop = false; + // + // bpkx19 + // + this.bpkx19.BackColor = System.Drawing.Color.Transparent; + this.bpkx19.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx19.Location = new System.Drawing.Point(2, 95); + this.bpkx19.Name = "bpkx19"; + this.bpkx19.Size = new System.Drawing.Size(42, 32); + this.bpkx19.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx19.TabIndex = 48; + this.bpkx19.TabStop = false; + // + // bpkx18 + // + this.bpkx18.BackColor = System.Drawing.Color.Transparent; + this.bpkx18.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx18.Location = new System.Drawing.Point(207, 64); + this.bpkx18.Name = "bpkx18"; + this.bpkx18.Size = new System.Drawing.Size(42, 32); + this.bpkx18.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx18.TabIndex = 47; + this.bpkx18.TabStop = false; + // + // bpkx17 + // + this.bpkx17.BackColor = System.Drawing.Color.Transparent; + this.bpkx17.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx17.Location = new System.Drawing.Point(166, 64); + this.bpkx17.Name = "bpkx17"; + this.bpkx17.Size = new System.Drawing.Size(42, 32); + this.bpkx17.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx17.TabIndex = 46; + this.bpkx17.TabStop = false; + // + // bpkx16 + // + this.bpkx16.BackColor = System.Drawing.Color.Transparent; + this.bpkx16.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx16.Location = new System.Drawing.Point(125, 64); + this.bpkx16.Name = "bpkx16"; + this.bpkx16.Size = new System.Drawing.Size(42, 32); + this.bpkx16.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx16.TabIndex = 45; + this.bpkx16.TabStop = false; + // + // bpkx15 + // + this.bpkx15.BackColor = System.Drawing.Color.Transparent; + this.bpkx15.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx15.Location = new System.Drawing.Point(84, 64); + this.bpkx15.Name = "bpkx15"; + this.bpkx15.Size = new System.Drawing.Size(42, 32); + this.bpkx15.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx15.TabIndex = 44; + this.bpkx15.TabStop = false; + // + // bpkx14 + // + this.bpkx14.BackColor = System.Drawing.Color.Transparent; + this.bpkx14.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx14.Location = new System.Drawing.Point(43, 64); + this.bpkx14.Name = "bpkx14"; + this.bpkx14.Size = new System.Drawing.Size(42, 32); + this.bpkx14.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx14.TabIndex = 43; + this.bpkx14.TabStop = false; + // + // bpkx13 + // + this.bpkx13.BackColor = System.Drawing.Color.Transparent; + this.bpkx13.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx13.Location = new System.Drawing.Point(2, 64); + this.bpkx13.Name = "bpkx13"; + this.bpkx13.Size = new System.Drawing.Size(42, 32); + this.bpkx13.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx13.TabIndex = 42; + this.bpkx13.TabStop = false; + // + // bpkx12 + // + this.bpkx12.BackColor = System.Drawing.Color.Transparent; + this.bpkx12.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx12.Location = new System.Drawing.Point(207, 33); + this.bpkx12.Name = "bpkx12"; + this.bpkx12.Size = new System.Drawing.Size(42, 32); + this.bpkx12.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx12.TabIndex = 41; + this.bpkx12.TabStop = false; + // + // bpkx11 + // + this.bpkx11.BackColor = System.Drawing.Color.Transparent; + this.bpkx11.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx11.Location = new System.Drawing.Point(166, 33); + this.bpkx11.Name = "bpkx11"; + this.bpkx11.Size = new System.Drawing.Size(42, 32); + this.bpkx11.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx11.TabIndex = 40; + this.bpkx11.TabStop = false; + // + // bpkx10 + // + this.bpkx10.BackColor = System.Drawing.Color.Transparent; + this.bpkx10.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx10.Location = new System.Drawing.Point(125, 33); + this.bpkx10.Name = "bpkx10"; + this.bpkx10.Size = new System.Drawing.Size(42, 32); + this.bpkx10.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx10.TabIndex = 39; + this.bpkx10.TabStop = false; + // + // bpkx9 + // + this.bpkx9.BackColor = System.Drawing.Color.Transparent; + this.bpkx9.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx9.Location = new System.Drawing.Point(84, 33); + this.bpkx9.Name = "bpkx9"; + this.bpkx9.Size = new System.Drawing.Size(42, 32); + this.bpkx9.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx9.TabIndex = 38; + this.bpkx9.TabStop = false; + // + // bpkx8 + // + this.bpkx8.BackColor = System.Drawing.Color.Transparent; + this.bpkx8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx8.Location = new System.Drawing.Point(43, 33); + this.bpkx8.Name = "bpkx8"; + this.bpkx8.Size = new System.Drawing.Size(42, 32); + this.bpkx8.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx8.TabIndex = 37; + this.bpkx8.TabStop = false; + // + // bpkx7 + // + this.bpkx7.BackColor = System.Drawing.Color.Transparent; + this.bpkx7.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx7.Location = new System.Drawing.Point(2, 33); + this.bpkx7.Name = "bpkx7"; + this.bpkx7.Size = new System.Drawing.Size(42, 32); + this.bpkx7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx7.TabIndex = 36; + this.bpkx7.TabStop = false; + // + // bpkx6 + // + this.bpkx6.BackColor = System.Drawing.Color.Transparent; + this.bpkx6.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx6.Location = new System.Drawing.Point(207, 2); + this.bpkx6.Name = "bpkx6"; + this.bpkx6.Size = new System.Drawing.Size(42, 32); + this.bpkx6.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx6.TabIndex = 35; + this.bpkx6.TabStop = false; + // + // bpkx5 + // + this.bpkx5.BackColor = System.Drawing.Color.Transparent; + this.bpkx5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx5.Location = new System.Drawing.Point(166, 2); + this.bpkx5.Name = "bpkx5"; + this.bpkx5.Size = new System.Drawing.Size(42, 32); + this.bpkx5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx5.TabIndex = 34; + this.bpkx5.TabStop = false; + // + // bpkx4 + // + this.bpkx4.BackColor = System.Drawing.Color.Transparent; + this.bpkx4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx4.Location = new System.Drawing.Point(125, 2); + this.bpkx4.Name = "bpkx4"; + this.bpkx4.Size = new System.Drawing.Size(42, 32); + this.bpkx4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx4.TabIndex = 33; + this.bpkx4.TabStop = false; + // + // bpkx3 + // + this.bpkx3.BackColor = System.Drawing.Color.Transparent; + this.bpkx3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx3.Location = new System.Drawing.Point(84, 2); + this.bpkx3.Name = "bpkx3"; + this.bpkx3.Size = new System.Drawing.Size(42, 32); + this.bpkx3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx3.TabIndex = 32; + this.bpkx3.TabStop = false; + // + // bpkx2 + // + this.bpkx2.BackColor = System.Drawing.Color.Transparent; + this.bpkx2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx2.Location = new System.Drawing.Point(43, 2); + this.bpkx2.Name = "bpkx2"; + this.bpkx2.Size = new System.Drawing.Size(42, 32); + this.bpkx2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx2.TabIndex = 31; + this.bpkx2.TabStop = false; + // + // bpkx1 + // + this.bpkx1.BackColor = System.Drawing.Color.Transparent; + this.bpkx1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx1.Location = new System.Drawing.Point(2, 2); + this.bpkx1.Name = "bpkx1"; + this.bpkx1.Size = new System.Drawing.Size(42, 32); + this.bpkx1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx1.TabIndex = 30; + this.bpkx1.TabStop = false; + // + // bpkx60 + // + this.bpkx60.BackColor = System.Drawing.Color.Transparent; + this.bpkx60.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx60.Location = new System.Drawing.Point(207, 281); + this.bpkx60.Name = "bpkx60"; + this.bpkx60.Size = new System.Drawing.Size(42, 32); + this.bpkx60.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx60.TabIndex = 59; + this.bpkx60.TabStop = false; + // + // bpkx59 + // + this.bpkx59.BackColor = System.Drawing.Color.Transparent; + this.bpkx59.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx59.Location = new System.Drawing.Point(166, 281); + this.bpkx59.Name = "bpkx59"; + this.bpkx59.Size = new System.Drawing.Size(42, 32); + this.bpkx59.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx59.TabIndex = 58; + this.bpkx59.TabStop = false; + // + // bpkx58 + // + this.bpkx58.BackColor = System.Drawing.Color.Transparent; + this.bpkx58.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx58.Location = new System.Drawing.Point(125, 281); + this.bpkx58.Name = "bpkx58"; + this.bpkx58.Size = new System.Drawing.Size(42, 32); + this.bpkx58.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx58.TabIndex = 57; + this.bpkx58.TabStop = false; + // + // bpkx57 + // + this.bpkx57.BackColor = System.Drawing.Color.Transparent; + this.bpkx57.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx57.Location = new System.Drawing.Point(84, 281); + this.bpkx57.Name = "bpkx57"; + this.bpkx57.Size = new System.Drawing.Size(42, 32); + this.bpkx57.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx57.TabIndex = 56; + this.bpkx57.TabStop = false; + // + // bpkx56 + // + this.bpkx56.BackColor = System.Drawing.Color.Transparent; + this.bpkx56.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx56.Location = new System.Drawing.Point(43, 281); + this.bpkx56.Name = "bpkx56"; + this.bpkx56.Size = new System.Drawing.Size(42, 32); + this.bpkx56.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx56.TabIndex = 55; + this.bpkx56.TabStop = false; + // + // bpkx55 + // + this.bpkx55.BackColor = System.Drawing.Color.Transparent; + this.bpkx55.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx55.Location = new System.Drawing.Point(2, 281); + this.bpkx55.Name = "bpkx55"; + this.bpkx55.Size = new System.Drawing.Size(42, 32); + this.bpkx55.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx55.TabIndex = 54; + this.bpkx55.TabStop = false; + // + // bpkx54 + // + this.bpkx54.BackColor = System.Drawing.Color.Transparent; + this.bpkx54.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx54.Location = new System.Drawing.Point(207, 250); + this.bpkx54.Name = "bpkx54"; + this.bpkx54.Size = new System.Drawing.Size(42, 32); + this.bpkx54.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx54.TabIndex = 53; + this.bpkx54.TabStop = false; + // + // bpkx53 + // + this.bpkx53.BackColor = System.Drawing.Color.Transparent; + this.bpkx53.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx53.Location = new System.Drawing.Point(166, 250); + this.bpkx53.Name = "bpkx53"; + this.bpkx53.Size = new System.Drawing.Size(42, 32); + this.bpkx53.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx53.TabIndex = 52; + this.bpkx53.TabStop = false; + // + // bpkx52 + // + this.bpkx52.BackColor = System.Drawing.Color.Transparent; + this.bpkx52.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx52.Location = new System.Drawing.Point(125, 250); + this.bpkx52.Name = "bpkx52"; + this.bpkx52.Size = new System.Drawing.Size(42, 32); + this.bpkx52.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx52.TabIndex = 51; + this.bpkx52.TabStop = false; + // + // bpkx51 + // + this.bpkx51.BackColor = System.Drawing.Color.Transparent; + this.bpkx51.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx51.Location = new System.Drawing.Point(84, 250); + this.bpkx51.Name = "bpkx51"; + this.bpkx51.Size = new System.Drawing.Size(42, 32); + this.bpkx51.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx51.TabIndex = 50; + this.bpkx51.TabStop = false; + // + // bpkx50 + // + this.bpkx50.BackColor = System.Drawing.Color.Transparent; + this.bpkx50.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx50.Location = new System.Drawing.Point(43, 250); + this.bpkx50.Name = "bpkx50"; + this.bpkx50.Size = new System.Drawing.Size(42, 32); + this.bpkx50.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx50.TabIndex = 49; + this.bpkx50.TabStop = false; + // + // bpkx49 + // + this.bpkx49.BackColor = System.Drawing.Color.Transparent; + this.bpkx49.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx49.Location = new System.Drawing.Point(2, 250); + this.bpkx49.Name = "bpkx49"; + this.bpkx49.Size = new System.Drawing.Size(42, 32); + this.bpkx49.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx49.TabIndex = 48; + this.bpkx49.TabStop = false; + // + // bpkx48 + // + this.bpkx48.BackColor = System.Drawing.Color.Transparent; + this.bpkx48.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx48.Location = new System.Drawing.Point(207, 219); + this.bpkx48.Name = "bpkx48"; + this.bpkx48.Size = new System.Drawing.Size(42, 32); + this.bpkx48.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx48.TabIndex = 47; + this.bpkx48.TabStop = false; + // + // bpkx47 + // + this.bpkx47.BackColor = System.Drawing.Color.Transparent; + this.bpkx47.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx47.Location = new System.Drawing.Point(166, 219); + this.bpkx47.Name = "bpkx47"; + this.bpkx47.Size = new System.Drawing.Size(42, 32); + this.bpkx47.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx47.TabIndex = 46; + this.bpkx47.TabStop = false; + // + // bpkx46 + // + this.bpkx46.BackColor = System.Drawing.Color.Transparent; + this.bpkx46.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx46.Location = new System.Drawing.Point(125, 219); + this.bpkx46.Name = "bpkx46"; + this.bpkx46.Size = new System.Drawing.Size(42, 32); + this.bpkx46.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx46.TabIndex = 45; + this.bpkx46.TabStop = false; + // + // bpkx45 + // + this.bpkx45.BackColor = System.Drawing.Color.Transparent; + this.bpkx45.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx45.Location = new System.Drawing.Point(84, 219); + this.bpkx45.Name = "bpkx45"; + this.bpkx45.Size = new System.Drawing.Size(42, 32); + this.bpkx45.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx45.TabIndex = 44; + this.bpkx45.TabStop = false; + // + // bpkx44 + // + this.bpkx44.BackColor = System.Drawing.Color.Transparent; + this.bpkx44.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx44.Location = new System.Drawing.Point(43, 219); + this.bpkx44.Name = "bpkx44"; + this.bpkx44.Size = new System.Drawing.Size(42, 32); + this.bpkx44.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx44.TabIndex = 43; + this.bpkx44.TabStop = false; + // + // bpkx43 + // + this.bpkx43.BackColor = System.Drawing.Color.Transparent; + this.bpkx43.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx43.Location = new System.Drawing.Point(2, 219); + this.bpkx43.Name = "bpkx43"; + this.bpkx43.Size = new System.Drawing.Size(42, 32); + this.bpkx43.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx43.TabIndex = 42; + this.bpkx43.TabStop = false; + // + // bpkx42 + // + this.bpkx42.BackColor = System.Drawing.Color.Transparent; + this.bpkx42.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx42.Location = new System.Drawing.Point(207, 188); + this.bpkx42.Name = "bpkx42"; + this.bpkx42.Size = new System.Drawing.Size(42, 32); + this.bpkx42.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx42.TabIndex = 41; + this.bpkx42.TabStop = false; + // + // bpkx41 + // + this.bpkx41.BackColor = System.Drawing.Color.Transparent; + this.bpkx41.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx41.Location = new System.Drawing.Point(166, 188); + this.bpkx41.Name = "bpkx41"; + this.bpkx41.Size = new System.Drawing.Size(42, 32); + this.bpkx41.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx41.TabIndex = 40; + this.bpkx41.TabStop = false; + // + // bpkx40 + // + this.bpkx40.BackColor = System.Drawing.Color.Transparent; + this.bpkx40.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx40.Location = new System.Drawing.Point(125, 188); + this.bpkx40.Name = "bpkx40"; + this.bpkx40.Size = new System.Drawing.Size(42, 32); + this.bpkx40.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx40.TabIndex = 39; + this.bpkx40.TabStop = false; + // + // bpkx39 + // + this.bpkx39.BackColor = System.Drawing.Color.Transparent; + this.bpkx39.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx39.Location = new System.Drawing.Point(84, 188); + this.bpkx39.Name = "bpkx39"; + this.bpkx39.Size = new System.Drawing.Size(42, 32); + this.bpkx39.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx39.TabIndex = 38; + this.bpkx39.TabStop = false; + // + // bpkx38 + // + this.bpkx38.BackColor = System.Drawing.Color.Transparent; + this.bpkx38.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx38.Location = new System.Drawing.Point(43, 188); + this.bpkx38.Name = "bpkx38"; + this.bpkx38.Size = new System.Drawing.Size(42, 32); + this.bpkx38.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx38.TabIndex = 37; + this.bpkx38.TabStop = false; + // + // bpkx37 + // + this.bpkx37.BackColor = System.Drawing.Color.Transparent; + this.bpkx37.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx37.Location = new System.Drawing.Point(2, 188); + this.bpkx37.Name = "bpkx37"; + this.bpkx37.Size = new System.Drawing.Size(42, 32); + this.bpkx37.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx37.TabIndex = 36; + this.bpkx37.TabStop = false; + // + // bpkx36 + // + this.bpkx36.BackColor = System.Drawing.Color.Transparent; + this.bpkx36.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx36.Location = new System.Drawing.Point(207, 157); + this.bpkx36.Name = "bpkx36"; + this.bpkx36.Size = new System.Drawing.Size(42, 32); + this.bpkx36.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx36.TabIndex = 35; + this.bpkx36.TabStop = false; + // + // bpkx35 + // + this.bpkx35.BackColor = System.Drawing.Color.Transparent; + this.bpkx35.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx35.Location = new System.Drawing.Point(166, 157); + this.bpkx35.Name = "bpkx35"; + this.bpkx35.Size = new System.Drawing.Size(42, 32); + this.bpkx35.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx35.TabIndex = 34; + this.bpkx35.TabStop = false; + // + // bpkx34 + // + this.bpkx34.BackColor = System.Drawing.Color.Transparent; + this.bpkx34.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx34.Location = new System.Drawing.Point(125, 157); + this.bpkx34.Name = "bpkx34"; + this.bpkx34.Size = new System.Drawing.Size(42, 32); + this.bpkx34.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx34.TabIndex = 33; + this.bpkx34.TabStop = false; + // + // bpkx33 + // + this.bpkx33.BackColor = System.Drawing.Color.Transparent; + this.bpkx33.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx33.Location = new System.Drawing.Point(84, 157); + this.bpkx33.Name = "bpkx33"; + this.bpkx33.Size = new System.Drawing.Size(42, 32); + this.bpkx33.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx33.TabIndex = 32; + this.bpkx33.TabStop = false; + // + // bpkx32 + // + this.bpkx32.BackColor = System.Drawing.Color.Transparent; + this.bpkx32.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx32.Location = new System.Drawing.Point(43, 157); + this.bpkx32.Name = "bpkx32"; + this.bpkx32.Size = new System.Drawing.Size(42, 32); + this.bpkx32.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx32.TabIndex = 31; + this.bpkx32.TabStop = false; + // + // bpkx31 + // + this.bpkx31.BackColor = System.Drawing.Color.Transparent; + this.bpkx31.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx31.Location = new System.Drawing.Point(2, 157); + this.bpkx31.Name = "bpkx31"; + this.bpkx31.Size = new System.Drawing.Size(42, 32); + this.bpkx31.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx31.TabIndex = 30; + this.bpkx31.TabStop = false; + // + // menuStrip1 + // + this.menuStrip1.BackColor = System.Drawing.Color.Transparent; + this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.Menu_Close, + this.Menu_Tools}); + this.menuStrip1.Location = new System.Drawing.Point(0, 0); + this.menuStrip1.Name = "menuStrip1"; + this.menuStrip1.Size = new System.Drawing.Size(544, 24); + this.menuStrip1.TabIndex = 65; + this.menuStrip1.Text = "menuStrip1"; + // + // Menu_Close + // + this.Menu_Close.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.Menu_Exit}); + this.Menu_Close.Name = "Menu_Close"; + this.Menu_Close.Size = new System.Drawing.Size(37, 20); + this.Menu_Close.Text = "File"; + // + // Menu_Exit + // + this.Menu_Exit.Image = global::PKHeX.Properties.Resources.exit; + this.Menu_Exit.Name = "Menu_Exit"; + this.Menu_Exit.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E))); + this.Menu_Exit.ShowShortcutKeys = false; + this.Menu_Exit.Size = new System.Drawing.Size(96, 22); + this.Menu_Exit.Text = "&Close"; + this.Menu_Exit.Click += new System.EventHandler(this.Menu_Exit_Click); + // + // Menu_Tools + // + this.Menu_Tools.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.Menu_SearchSettings, + this.Menu_OpenDB, + this.Menu_Export}); + this.Menu_Tools.Name = "Menu_Tools"; + this.Menu_Tools.Size = new System.Drawing.Size(47, 20); + this.Menu_Tools.Text = "Tools"; + // + // Menu_SearchSettings + // + this.Menu_SearchSettings.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.Menu_SearchBoxes, + this.Menu_SearchDatabase, + this.Menu_SearchLegal, + this.Menu_SearchIllegal, + this.Menu_SearchAdvanced}); + this.Menu_SearchSettings.Image = global::PKHeX.Properties.Resources.settings; + this.Menu_SearchSettings.Name = "Menu_SearchSettings"; + this.Menu_SearchSettings.Size = new System.Drawing.Size(197, 22); + this.Menu_SearchSettings.Text = "Search Settings"; + // + // Menu_SearchBoxes + // + this.Menu_SearchBoxes.Checked = true; + this.Menu_SearchBoxes.CheckOnClick = true; + this.Menu_SearchBoxes.CheckState = System.Windows.Forms.CheckState.Checked; + this.Menu_SearchBoxes.Name = "Menu_SearchBoxes"; + this.Menu_SearchBoxes.Size = new System.Drawing.Size(207, 22); + this.Menu_SearchBoxes.Text = "Search Within Boxes"; + // + // Menu_SearchDatabase + // + this.Menu_SearchDatabase.Checked = true; + this.Menu_SearchDatabase.CheckOnClick = true; + this.Menu_SearchDatabase.CheckState = System.Windows.Forms.CheckState.Checked; + this.Menu_SearchDatabase.Name = "Menu_SearchDatabase"; + this.Menu_SearchDatabase.Size = new System.Drawing.Size(207, 22); + this.Menu_SearchDatabase.Text = "Search Within Database"; + // + // Menu_SearchLegal + // + this.Menu_SearchLegal.Checked = true; + this.Menu_SearchLegal.CheckOnClick = true; + this.Menu_SearchLegal.CheckState = System.Windows.Forms.CheckState.Checked; + this.Menu_SearchLegal.Name = "Menu_SearchLegal"; + this.Menu_SearchLegal.Size = new System.Drawing.Size(207, 22); + this.Menu_SearchLegal.Text = "Show Legal"; + // + // Menu_SearchIllegal + // + this.Menu_SearchIllegal.Checked = true; + this.Menu_SearchIllegal.CheckOnClick = true; + this.Menu_SearchIllegal.CheckState = System.Windows.Forms.CheckState.Checked; + this.Menu_SearchIllegal.Name = "Menu_SearchIllegal"; + this.Menu_SearchIllegal.Size = new System.Drawing.Size(207, 22); + this.Menu_SearchIllegal.Text = "Show Illegal"; + // + // Menu_SearchAdvanced + // + this.Menu_SearchAdvanced.CheckOnClick = true; + this.Menu_SearchAdvanced.Name = "Menu_SearchAdvanced"; + this.Menu_SearchAdvanced.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A))); + this.Menu_SearchAdvanced.Size = new System.Drawing.Size(207, 22); + this.Menu_SearchAdvanced.Text = "Advanced Search"; + this.Menu_SearchAdvanced.Click += new System.EventHandler(this.Menu_SearchAdvanced_Click); + // + // Menu_OpenDB + // + this.Menu_OpenDB.Image = global::PKHeX.Properties.Resources.folder; + this.Menu_OpenDB.Name = "Menu_OpenDB"; + this.Menu_OpenDB.Size = new System.Drawing.Size(197, 22); + this.Menu_OpenDB.Text = "Open Database Folder"; + this.Menu_OpenDB.Click += new System.EventHandler(this.openDB); + // + // Menu_Export + // + this.Menu_Export.Image = global::PKHeX.Properties.Resources.export; + this.Menu_Export.Name = "Menu_Export"; + this.Menu_Export.Size = new System.Drawing.Size(197, 22); + this.Menu_Export.Text = "Export Results to Folder"; + this.Menu_Export.Click += new System.EventHandler(this.Menu_Export_Click); + // + // P_Results + // + this.P_Results.BackColor = System.Drawing.SystemColors.ButtonHighlight; + this.P_Results.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.P_Results.Controls.Add(this.PAN_Box); + this.P_Results.Controls.Add(this.SCR_Box); + this.P_Results.Location = new System.Drawing.Point(12, 27); + this.P_Results.Name = "P_Results"; + this.P_Results.Size = new System.Drawing.Size(285, 352); + this.P_Results.TabIndex = 66; + // + // PAN_Box + // + this.PAN_Box.BackgroundImage = global::PKHeX.Properties.Resources.box_wp16xy; + this.PAN_Box.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.PAN_Box.Controls.Add(this.bpkx66); + this.PAN_Box.Controls.Add(this.bpkx65); + this.PAN_Box.Controls.Add(this.bpkx64); + this.PAN_Box.Controls.Add(this.bpkx63); + this.PAN_Box.Controls.Add(this.bpkx62); + this.PAN_Box.Controls.Add(this.bpkx61); + this.PAN_Box.Controls.Add(this.bpkx30); + this.PAN_Box.Controls.Add(this.bpkx1); + this.PAN_Box.Controls.Add(this.bpkx60); + this.PAN_Box.Controls.Add(this.bpkx31); + this.PAN_Box.Controls.Add(this.bpkx29); + this.PAN_Box.Controls.Add(this.bpkx32); + this.PAN_Box.Controls.Add(this.bpkx33); + this.PAN_Box.Controls.Add(this.bpkx28); + this.PAN_Box.Controls.Add(this.bpkx34); + this.PAN_Box.Controls.Add(this.bpkx59); + this.PAN_Box.Controls.Add(this.bpkx35); + this.PAN_Box.Controls.Add(this.bpkx27); + this.PAN_Box.Controls.Add(this.bpkx36); + this.PAN_Box.Controls.Add(this.bpkx37); + this.PAN_Box.Controls.Add(this.bpkx26); + this.PAN_Box.Controls.Add(this.bpkx38); + this.PAN_Box.Controls.Add(this.bpkx58); + this.PAN_Box.Controls.Add(this.bpkx39); + this.PAN_Box.Controls.Add(this.bpkx25); + this.PAN_Box.Controls.Add(this.bpkx40); + this.PAN_Box.Controls.Add(this.bpkx41); + this.PAN_Box.Controls.Add(this.bpkx24); + this.PAN_Box.Controls.Add(this.bpkx42); + this.PAN_Box.Controls.Add(this.bpkx57); + this.PAN_Box.Controls.Add(this.bpkx43); + this.PAN_Box.Controls.Add(this.bpkx23); + this.PAN_Box.Controls.Add(this.bpkx44); + this.PAN_Box.Controls.Add(this.bpkx22); + this.PAN_Box.Controls.Add(this.bpkx45); + this.PAN_Box.Controls.Add(this.bpkx46); + this.PAN_Box.Controls.Add(this.bpkx21); + this.PAN_Box.Controls.Add(this.bpkx2); + this.PAN_Box.Controls.Add(this.bpkx56); + this.PAN_Box.Controls.Add(this.bpkx47); + this.PAN_Box.Controls.Add(this.bpkx20); + this.PAN_Box.Controls.Add(this.bpkx3); + this.PAN_Box.Controls.Add(this.bpkx4); + this.PAN_Box.Controls.Add(this.bpkx19); + this.PAN_Box.Controls.Add(this.bpkx48); + this.PAN_Box.Controls.Add(this.bpkx55); + this.PAN_Box.Controls.Add(this.bpkx5); + this.PAN_Box.Controls.Add(this.bpkx18); + this.PAN_Box.Controls.Add(this.bpkx6); + this.PAN_Box.Controls.Add(this.bpkx49); + this.PAN_Box.Controls.Add(this.bpkx17); + this.PAN_Box.Controls.Add(this.bpkx7); + this.PAN_Box.Controls.Add(this.bpkx54); + this.PAN_Box.Controls.Add(this.bpkx8); + this.PAN_Box.Controls.Add(this.bpkx16); + this.PAN_Box.Controls.Add(this.bpkx50); + this.PAN_Box.Controls.Add(this.bpkx9); + this.PAN_Box.Controls.Add(this.bpkx15); + this.PAN_Box.Controls.Add(this.bpkx10); + this.PAN_Box.Controls.Add(this.bpkx53); + this.PAN_Box.Controls.Add(this.bpkx51); + this.PAN_Box.Controls.Add(this.bpkx14); + this.PAN_Box.Controls.Add(this.bpkx11); + this.PAN_Box.Controls.Add(this.bpkx12); + this.PAN_Box.Controls.Add(this.bpkx13); + this.PAN_Box.Controls.Add(this.bpkx52); + this.PAN_Box.Location = new System.Drawing.Point(3, 3); + this.PAN_Box.Name = "PAN_Box"; + this.PAN_Box.Size = new System.Drawing.Size(251, 346); + this.PAN_Box.TabIndex = 63; + // + // bpkx66 + // + this.bpkx66.BackColor = System.Drawing.Color.Transparent; + this.bpkx66.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx66.Location = new System.Drawing.Point(207, 312); + this.bpkx66.Name = "bpkx66"; + this.bpkx66.Size = new System.Drawing.Size(42, 32); + this.bpkx66.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx66.TabIndex = 65; + this.bpkx66.TabStop = false; + // + // bpkx65 + // + this.bpkx65.BackColor = System.Drawing.Color.Transparent; + this.bpkx65.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx65.Location = new System.Drawing.Point(166, 312); + this.bpkx65.Name = "bpkx65"; + this.bpkx65.Size = new System.Drawing.Size(42, 32); + this.bpkx65.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx65.TabIndex = 64; + this.bpkx65.TabStop = false; + // + // bpkx64 + // + this.bpkx64.BackColor = System.Drawing.Color.Transparent; + this.bpkx64.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx64.Location = new System.Drawing.Point(125, 312); + this.bpkx64.Name = "bpkx64"; + this.bpkx64.Size = new System.Drawing.Size(42, 32); + this.bpkx64.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx64.TabIndex = 63; + this.bpkx64.TabStop = false; + // + // bpkx63 + // + this.bpkx63.BackColor = System.Drawing.Color.Transparent; + this.bpkx63.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx63.Location = new System.Drawing.Point(84, 312); + this.bpkx63.Name = "bpkx63"; + this.bpkx63.Size = new System.Drawing.Size(42, 32); + this.bpkx63.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx63.TabIndex = 62; + this.bpkx63.TabStop = false; + // + // bpkx62 + // + this.bpkx62.BackColor = System.Drawing.Color.Transparent; + this.bpkx62.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx62.Location = new System.Drawing.Point(43, 312); + this.bpkx62.Name = "bpkx62"; + this.bpkx62.Size = new System.Drawing.Size(42, 32); + this.bpkx62.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx62.TabIndex = 61; + this.bpkx62.TabStop = false; + // + // bpkx61 + // + this.bpkx61.BackColor = System.Drawing.Color.Transparent; + this.bpkx61.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx61.Location = new System.Drawing.Point(2, 312); + this.bpkx61.Name = "bpkx61"; + this.bpkx61.Size = new System.Drawing.Size(42, 32); + this.bpkx61.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx61.TabIndex = 60; + this.bpkx61.TabStop = false; + // + // CB_HeldItem + // + this.CB_HeldItem.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.CB_HeldItem.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.CB_HeldItem.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_HeldItem.FormattingEnabled = true; + this.CB_HeldItem.Location = new System.Drawing.Point(61, 38); + this.CB_HeldItem.Margin = new System.Windows.Forms.Padding(0); + this.CB_HeldItem.Name = "CB_HeldItem"; + this.CB_HeldItem.Size = new System.Drawing.Size(122, 21); + this.CB_HeldItem.TabIndex = 69; + // + // CB_Species + // + this.CB_Species.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.CB_Species.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.CB_Species.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_Species.FormattingEnabled = true; + this.CB_Species.Location = new System.Drawing.Point(61, 17); + this.CB_Species.Margin = new System.Windows.Forms.Padding(0); + this.CB_Species.Name = "CB_Species"; + this.CB_Species.Size = new System.Drawing.Size(122, 21); + this.CB_Species.TabIndex = 67; + // + // CB_Move4 + // + this.CB_Move4.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.CB_Move4.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.CB_Move4.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_Move4.FormattingEnabled = true; + this.CB_Move4.Location = new System.Drawing.Point(61, 122); + this.CB_Move4.Margin = new System.Windows.Forms.Padding(0); + this.CB_Move4.Name = "CB_Move4"; + this.CB_Move4.Size = new System.Drawing.Size(122, 21); + this.CB_Move4.TabIndex = 74; + // + // CB_Move3 + // + this.CB_Move3.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.CB_Move3.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.CB_Move3.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_Move3.FormattingEnabled = true; + this.CB_Move3.Location = new System.Drawing.Point(61, 101); + this.CB_Move3.Margin = new System.Windows.Forms.Padding(0); + this.CB_Move3.Name = "CB_Move3"; + this.CB_Move3.Size = new System.Drawing.Size(122, 21); + this.CB_Move3.TabIndex = 73; + // + // CB_Move2 + // + this.CB_Move2.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.CB_Move2.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.CB_Move2.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_Move2.FormattingEnabled = true; + this.CB_Move2.Location = new System.Drawing.Point(61, 80); + this.CB_Move2.Margin = new System.Windows.Forms.Padding(0); + this.CB_Move2.Name = "CB_Move2"; + this.CB_Move2.Size = new System.Drawing.Size(122, 21); + this.CB_Move2.TabIndex = 72; + // + // CB_Move1 + // + this.CB_Move1.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.CB_Move1.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.CB_Move1.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_Move1.FormattingEnabled = true; + this.CB_Move1.Location = new System.Drawing.Point(61, 59); + this.CB_Move1.Margin = new System.Windows.Forms.Padding(0); + this.CB_Move1.Name = "CB_Move1"; + this.CB_Move1.Size = new System.Drawing.Size(122, 21); + this.CB_Move1.TabIndex = 71; + // + // Label_HeldItem + // + this.Label_HeldItem.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.Label_HeldItem.AutoSize = true; + this.Label_HeldItem.Location = new System.Drawing.Point(3, 42); + this.Label_HeldItem.Margin = new System.Windows.Forms.Padding(3); + this.Label_HeldItem.Name = "Label_HeldItem"; + this.Label_HeldItem.Size = new System.Drawing.Size(55, 13); + this.Label_HeldItem.TabIndex = 93; + this.Label_HeldItem.Text = "Held Item:"; + this.Label_HeldItem.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // Label_Species + // + this.Label_Species.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.Label_Species.AutoSize = true; + this.Label_Species.Location = new System.Drawing.Point(10, 21); + this.Label_Species.Margin = new System.Windows.Forms.Padding(3); + this.Label_Species.Name = "Label_Species"; + this.Label_Species.Size = new System.Drawing.Size(48, 13); + this.Label_Species.TabIndex = 90; + this.Label_Species.Text = "Species:"; + this.Label_Species.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // B_Search + // + this.B_Search.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.B_Search.Location = new System.Drawing.Point(317, 350); + this.B_Search.Name = "B_Search"; + this.B_Search.Size = new System.Drawing.Size(206, 30); + this.B_Search.TabIndex = 102; + this.B_Search.Text = "Search!"; + this.B_Search.UseVisualStyleBackColor = true; + this.B_Search.Click += new System.EventHandler(this.B_Search_Click); + // + // L_Move1 + // + this.L_Move1.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.L_Move1.AutoSize = true; + this.L_Move1.Location = new System.Drawing.Point(12, 63); + this.L_Move1.Margin = new System.Windows.Forms.Padding(3); + this.L_Move1.Name = "L_Move1"; + this.L_Move1.Size = new System.Drawing.Size(46, 13); + this.L_Move1.TabIndex = 105; + this.L_Move1.Text = "Move 1:"; + this.L_Move1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // L_Move2 + // + this.L_Move2.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.L_Move2.AutoSize = true; + this.L_Move2.Location = new System.Drawing.Point(12, 84); + this.L_Move2.Margin = new System.Windows.Forms.Padding(3); + this.L_Move2.Name = "L_Move2"; + this.L_Move2.Size = new System.Drawing.Size(46, 13); + this.L_Move2.TabIndex = 106; + this.L_Move2.Text = "Move 2:"; + this.L_Move2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // L_Move3 + // + this.L_Move3.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.L_Move3.AutoSize = true; + this.L_Move3.Location = new System.Drawing.Point(12, 105); + this.L_Move3.Margin = new System.Windows.Forms.Padding(3); + this.L_Move3.Name = "L_Move3"; + this.L_Move3.Size = new System.Drawing.Size(46, 13); + this.L_Move3.TabIndex = 107; + this.L_Move3.Text = "Move 3:"; + this.L_Move3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // L_Move4 + // + this.L_Move4.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.L_Move4.AutoSize = true; + this.L_Move4.Location = new System.Drawing.Point(12, 126); + this.L_Move4.Margin = new System.Windows.Forms.Padding(3); + this.L_Move4.Name = "L_Move4"; + this.L_Move4.Size = new System.Drawing.Size(46, 13); + this.L_Move4.TabIndex = 108; + this.L_Move4.Text = "Move 4:"; + this.L_Move4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // B_Reset + // + this.B_Reset.Location = new System.Drawing.Point(223, 3); + this.B_Reset.Name = "B_Reset"; + this.B_Reset.Size = new System.Drawing.Size(75, 23); + this.B_Reset.TabIndex = 111; + this.B_Reset.Text = "Reset Filters"; + this.B_Reset.UseVisualStyleBackColor = true; + this.B_Reset.Click += new System.EventHandler(this.resetFilters); + // + // L_Count + // + this.L_Count.Location = new System.Drawing.Point(99, 11); + this.L_Count.Name = "L_Count"; + this.L_Count.Size = new System.Drawing.Size(83, 13); + this.L_Count.TabIndex = 114; + this.L_Count.Text = "Count: {0}"; + this.L_Count.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // L_Viewed + // + this.L_Viewed.AutoSize = true; + this.L_Viewed.Location = new System.Drawing.Point(9, 381); + this.L_Viewed.Name = "L_Viewed"; + this.L_Viewed.Size = new System.Drawing.Size(85, 13); + this.L_Viewed.TabIndex = 117; + this.L_Viewed.Text = "Last Viewed: {0}"; + this.L_Viewed.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // FLP_Egg + // + this.FLP_Egg.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.FLP_Egg.AutoSize = true; + this.FLP_Egg.Controls.Add(this.CHK_IsEgg); + this.FLP_Egg.Location = new System.Drawing.Point(61, 0); + this.FLP_Egg.Margin = new System.Windows.Forms.Padding(0); + this.FLP_Egg.Name = "FLP_Egg"; + this.FLP_Egg.Size = new System.Drawing.Size(45, 17); + this.FLP_Egg.TabIndex = 120; + // + // CHK_IsEgg + // + this.CHK_IsEgg.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.CHK_IsEgg.AutoSize = true; + this.CHK_IsEgg.Checked = true; + this.CHK_IsEgg.CheckState = System.Windows.Forms.CheckState.Indeterminate; + this.CHK_IsEgg.Location = new System.Drawing.Point(0, 0); + this.CHK_IsEgg.Margin = new System.Windows.Forms.Padding(0); + this.CHK_IsEgg.Name = "CHK_IsEgg"; + this.CHK_IsEgg.Size = new System.Drawing.Size(45, 17); + this.CHK_IsEgg.TabIndex = 98; + this.CHK_IsEgg.Text = "Egg"; + this.CHK_IsEgg.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.CHK_IsEgg.ThreeState = true; + this.CHK_IsEgg.UseVisualStyleBackColor = true; + // + // CHK_Shiny + // + this.CHK_Shiny.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.CHK_Shiny.AutoSize = true; + this.CHK_Shiny.Checked = true; + this.CHK_Shiny.CheckState = System.Windows.Forms.CheckState.Indeterminate; + this.CHK_Shiny.Location = new System.Drawing.Point(9, 0); + this.CHK_Shiny.Margin = new System.Windows.Forms.Padding(0); + this.CHK_Shiny.Name = "CHK_Shiny"; + this.CHK_Shiny.Size = new System.Drawing.Size(52, 17); + this.CHK_Shiny.TabIndex = 99; + this.CHK_Shiny.Text = "Shiny"; + this.CHK_Shiny.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.CHK_Shiny.ThreeState = true; + this.CHK_Shiny.UseVisualStyleBackColor = true; + // + // TLP_Filters + // + this.TLP_Filters.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Right))); + this.TLP_Filters.AutoScroll = true; + this.TLP_Filters.AutoScrollMargin = new System.Drawing.Size(3, 3); + this.TLP_Filters.AutoSize = true; + this.TLP_Filters.ColumnCount = 2; + this.TLP_Filters.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.TLP_Filters.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.TLP_Filters.Controls.Add(this.FLP_Format, 1, 15); + this.TLP_Filters.Controls.Add(this.L_Format, 0, 15); + this.TLP_Filters.Controls.Add(this.FLP_Egg, 1, 0); + this.TLP_Filters.Controls.Add(this.CHK_Shiny, 0, 0); + this.TLP_Filters.Controls.Add(this.Label_Species, 0, 1); + this.TLP_Filters.Controls.Add(this.CB_Species, 1, 1); + this.TLP_Filters.Controls.Add(this.Label_HeldItem, 0, 3); + this.TLP_Filters.Controls.Add(this.CB_HeldItem, 1, 3); + this.TLP_Filters.Controls.Add(this.FLP_Level, 1, 5); + this.TLP_Filters.Controls.Add(this.L_Move1, 0, 9); + this.TLP_Filters.Controls.Add(this.CB_Move1, 1, 9); + this.TLP_Filters.Controls.Add(this.L_Move2, 0, 10); + this.TLP_Filters.Controls.Add(this.CB_Move2, 1, 10); + this.TLP_Filters.Controls.Add(this.L_Move3, 0, 11); + this.TLP_Filters.Controls.Add(this.CB_Move3, 1, 11); + this.TLP_Filters.Controls.Add(this.L_Move4, 0, 12); + this.TLP_Filters.Controls.Add(this.CB_Move4, 1, 12); + this.TLP_Filters.Location = new System.Drawing.Point(304, 11); + this.TLP_Filters.Name = "TLP_Filters"; + this.TLP_Filters.RowCount = 17; + this.TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.TLP_Filters.Size = new System.Drawing.Size(228, 354); + this.TLP_Filters.TabIndex = 118; + // + // FLP_Format + // + this.FLP_Format.AutoSize = true; + this.FLP_Format.Controls.Add(this.CB_FormatComparator); + this.FLP_Format.Controls.Add(this.CB_Format); + this.FLP_Format.Location = new System.Drawing.Point(61, 143); + this.FLP_Format.Margin = new System.Windows.Forms.Padding(0); + this.FLP_Format.Name = "FLP_Format"; + this.FLP_Format.Size = new System.Drawing.Size(122, 21); + this.FLP_Format.TabIndex = 124; + // + // CB_FormatComparator + // + this.CB_FormatComparator.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.CB_FormatComparator.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CB_FormatComparator.FormattingEnabled = true; + this.CB_FormatComparator.Items.AddRange(new object[] { + "Any", + ">=", + "==", + "<="}); + this.CB_FormatComparator.Location = new System.Drawing.Point(0, 0); + this.CB_FormatComparator.Margin = new System.Windows.Forms.Padding(0); + this.CB_FormatComparator.Name = "CB_FormatComparator"; + this.CB_FormatComparator.Size = new System.Drawing.Size(54, 21); + this.CB_FormatComparator.TabIndex = 122; + this.CB_FormatComparator.SelectedIndexChanged += new System.EventHandler(this.changeFormatFilter); + // + // CB_Format + // + this.CB_Format.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.CB_Format.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CB_Format.FormattingEnabled = true; + this.CB_Format.Items.AddRange(new object[] { + "Any", + ".wc6", + ".pgf", + ".pcd/pgt"}); + this.CB_Format.Location = new System.Drawing.Point(54, 0); + this.CB_Format.Margin = new System.Windows.Forms.Padding(0); + this.CB_Format.Name = "CB_Format"; + this.CB_Format.Size = new System.Drawing.Size(68, 21); + this.CB_Format.TabIndex = 121; + this.CB_Format.Visible = false; + // + // L_Format + // + this.L_Format.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.L_Format.AutoSize = true; + this.L_Format.Location = new System.Drawing.Point(16, 147); + this.L_Format.Margin = new System.Windows.Forms.Padding(3); + this.L_Format.Name = "L_Format"; + this.L_Format.Size = new System.Drawing.Size(42, 13); + this.L_Format.TabIndex = 122; + this.L_Format.Text = "Format:"; + this.L_Format.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // FLP_Level + // + this.FLP_Level.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.FLP_Level.AutoSize = true; + this.FLP_Level.Location = new System.Drawing.Point(61, 59); + this.FLP_Level.Margin = new System.Windows.Forms.Padding(0); + this.FLP_Level.Name = "FLP_Level"; + this.FLP_Level.Size = new System.Drawing.Size(0, 0); + this.FLP_Level.TabIndex = 119; + // + // RTB_Instructions + // + this.RTB_Instructions.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Right))); + this.RTB_Instructions.Location = new System.Drawing.Point(63, 27); + this.RTB_Instructions.Name = "RTB_Instructions"; + this.RTB_Instructions.Size = new System.Drawing.Size(235, 352); + this.RTB_Instructions.TabIndex = 119; + this.RTB_Instructions.Text = ""; + // + // SAV_MysteryGiftDB + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(544, 396); + this.Controls.Add(this.B_Search); + this.Controls.Add(this.TLP_Filters); + this.Controls.Add(this.L_Viewed); + this.Controls.Add(this.L_Count); + this.Controls.Add(this.B_Reset); + this.Controls.Add(this.P_Results); + this.Controls.Add(this.menuStrip1); + this.Controls.Add(this.RTB_Instructions); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.MaximizeBox = false; + this.MaximumSize = new System.Drawing.Size(800, 435); + this.MinimizeBox = false; + this.MinimumSize = new System.Drawing.Size(560, 435); + this.Name = "SAV_MysteryGiftDB"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "Database"; + ((System.ComponentModel.ISupportInitialize)(this.bpkx30)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx29)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx28)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx27)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx26)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx25)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx24)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx23)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx22)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx21)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx20)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx19)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx18)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx17)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx16)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx15)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx14)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx13)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx12)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx11)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx10)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx9)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx8)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx7)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx6)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx60)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx59)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx58)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx57)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx56)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx55)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx54)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx53)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx52)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx51)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx50)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx49)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx48)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx47)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx46)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx45)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx44)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx43)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx42)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx41)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx40)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx39)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx38)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx37)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx36)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx35)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx34)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx33)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx32)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx31)).EndInit(); + this.menuStrip1.ResumeLayout(false); + this.menuStrip1.PerformLayout(); + this.P_Results.ResumeLayout(false); + this.PAN_Box.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.bpkx66)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx65)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx64)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx63)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx62)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bpkx61)).EndInit(); + this.FLP_Egg.ResumeLayout(false); + this.FLP_Egg.PerformLayout(); + this.TLP_Filters.ResumeLayout(false); + this.TLP_Filters.PerformLayout(); + this.FLP_Format.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.VScrollBar SCR_Box; + private System.Windows.Forms.PictureBox bpkx30; + private System.Windows.Forms.PictureBox bpkx29; + private System.Windows.Forms.PictureBox bpkx28; + private System.Windows.Forms.PictureBox bpkx27; + private System.Windows.Forms.PictureBox bpkx26; + private System.Windows.Forms.PictureBox bpkx25; + private System.Windows.Forms.PictureBox bpkx24; + private System.Windows.Forms.PictureBox bpkx23; + private System.Windows.Forms.PictureBox bpkx22; + private System.Windows.Forms.PictureBox bpkx21; + private System.Windows.Forms.PictureBox bpkx20; + private System.Windows.Forms.PictureBox bpkx19; + private System.Windows.Forms.PictureBox bpkx18; + private System.Windows.Forms.PictureBox bpkx17; + private System.Windows.Forms.PictureBox bpkx16; + private System.Windows.Forms.PictureBox bpkx15; + private System.Windows.Forms.PictureBox bpkx14; + private System.Windows.Forms.PictureBox bpkx13; + private System.Windows.Forms.PictureBox bpkx12; + private System.Windows.Forms.PictureBox bpkx11; + private System.Windows.Forms.PictureBox bpkx10; + private System.Windows.Forms.PictureBox bpkx9; + private System.Windows.Forms.PictureBox bpkx8; + private System.Windows.Forms.PictureBox bpkx7; + private System.Windows.Forms.PictureBox bpkx6; + private System.Windows.Forms.PictureBox bpkx5; + private System.Windows.Forms.PictureBox bpkx4; + private System.Windows.Forms.PictureBox bpkx3; + private System.Windows.Forms.PictureBox bpkx2; + private System.Windows.Forms.PictureBox bpkx1; + private System.Windows.Forms.PictureBox bpkx60; + private System.Windows.Forms.PictureBox bpkx59; + private System.Windows.Forms.PictureBox bpkx58; + private System.Windows.Forms.PictureBox bpkx57; + private System.Windows.Forms.PictureBox bpkx56; + private System.Windows.Forms.PictureBox bpkx55; + private System.Windows.Forms.PictureBox bpkx54; + private System.Windows.Forms.PictureBox bpkx53; + private System.Windows.Forms.PictureBox bpkx52; + private System.Windows.Forms.PictureBox bpkx51; + private System.Windows.Forms.PictureBox bpkx50; + private System.Windows.Forms.PictureBox bpkx49; + private System.Windows.Forms.PictureBox bpkx48; + private System.Windows.Forms.PictureBox bpkx47; + private System.Windows.Forms.PictureBox bpkx46; + private System.Windows.Forms.PictureBox bpkx45; + private System.Windows.Forms.PictureBox bpkx44; + private System.Windows.Forms.PictureBox bpkx43; + private System.Windows.Forms.PictureBox bpkx42; + private System.Windows.Forms.PictureBox bpkx41; + private System.Windows.Forms.PictureBox bpkx40; + private System.Windows.Forms.PictureBox bpkx39; + private System.Windows.Forms.PictureBox bpkx38; + private System.Windows.Forms.PictureBox bpkx37; + private System.Windows.Forms.PictureBox bpkx36; + private System.Windows.Forms.PictureBox bpkx35; + private System.Windows.Forms.PictureBox bpkx34; + private System.Windows.Forms.PictureBox bpkx33; + private System.Windows.Forms.PictureBox bpkx32; + private System.Windows.Forms.PictureBox bpkx31; + private System.Windows.Forms.MenuStrip menuStrip1; + private System.Windows.Forms.ToolStripMenuItem Menu_Close; + private System.Windows.Forms.ToolStripMenuItem Menu_Exit; + private System.Windows.Forms.ToolStripMenuItem Menu_Tools; + private System.Windows.Forms.ToolStripMenuItem Menu_OpenDB; + private System.Windows.Forms.Panel P_Results; + private System.Windows.Forms.ComboBox CB_HeldItem; + public System.Windows.Forms.ComboBox CB_Species; + private System.Windows.Forms.ComboBox CB_Move4; + private System.Windows.Forms.ComboBox CB_Move3; + private System.Windows.Forms.ComboBox CB_Move2; + private System.Windows.Forms.ComboBox CB_Move1; + private System.Windows.Forms.Label Label_HeldItem; + private System.Windows.Forms.Label Label_Species; + private System.Windows.Forms.Button B_Search; + private System.Windows.Forms.Label L_Move1; + private System.Windows.Forms.Label L_Move2; + private System.Windows.Forms.Label L_Move3; + private System.Windows.Forms.Label L_Move4; + private System.Windows.Forms.Button B_Reset; + private System.Windows.Forms.Label L_Count; + private System.Windows.Forms.Panel PAN_Box; + private System.Windows.Forms.PictureBox bpkx66; + private System.Windows.Forms.PictureBox bpkx65; + private System.Windows.Forms.PictureBox bpkx64; + private System.Windows.Forms.PictureBox bpkx63; + private System.Windows.Forms.PictureBox bpkx62; + private System.Windows.Forms.PictureBox bpkx61; + private System.Windows.Forms.Label L_Viewed; + private System.Windows.Forms.ToolStripMenuItem Menu_Export; + private System.Windows.Forms.ToolStripMenuItem Menu_SearchSettings; + private System.Windows.Forms.ToolStripMenuItem Menu_SearchBoxes; + private System.Windows.Forms.ToolStripMenuItem Menu_SearchDatabase; + private System.Windows.Forms.ToolStripMenuItem Menu_SearchLegal; + private System.Windows.Forms.ToolStripMenuItem Menu_SearchIllegal; + private System.Windows.Forms.TableLayoutPanel TLP_Filters; + public System.Windows.Forms.CheckBox CHK_Shiny; + public System.Windows.Forms.CheckBox CHK_IsEgg; + private System.Windows.Forms.FlowLayoutPanel FLP_Egg; + private System.Windows.Forms.FlowLayoutPanel FLP_Level; + private System.Windows.Forms.Label L_Format; + private System.Windows.Forms.FlowLayoutPanel FLP_Format; + private System.Windows.Forms.ComboBox CB_FormatComparator; + private System.Windows.Forms.ComboBox CB_Format; + private System.Windows.Forms.RichTextBox RTB_Instructions; + private System.Windows.Forms.ToolStripMenuItem Menu_SearchAdvanced; + } +} \ No newline at end of file diff --git a/PKHeX/Subforms/SAV_MysteryGiftDB.cs b/PKHeX/Subforms/SAV_MysteryGiftDB.cs new file mode 100644 index 000000000..f6a4819af --- /dev/null +++ b/PKHeX/Subforms/SAV_MysteryGiftDB.cs @@ -0,0 +1,351 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Drawing; +using System.IO; +using System.Linq; +using System.Windows.Forms; + +namespace PKHeX +{ + public partial class SAV_MysteryGiftDB : Form + { + public SAV_MysteryGiftDB(Main f1) + { + m_parent = f1; + InitializeComponent(); + + // Preset Filters to only show PKM available for loaded save + CB_FormatComparator.SelectedIndex = 3; // <= + + PKXBOXES = new[] + { + bpkx1, bpkx2, bpkx3, bpkx4, bpkx5, bpkx6, + bpkx7, bpkx8, bpkx9, bpkx10,bpkx11,bpkx12, + bpkx13,bpkx14,bpkx15,bpkx16,bpkx17,bpkx18, + bpkx19,bpkx20,bpkx21,bpkx22,bpkx23,bpkx24, + bpkx25,bpkx26,bpkx27,bpkx28,bpkx29,bpkx30, + + bpkx31,bpkx32,bpkx33,bpkx34,bpkx35,bpkx36, + bpkx37,bpkx38,bpkx39,bpkx40,bpkx41,bpkx42, + bpkx43,bpkx44,bpkx45,bpkx46,bpkx47,bpkx48, + bpkx49,bpkx50,bpkx51,bpkx52,bpkx53,bpkx54, + bpkx55,bpkx56,bpkx57,bpkx58,bpkx59,bpkx60, + bpkx61,bpkx62,bpkx63,bpkx64,bpkx65,bpkx66, + }; + + // Enable Scrolling when hovered over + PAN_Box.MouseHover += (sender, args) => + { + if (ActiveForm == this) + SCR_Box.Focus(); + }; + foreach (var slot in PKXBOXES) + { + slot.MouseEnter += (sender, args) => + { + if (ActiveForm == this) + SCR_Box.Focus(); + }; + // Enable Click + slot.MouseClick += (sender, args) => + { + if (ModifierKeys == Keys.Control) + clickView(sender, args); + }; + } + + Counter = L_Count.Text; + Viewed = L_Viewed.Text; + L_Viewed.Text = ""; // invis for now + populateComboBoxes(); + + ContextMenuStrip mnu = new ContextMenuStrip(); + ToolStripMenuItem mnuView = new ToolStripMenuItem("View"); + + // Assign event handlers + mnuView.Click += clickView; + + // Add to main context menu + mnu.Items.AddRange(new ToolStripItem[] { mnuView }); + + // Assign to datagridview + foreach (PictureBox p in PKXBOXES) + p.ContextMenuStrip = mnu; + + // Load Data + RawDB = new List(); + RawDB.AddRange(Legal.WC6DB); + foreach (string file in Directory.GetFiles(DatabasePath, "*", SearchOption.AllDirectories)) + { + FileInfo fi = new FileInfo(file); + if (!MysteryGift.getIsMysteryGift(fi.Length)) continue; + var mg = MysteryGift.getMysteryGift(File.ReadAllBytes(file), fi.Extension); + if (mg != null) + RawDB.Add(mg); + } + + RawDB = new List(RawDB.Where(mg => !mg.IsItem && mg.IsPokémon && mg.Species > 0).Distinct().OrderBy(mg => mg.Species)); + foreach (var mg in RawDB) + mg.GiftUsed = false; + setResults(RawDB); + + Menu_SearchSettings.DropDown.Closing += (sender, e) => + { + if (e.CloseReason == ToolStripDropDownCloseReason.ItemClicked) + e.Cancel = true; + }; + CenterToParent(); + } + private readonly Main m_parent; + private readonly PictureBox[] PKXBOXES; + private readonly string DatabasePath = Main.WC6DatabasePath; + private List Results; + private readonly List RawDB; + private int slotSelected = -1; // = null; + private Image slotColor; + private const int RES_MAX = 66; + private const int RES_MIN = 6; + private readonly string Counter; + private readonly string Viewed; + private const int MAXFORMAT = 6; + + // Important Events + private void clickView(object sender, EventArgs e) + { + sender = ((sender as ToolStripItem)?.Owner as ContextMenuStrip)?.SourceControl ?? sender as PictureBox; + int index = Array.IndexOf(PKXBOXES, sender); + + var dataArr = Results.Skip(SCR_Box.Value * RES_MIN).Take(RES_MAX).ToArray(); + if (index >= dataArr.Length) + System.Media.SystemSounds.Exclamation.Play(); + else + { + m_parent.populateFields(dataArr[index].convertToPKM(Main.SAV), false); + slotSelected = index + SCR_Box.Value * RES_MIN; + slotColor = Properties.Resources.slotView; + FillPKXBoxes(SCR_Box.Value); + L_Viewed.Text = string.Format(Viewed, dataArr[index].FileName); + } + } + private void populateComboBoxes() + { + // Set the Text + CB_HeldItem.DisplayMember = + CB_Species.DisplayMember = "Text"; + + // Set the Value + CB_HeldItem.ValueMember = + CB_Species.ValueMember = "Value"; + + var Any = new ComboItem {Text = "Any", Value = -1}; + + var DS_Species = new List(Main.SpeciesDataSource); + DS_Species.RemoveAt(0); DS_Species.Insert(0, Any); CB_Species.DataSource = DS_Species; + + var DS_Item = new List(Main.ItemDataSource); + DS_Item.Insert(0, Any); CB_HeldItem.DataSource = DS_Item; + + // Set the Move ComboBoxes too.. + var DS_Move = new List(Main.MoveDataSource); + DS_Move.RemoveAt(0); DS_Move.Insert(0, Any); + { + foreach (ComboBox cb in new[] { CB_Move1, CB_Move2, CB_Move3, CB_Move4 }) + { + cb.DisplayMember = "Text"; cb.ValueMember = "Value"; + cb.DataSource = new BindingSource(DS_Move, null); + } + } + + // Trigger a Reset + resetFilters(null, null); + } + private void resetFilters(object sender, EventArgs e) + { + CHK_Shiny.Checked = CHK_IsEgg.Checked = true; + CHK_Shiny.CheckState = CHK_IsEgg.CheckState = CheckState.Indeterminate; + CB_HeldItem.SelectedIndex = 0; + CB_Species.SelectedIndex = 0; + + CB_Move1.SelectedIndex = CB_Move2.SelectedIndex = CB_Move3.SelectedIndex = CB_Move4.SelectedIndex = 0; + RTB_Instructions.Clear(); + + if (sender != null) + System.Media.SystemSounds.Asterisk.Play(); + } + + // IO Usage + private void openDB(object sender, EventArgs e) + { + if (Directory.Exists(DatabasePath)) + Process.Start("explorer.exe", DatabasePath); + } + private void Menu_Export_Click(object sender, EventArgs e) + { + if (Results == null || Results.Count == 0) + { Util.Alert("No results to export."); return; } + + if (DialogResult.Yes != Util.Prompt(MessageBoxButtons.YesNo, "Export to a folder?")) + return; + + FolderBrowserDialog fbd = new FolderBrowserDialog(); + if (DialogResult.OK != fbd.ShowDialog()) + return; + + string path = fbd.SelectedPath; + if (!Directory.Exists(path)) // just in case... + Directory.CreateDirectory(path); + + foreach (var gift in Results) + File.WriteAllBytes(Path.Combine(path, Util.CleanFileName(gift.FileName)), gift.Data); + } + + // View Updates + private void B_Search_Click(object sender, EventArgs e) + { + // Populate Search Query Result + IEnumerable res = RawDB; + + int format = MAXFORMAT + 1 - CB_Format.SelectedIndex; + + switch (CB_FormatComparator.SelectedIndex) + { + case 0: /* Do nothing */ break; + case 1: res = res.Where(mg => mg.Format >= format); break; + case 2: res = res.Where(mg => mg.Format == format); break; + case 3: res = res.Where(mg => mg.Format <= format); break; + } + + // Primary Searchables + int species = Util.getIndex(CB_Species); + int item = Util.getIndex(CB_HeldItem); + if (species != -1) res = res.Where(pk => pk.Species == species); + if (item != -1) res = res.Where(pk => pk.HeldItem == item); + + // Secondary Searchables + int move1 = Util.getIndex(CB_Move1); + int move2 = Util.getIndex(CB_Move2); + int move3 = Util.getIndex(CB_Move3); + int move4 = Util.getIndex(CB_Move4); + if (move1 != -1) res = res.Where(pk => pk.Moves.Contains(move1)); + if (move2 != -1) res = res.Where(pk => pk.Moves.Contains(move2)); + if (move3 != -1) res = res.Where(pk => pk.Moves.Contains(move3)); + if (move4 != -1) res = res.Where(pk => pk.Moves.Contains(move4)); + if (CHK_Shiny.CheckState == CheckState.Checked) res = res.Where(pk => pk.IsShiny); + if (CHK_Shiny.CheckState == CheckState.Unchecked) res = res.Where(pk => !pk.IsShiny); + if (CHK_IsEgg.CheckState == CheckState.Checked) res = res.Where(pk => pk.IsEgg); + if (CHK_IsEgg.CheckState == CheckState.Unchecked) res = res.Where(pk => !pk.IsEgg); + + slotSelected = -1; // reset the slot last viewed + + if (RTB_Instructions.Lines.Any(line => line.Length > 0)) + { + var raw = + RTB_Instructions.Lines + .Where(line => !string.IsNullOrWhiteSpace(line)) + .Where(line => new[] { '!', '=' }.Contains(line[0])); + + var filters = (from line in raw + let eval = line[0] == '=' + let split = line.Substring(1).Split('=') + where split.Length == 2 && !string.IsNullOrWhiteSpace(split[0]) + select new BatchEditor.StringInstruction { PropertyName = split[0], PropertyValue = split[1], Evaluator = eval }).ToArray(); + + if (filters.Any(z => string.IsNullOrWhiteSpace(z.PropertyValue))) + { Util.Error("Empty Filter Value detected."); return; } + + res = res.Where(gift => // Compare across all filters + { + foreach (var cmd in filters) + { + if (!gift.GetType().HasProperty(cmd.PropertyName)) + return false; + try { if (ReflectUtil.GetValueEquals(gift, cmd.PropertyName, cmd.PropertyValue) == cmd.Evaluator) continue; } + catch { Console.WriteLine($"Unable to compare {cmd.PropertyName} to {cmd.PropertyValue}."); } + return false; + } + return true; + }); + } + + var results = res.ToArray(); + if (results.Length == 0) + { + if (!Menu_SearchBoxes.Checked && !Menu_SearchDatabase.Checked) + Util.Alert("No data source to search!", "No results found!"); + else + Util.Alert("No results found!"); + } + setResults(new List(results)); // updates Count Label as well. + System.Media.SystemSounds.Asterisk.Play(); + } + private void updateScroll(object sender, ScrollEventArgs e) + { + if (e.OldValue != e.NewValue) + FillPKXBoxes(e.NewValue); + } + private void setResults(List res) + { + Results = new List(res); + + SCR_Box.Maximum = (int)Math.Ceiling((decimal)Results.Count / RES_MIN); + if (SCR_Box.Maximum > 0) SCR_Box.Maximum -= 1; + + SCR_Box.Value = 0; + FillPKXBoxes(0); + + L_Count.Text = string.Format(Counter, Results.Count); + } + private void FillPKXBoxes(int start) + { + if (Results == null) + for (int i = 0; i < RES_MAX; i++) + PKXBOXES[i].Image = null; + var data = Results.Skip(start * RES_MIN).Take(RES_MAX).ToArray(); + for (int i = 0; i < data.Length; i++) + PKXBOXES[i].Image = SAV_Wondercard.getSprite(data[i]); + for (int i = data.Length; i < RES_MAX; i++) + PKXBOXES[i].Image = null; + + for (int i = 0; i < RES_MAX; i++) + PKXBOXES[i].BackgroundImage = Properties.Resources.slotTrans; + if (slotSelected != -1 && slotSelected >= RES_MIN * start && slotSelected < RES_MIN * start + RES_MAX) + PKXBOXES[slotSelected - start * RES_MIN].BackgroundImage = slotColor ?? Properties.Resources.slotView; + } + + private void Menu_SearchAdvanced_Click(object sender, EventArgs e) + { + if (!Menu_SearchAdvanced.Checked) + { Size = MinimumSize; RTB_Instructions.Clear(); } + else Size = MaximumSize; + } + + private void Menu_Exit_Click(object sender, EventArgs e) + { + Close(); + } + protected override void OnMouseWheel(MouseEventArgs e) + { + if (!PAN_Box.RectangleToScreen(PAN_Box.ClientRectangle).Contains(MousePosition)) + return; + int oldval = SCR_Box.Value; + int newval = oldval + (e.Delta < 0 ? 1 : -1); + if (newval >= SCR_Box.Minimum && SCR_Box.Maximum >= newval) + FillPKXBoxes(SCR_Box.Value = newval); + } + + private void changeFormatFilter(object sender, EventArgs e) + { + if (CB_FormatComparator.SelectedIndex == 0) + { + CB_Format.Visible = false; // !any + CB_Format.SelectedIndex = 0; + } + else + { + CB_Format.Visible = true; + CB_Format.SelectedIndex = MAXFORMAT - Main.SAV.Generation + 1; // SAV generation (offset by 1 for "Any") + } + } + } +} diff --git a/PKHeX/Subforms/SAV_MysteryGiftDB.resx b/PKHeX/Subforms/SAV_MysteryGiftDB.resx new file mode 100644 index 000000000..2f3d5fa66 --- /dev/null +++ b/PKHeX/Subforms/SAV_MysteryGiftDB.resx @@ -0,0 +1,420 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + 17, 17 + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + + + 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 diff --git a/PKHeX/Subforms/Save Editors/SAV_Wondercard.cs b/PKHeX/Subforms/Save Editors/SAV_Wondercard.cs index 2c72ad174..a71e02fda 100644 --- a/PKHeX/Subforms/Save Editors/SAV_Wondercard.cs +++ b/PKHeX/Subforms/Save Editors/SAV_Wondercard.cs @@ -468,7 +468,7 @@ private void pbBoxSlot_DragEnter(object sender, DragEventArgs e) } private int wc_slot = -1; - private static Image getSprite(MysteryGift gift) + internal static Image getSprite(MysteryGift gift) { Image img; if (gift.IsPokémon) @@ -487,7 +487,7 @@ private static string getDescription(MysteryGift gift) if (gift.Empty) return "Empty Slot. No data!"; - string s = gift.getCardHeader(); + string s = gift.getCardHeader() + Environment.NewLine; if (gift.IsItem) { s += "Item: " + Main.itemlist[gift.Item] + Environment.NewLine + "Quantity: " + gift.Quantity; From 5fe650f5a9c31772b86bc36063b8d17108e80ec6 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sun, 4 Sep 2016 10:42:56 -0700 Subject: [PATCH 02/35] Fix too-many-slots gen1/2 Closes #216 --- PKHeX/Subforms/Save Editors/SAV_BoxViewer.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PKHeX/Subforms/Save Editors/SAV_BoxViewer.cs b/PKHeX/Subforms/Save Editors/SAV_BoxViewer.cs index e66675e51..488544ff1 100644 --- a/PKHeX/Subforms/Save Editors/SAV_BoxViewer.cs +++ b/PKHeX/Subforms/Save Editors/SAV_BoxViewer.cs @@ -42,6 +42,9 @@ public SAV_BoxViewer(Main p) pb.DragEnter += pbBoxSlot_DragEnter; pb.QueryContinueDrag += pbBoxSlot_QueryContinueDrag; } + for (int i = SAV.BoxSlotCount; i < SlotPictureBoxes.Length; i++) + SlotPictureBoxes[i].Visible = false; + try { CB_BoxSelect.Items.Clear(); @@ -87,7 +90,7 @@ private void setPKXBoxes() int boxbgval = SAV.getBoxWallpaper(CB_BoxSelect.SelectedIndex); PAN_Box.BackgroundImage = BoxWallpaper.getWallpaper(SAV, boxbgval); - for (int i = 0; i < SlotPictureBoxes.Length; i++) + for (int i = 0; i < SAV.BoxSlotCount; i++) getSlotFiller(boxoffset + SAV.SIZE_STORED*i, SlotPictureBoxes[i]); } private void getSlotFiller(int offset, PictureBox pb) From 80938b698381b88927b450a2299ab47195fdc6d3 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sun, 4 Sep 2016 11:02:27 -0700 Subject: [PATCH 03/35] Remove unused options Carryover from SAV_Database Fix impossible null ref in both, won't ever happen in current state --- PKHeX/Subforms/SAV_Database.cs | 3 ++ PKHeX/Subforms/SAV_MysteryGiftDB.Designer.cs | 48 -------------------- PKHeX/Subforms/SAV_MysteryGiftDB.cs | 8 ++-- 3 files changed, 7 insertions(+), 52 deletions(-) diff --git a/PKHeX/Subforms/SAV_Database.cs b/PKHeX/Subforms/SAV_Database.cs index abcc6bef1..7aff6ad48 100644 --- a/PKHeX/Subforms/SAV_Database.cs +++ b/PKHeX/Subforms/SAV_Database.cs @@ -525,8 +525,11 @@ private void setResults(List res) private void FillPKXBoxes(int start) { if (Results == null) + { for (int i = 0; i < RES_MAX; i++) PKXBOXES[i].Image = null; + return; + } PKM[] data = Results.Skip(start * RES_MIN).Take(RES_MAX).ToArray(); for (int i = 0; i < data.Length; i++) PKXBOXES[i].Image = data[i].Sprite; diff --git a/PKHeX/Subforms/SAV_MysteryGiftDB.Designer.cs b/PKHeX/Subforms/SAV_MysteryGiftDB.Designer.cs index 3ba24a5a3..60a77c585 100644 --- a/PKHeX/Subforms/SAV_MysteryGiftDB.Designer.cs +++ b/PKHeX/Subforms/SAV_MysteryGiftDB.Designer.cs @@ -95,10 +95,6 @@ private void InitializeComponent() this.Menu_Exit = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_Tools = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_SearchSettings = new System.Windows.Forms.ToolStripMenuItem(); - this.Menu_SearchBoxes = new System.Windows.Forms.ToolStripMenuItem(); - this.Menu_SearchDatabase = new System.Windows.Forms.ToolStripMenuItem(); - this.Menu_SearchLegal = new System.Windows.Forms.ToolStripMenuItem(); - this.Menu_SearchIllegal = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_SearchAdvanced = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_OpenDB = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_Export = new System.Windows.Forms.ToolStripMenuItem(); @@ -924,52 +920,12 @@ private void InitializeComponent() // Menu_SearchSettings // this.Menu_SearchSettings.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.Menu_SearchBoxes, - this.Menu_SearchDatabase, - this.Menu_SearchLegal, - this.Menu_SearchIllegal, this.Menu_SearchAdvanced}); this.Menu_SearchSettings.Image = global::PKHeX.Properties.Resources.settings; this.Menu_SearchSettings.Name = "Menu_SearchSettings"; this.Menu_SearchSettings.Size = new System.Drawing.Size(197, 22); this.Menu_SearchSettings.Text = "Search Settings"; // - // Menu_SearchBoxes - // - this.Menu_SearchBoxes.Checked = true; - this.Menu_SearchBoxes.CheckOnClick = true; - this.Menu_SearchBoxes.CheckState = System.Windows.Forms.CheckState.Checked; - this.Menu_SearchBoxes.Name = "Menu_SearchBoxes"; - this.Menu_SearchBoxes.Size = new System.Drawing.Size(207, 22); - this.Menu_SearchBoxes.Text = "Search Within Boxes"; - // - // Menu_SearchDatabase - // - this.Menu_SearchDatabase.Checked = true; - this.Menu_SearchDatabase.CheckOnClick = true; - this.Menu_SearchDatabase.CheckState = System.Windows.Forms.CheckState.Checked; - this.Menu_SearchDatabase.Name = "Menu_SearchDatabase"; - this.Menu_SearchDatabase.Size = new System.Drawing.Size(207, 22); - this.Menu_SearchDatabase.Text = "Search Within Database"; - // - // Menu_SearchLegal - // - this.Menu_SearchLegal.Checked = true; - this.Menu_SearchLegal.CheckOnClick = true; - this.Menu_SearchLegal.CheckState = System.Windows.Forms.CheckState.Checked; - this.Menu_SearchLegal.Name = "Menu_SearchLegal"; - this.Menu_SearchLegal.Size = new System.Drawing.Size(207, 22); - this.Menu_SearchLegal.Text = "Show Legal"; - // - // Menu_SearchIllegal - // - this.Menu_SearchIllegal.Checked = true; - this.Menu_SearchIllegal.CheckOnClick = true; - this.Menu_SearchIllegal.CheckState = System.Windows.Forms.CheckState.Checked; - this.Menu_SearchIllegal.Name = "Menu_SearchIllegal"; - this.Menu_SearchIllegal.Size = new System.Drawing.Size(207, 22); - this.Menu_SearchIllegal.Text = "Show Illegal"; - // // Menu_SearchAdvanced // this.Menu_SearchAdvanced.CheckOnClick = true; @@ -1697,10 +1653,6 @@ private void InitializeComponent() private System.Windows.Forms.Label L_Viewed; private System.Windows.Forms.ToolStripMenuItem Menu_Export; private System.Windows.Forms.ToolStripMenuItem Menu_SearchSettings; - private System.Windows.Forms.ToolStripMenuItem Menu_SearchBoxes; - private System.Windows.Forms.ToolStripMenuItem Menu_SearchDatabase; - private System.Windows.Forms.ToolStripMenuItem Menu_SearchLegal; - private System.Windows.Forms.ToolStripMenuItem Menu_SearchIllegal; private System.Windows.Forms.TableLayoutPanel TLP_Filters; public System.Windows.Forms.CheckBox CHK_Shiny; public System.Windows.Forms.CheckBox CHK_IsEgg; diff --git a/PKHeX/Subforms/SAV_MysteryGiftDB.cs b/PKHeX/Subforms/SAV_MysteryGiftDB.cs index f6a4819af..9d21c3860 100644 --- a/PKHeX/Subforms/SAV_MysteryGiftDB.cs +++ b/PKHeX/Subforms/SAV_MysteryGiftDB.cs @@ -271,10 +271,7 @@ private void B_Search_Click(object sender, EventArgs e) var results = res.ToArray(); if (results.Length == 0) { - if (!Menu_SearchBoxes.Checked && !Menu_SearchDatabase.Checked) - Util.Alert("No data source to search!", "No results found!"); - else - Util.Alert("No results found!"); + Util.Alert("No results found!"); } setResults(new List(results)); // updates Count Label as well. System.Media.SystemSounds.Asterisk.Play(); @@ -299,8 +296,11 @@ private void setResults(List res) private void FillPKXBoxes(int start) { if (Results == null) + { for (int i = 0; i < RES_MAX; i++) PKXBOXES[i].Image = null; + return; + } var data = Results.Skip(start * RES_MIN).Take(RES_MAX).ToArray(); for (int i = 0; i < data.Length; i++) PKXBOXES[i].Image = SAV_Wondercard.getSprite(data[i]); From 387ed9cbccd38adca2f276507448cfe6c43c29b2 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sun, 4 Sep 2016 14:00:52 -0700 Subject: [PATCH 04/35] Refactoring Gen1/2 arrays to legality tables Add PP tables for gen1/2 too --- PKHeX/Legality/Tables1.cs | 28 ++++++++++++++++++++++++++++ PKHeX/Legality/Tables2.cs | 35 +++++++++++++++++++++++++++++++++++ PKHeX/PKHeX.csproj | 2 ++ PKHeX/PKM/PKM.cs | 2 ++ PKHeX/PKM/PKX.cs | 12 ------------ PKHeX/Saves/SAV1.cs | 2 +- PKHeX/Saves/SAV2.cs | 15 +++++---------- 7 files changed, 73 insertions(+), 23 deletions(-) create mode 100644 PKHeX/Legality/Tables1.cs create mode 100644 PKHeX/Legality/Tables2.cs diff --git a/PKHeX/Legality/Tables1.cs b/PKHeX/Legality/Tables1.cs new file mode 100644 index 000000000..fb27c2f0b --- /dev/null +++ b/PKHeX/Legality/Tables1.cs @@ -0,0 +1,28 @@ +using System.Linq; + +namespace PKHeX +{ + public static partial class Legal + { + // PKHeX Valid Array Storage + internal static readonly ushort[] Pouch_Items_RBY = Enumerable.Range(0, 7) // 0-6 + .Concat(Enumerable.Range(10, 11)) // 10-20 + .Concat(Enumerable.Range(29, 15)) // 29-43 + .Concat(Enumerable.Range(45, 5)) // 45-49 + .Concat(Enumerable.Range(51, 8)) // 51-58 + .Concat(Enumerable.Range(60, 24)) // 60-83 + .Concat(Enumerable.Range(196, 54)) // 196-249 + .Select(i => (ushort)i).ToArray(); + + internal static readonly int[] MovePP_RBY = + { + 0, + 35, 25, 10, 15, 20, 20, 15, 15, 15, 35, 30, 05, 10, 30, 30, 35, 35, 20, 15, 20, 20, 10, 20, 30, 05, 25, 15, 15, 15, 25, 20, 05, 35, 15, 20, 20, 20, 15, 30, 35, 20, 20, 30, 25, 40, 20, 15, 20, 20, 20, + 30, 25, 15, 30, 25, 05, 15, 10, 05, 20, 20, 20, 05, 35, 20, 25, 20, 20, 20, 15, 20, 10, 10, 40, 25, 10, 35, 30, 15, 20, 40, 10, 15, 30, 15, 20, 10, 15, 10, 05, 10, 10, 25, 10, 20, 40, 30, 30, 20, 20, + 15, 10, 40, 15, 20, 30, 20, 20, 10, 40, 40, 30, 30, 30, 20, 30, 10, 10, 20, 05, 10, 30, 20, 20, 20, 05, 15, 10, 20, 15, 15, 35, 20, 15, 10, 20, 30, 15, 40, 20, 15, 10, 05, 10, 30, 10, 15, 20, 15, 40, + 40, 10, 05, 15, 10, 10, 10, 15, 30, 30, 10, 10, 20, 10, 10, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, + 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, + 00, 00, 00, 00, 00, 00 + }; + } +} diff --git a/PKHeX/Legality/Tables2.cs b/PKHeX/Legality/Tables2.cs new file mode 100644 index 000000000..c7f0be57d --- /dev/null +++ b/PKHeX/Legality/Tables2.cs @@ -0,0 +1,35 @@ +using System.Linq; + +namespace PKHeX +{ + public static partial class Legal + { + // PKHeX Valid Array Storage + internal static readonly ushort[] Pouch_Items_GSC = { + 3, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 46, 47, 48, 49, 51, 52, 53, 57, 60, 62, 63, 64, 65, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 91, 92, 93, 94, 95, 96, 97, 98, 99, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 117, 118, 119, 121, 122, 123, 124, 125, 126, 131, 132, 138, 139, 140, 143, 144, 146, 150, 151, 152, 156, 158, 163, 168, 169, 170, 172, 173, 174, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189 + }; + internal static readonly ushort[] Pouch_Ball_GSC = { + 1, 2, 4, 5, 157, 159, 160, 161, 164, 165, 166, 167 + }; + internal static readonly ushort[] Pouch_Key_GS = { + 7, 54, 55, 58, 59, 61, 66, 67, 68 , 69, 71, 127, 128, 130, 133, 134, 175, 178 + }; + internal static readonly ushort[] Pouch_Key_C = Pouch_Key_GS.Concat(new ushort[]{70, 115, 116, 129}).ToArray(); + internal static readonly ushort[] Pouch_TMHM_GSC = { + 191, 192, 193, 194, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249 + }; + + internal static readonly ushort[] HeldItems_GSC = new ushort[1].Concat(Pouch_Items_GSC).Concat(Pouch_Ball_GSC).ToArray(); + + internal static readonly int[] MovePP_GSC = + { + 00, + 35, 25, 10, 15, 20, 20, 15, 15, 15, 35, 30, 05, 10, 30, 30, 35, 35, 20, 15, 20, 20, 10, 20, 30, 05, 25, 15, 15, 15, 25, 20, 05, 35, 15, 20, 20, 20, 15, 30, 35, 20, 20, 30, 25, 40, 20, 15, 20, 20, 20, + 30, 25, 15, 30, 25, 05, 15, 10, 05, 20, 20, 20, 05, 35, 20, 25, 20, 20, 20, 15, 20, 10, 10, 40, 25, 10, 35, 30, 15, 20, 40, 10, 15, 30, 15, 20, 10, 15, 10, 05, 10, 10, 25, 10, 20, 40, 30, 30, 20, 20, + 15, 10, 40, 15, 20, 30, 20, 20, 10, 40, 40, 30, 30, 30, 20, 30, 10, 10, 20, 05, 10, 30, 20, 20, 20, 05, 15, 10, 20, 15, 15, 35, 20, 15, 10, 20, 30, 15, 40, 20, 15, 10, 05, 10, 30, 10, 15, 20, 15, 40, + 40, 10, 05, 15, 10, 10, 10, 15, 30, 30, 10, 10, 20, 10, 01, 01, 10, 10, 10, 05, 15, 25, 15, 10, 15, 30, 05, 40, 15, 10, 25, 10, 30, 10, 20, 10, 10, 10, 10, 10, 20, 05, 40, 05, 05, 15, 05, 10, 05, 15, + 10, 05, 10, 20, 20, 40, 15, 10, 20, 20, 25, 05, 15, 10, 05, 20, 15, 20, 25, 20, 05, 30, 05, 10, 20, 40, 05, 20, 40, 20, 15, 35, 10, 05, 05, 05, 15, 05, 20, 05, 05, 15, 20, 10, 05, 05, 15, 15, 15, 15, + 10, 00, 00, 00, 00 + }; + } +} diff --git a/PKHeX/PKHeX.csproj b/PKHeX/PKHeX.csproj index a5eaa88f4..ab34b112a 100644 --- a/PKHeX/PKHeX.csproj +++ b/PKHeX/PKHeX.csproj @@ -70,6 +70,8 @@ + + diff --git a/PKHeX/PKM/PKM.cs b/PKHeX/PKM/PKM.cs index 0bbb0f351..bb2293dbd 100644 --- a/PKHeX/PKM/PKM.cs +++ b/PKHeX/PKM/PKM.cs @@ -447,6 +447,8 @@ private int getBasePP(int move) int[] pptable; switch (Format) { + case 1: pptable = Legal.MovePP_RBY; break; + case 2: pptable = Legal.MovePP_GSC; break; case 3: pptable = Legal.MovePP_RS; break; case 4: pptable = Legal.MovePP_DP; break; case 5: pptable = Legal.MovePP_BW; break; diff --git a/PKHeX/PKM/PKX.cs b/PKHeX/PKM/PKX.cs index 3f5b51498..c85c9531a 100644 --- a/PKHeX/PKM/PKX.cs +++ b/PKHeX/PKM/PKX.cs @@ -2148,18 +2148,6 @@ public static ushort getG4Item(ushort g3val) }; #endregion - public static int[] getG1LegalItems() - { - return Enumerable.Range(0, 7) // 0-6 - .Concat(Enumerable.Range(10, 11)) // 10-20 - .Concat(Enumerable.Range(29, 15)) // 29-43 - .Concat(Enumerable.Range(45, 5)) // 45-49 - .Concat(Enumerable.Range(51, 8)) // 51-58 - .Concat(Enumerable.Range(60, 24)) // 60-83 - .Concat(Enumerable.Range(196, 54)) // 196-249 - .ToArray(); - } - public static int getG1Species(int raw_id) { int[] table = { 0x00, 0x70, 0x73, 0x20, 0x23, 0x15, 0x64, 0x22, 0x50, 0x02, 0x67, 0x6C, 0x66, 0x58, 0x5E, 0x1D, 0x1F, 0x68, 0x6F, 0x83, 0x3B, 0x97, 0x82, 0x5A, 0x48, 0x5C, 0x7B, 0x78, 0x09, 0x7F, 0x72, 0x00, 0x00, 0x3A, 0x5F, 0x16, 0x10, 0x4F, 0x40, 0x4B, 0x71, 0x43, 0x7A, 0x6A, 0x6B, 0x18, 0x2F, 0x36, 0x60, 0x4C, 0x00, 0x7E, 0x00, 0x7D, 0x52, 0x6D, 0x00, 0x38, 0x56, 0x32, 0x80, 0x00, 0x00, 0x00, 0x53, 0x30, 0x95, 0x00, 0x00, 0x00, 0x54, 0x3C, 0x7C, 0x92, 0x90, 0x91, 0x84, 0x34, 0x62, 0x00, 0x00, 0x00, 0x25, 0x26, 0x19, 0x1A, 0x00, 0x00, 0x93, 0x94, 0x8C, 0x8D, 0x74, 0x75, 0x00, 0x00, 0x1B, 0x1C, 0x8A, 0x8B, 0x27, 0x28, 0x85, 0x88, 0x87, 0x86, 0x42, 0x29, 0x17, 0x2E, 0x3D, 0x3E, 0x0D, 0x0E, 0x0F, 0x00, 0x55, 0x39, 0x33, 0x31, 0x57, 0x00, 0x00, 0x0A, 0x0B, 0x0C, 0x44, 0x00, 0x37, 0x61, 0x2A, 0x96, 0x8F, 0x81, 0x00, 0x00, 0x59, 0x00, 0x63, 0x5B, 0x00, 0x65, 0x24, 0x6E, 0x35, 0x69, 0x00, 0x5D, 0x3F, 0x41, 0x11, 0x12, 0x79, 0x01, 0x03, 0x49, 0x00, 0x76, 0x77, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x4E, 0x13, 0x14, 0x21, 0x1E, 0x4A, 0x89, 0x8E, 0x00, 0x51, 0x00, 0x00, 0x04, 0x07, 0x05, 0x08, 0x06, 0x00, 0x00, 0x00, 0x00, 0x2B, 0x2C, 0x2D, 0x45, 0x46, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; diff --git a/PKHeX/Saves/SAV1.cs b/PKHeX/Saves/SAV1.cs index 03e99cac3..1bd0ff55c 100644 --- a/PKHeX/Saves/SAV1.cs +++ b/PKHeX/Saves/SAV1.cs @@ -327,7 +327,7 @@ public uint Coin } } - private readonly ushort[] LegalItems = PKX.getG1LegalItems().Select(i => (ushort)i).ToArray(); + private readonly ushort[] LegalItems = Legal.Pouch_Items_RBY; public override InventoryPouch[] Inventory { get diff --git a/PKHeX/Saves/SAV2.cs b/PKHeX/Saves/SAV2.cs index 2af40cf19..615aa26aa 100644 --- a/PKHeX/Saves/SAV2.cs +++ b/PKHeX/Saves/SAV2.cs @@ -31,16 +31,11 @@ public SAV2(byte[] data = null) getSAVOffsets(); - LegalItems = new ushort[] { 3, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 46, 47, 48, 49, 51, 52, 53, 57, 60, 62, 63, 64, 65, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 91, 92, 93, 94, 95, 96, 97, 98, 99, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 117, 118, 119, 121, 122, 123, 124, 125, 126, 131, 132, 138, 139, 140, 143, 144, 146, 150, 151, 152, 156, 158, 163, 168, 169, 170, 172, 173, 174, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189 }; - LegalBalls = new ushort[] { 1, 2, 4, 5, 157, 159, 160, 161, 164, 165, 166, 167}; - LegalKeyItems = new ushort[] {7, 54, 55, 58, 59, 61, 66, 67, 68 , 69, 71, 127, 128, 130, 133, 134, 175, 178}; - if (Version == GameVersion.C) - { - LegalKeyItems = LegalKeyItems.Concat(new ushort[] {70, 115, 116, 129}).ToArray(); - } - LegalTMHMs = new ushort[] {191, 192, 193, 194, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249}; - HeldItems = new ushort[] {0}.Concat(LegalItems).Concat(LegalBalls).ToArray(); - Array.Sort(HeldItems); + LegalItems = Legal.Pouch_Items_GSC; + LegalBalls = Legal.Pouch_Ball_GSC; + LegalKeyItems = Version == GameVersion.C ? Legal.Pouch_Key_C : Legal.Pouch_Key_GS; + LegalTMHMs = Legal.Pouch_TMHM_GSC; + HeldItems = Legal.HeldItems_GSC; // Stash boxes after the save file's end. byte[] TempBox = new byte[SIZE_STOREDBOX]; From 1bb5388b4b556967a45e5f6701534cf6b7b0af84 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Sun, 4 Sep 2016 15:03:40 -0700 Subject: [PATCH 05/35] PK1 <-> PK2 Conversion --- PKHeX/Legality/Tables2.cs | 2 +- PKHeX/PKM/PK1.cs | 44 +++++++++++++++++++++++++++++++++++++-- PKHeX/PKM/PK2.cs | 14 +++++++++++++ PKHeX/PKM/PKMConverter.cs | 33 +++++++++++++++++++++++++++-- 4 files changed, 88 insertions(+), 5 deletions(-) diff --git a/PKHeX/Legality/Tables2.cs b/PKHeX/Legality/Tables2.cs index c7f0be57d..0b33cccea 100644 --- a/PKHeX/Legality/Tables2.cs +++ b/PKHeX/Legality/Tables2.cs @@ -19,7 +19,7 @@ public static partial class Legal 191, 192, 193, 194, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249 }; - internal static readonly ushort[] HeldItems_GSC = new ushort[1].Concat(Pouch_Items_GSC).Concat(Pouch_Ball_GSC).ToArray(); + internal static readonly ushort[] HeldItems_GSC = new ushort[1].Concat(Pouch_Items_GSC).Concat(Pouch_Ball_GSC).Concat(Pouch_TMHM_GSC).ToArray(); internal static readonly int[] MovePP_GSC = { diff --git a/PKHeX/PKM/PK1.cs b/PKHeX/PKM/PK1.cs index 7226a23ad..addf1c119 100644 --- a/PKHeX/PKM/PK1.cs +++ b/PKHeX/PKM/PK1.cs @@ -120,8 +120,8 @@ public override int Species get { return PKX.getG1Species(Data[0]); } set { - // Before updating catch rate, check if Special Yellow Version Pikachu - if (!(PKX.getG1Species(Data[0]) == 25 && value == 25 && Catch_Rate == 163)) + // Before updating catch rate, check if non-standard + if (Catch_Rate == PersonalTable.RBY[Species].CatchRate) Catch_Rate = PersonalTable.RBY[value].CatchRate; Data[0] = (byte)PKX.setG1Species(value); Type_A = PersonalTable.RBY[value].Types[0]; @@ -250,6 +250,46 @@ public override bool CanHoldItem(ushort[] ValidArray) public override int CNT_Tough { get { return 0; } set { } } public override int CNT_Sheen { get { return 0; } set { } } #endregion + + public PK2 convertToPK2() + { + PK2 pk2 = new PK2(null, Identifier, Japanese); + pk2.Species = Species; + Array.Copy(Data, 0x7, pk2.Data, 0x1, 0x1A); + // https://github.com/pret/pokecrystal/blob/master/engine/link.asm#L1132 + if (!Legal.HeldItems_GSC.Contains((ushort)pk2.HeldItem)) + switch (pk2.HeldItem) + { + case 0x19: + pk2.HeldItem = 0x92; // Leftovers + break; + case 0x2D: + pk2.HeldItem = 0x53; // Bitter Berry + break; + case 0x32: + pk2.HeldItem = 0xAE; // Leftovers + break; + case 0x5A: + case 0x64: + case 0x78: + case 0x87: + case 0xBE: + case 0xC3: + case 0xDC: + case 0xFA: + case 0xFF: + pk2.HeldItem = 0xAD; // Berry + break; + } + pk2.CurrentFriendship = PersonalTable.C[Species].BaseFriendship; + // Pokerus = 0 + // Caught Data = 0 + pk2.Stat_Level = Stat_Level; + Array.Copy(otname, 0, pk2.otname, 0, otname.Length); + Array.Copy(nick, 0, pk2.nick, 0, nick.Length); + + return pk2; + } } public class PokemonList1 diff --git a/PKHeX/PKM/PK2.cs b/PKHeX/PKM/PK2.cs index 21fbfe3b5..fcd06f5dd 100644 --- a/PKHeX/PKM/PK2.cs +++ b/PKHeX/PKM/PK2.cs @@ -325,6 +325,20 @@ public override int HPType public override int CNT_Tough { get { return 0; } set { } } public override int CNT_Sheen { get { return 0; } set { } } #endregion + + public PK1 convertToPK1() + { + PK1 pk1 = new PK1(null, Identifier, Japanese); + Array.Copy(Data, 0x1, pk1.Data, 0x7, 0x1A); + pk1.Species = Species; // This will take care of Typing :) + pk1.Stat_HPCurrent = Stat_HPCurrent; + pk1.Stat_Level = Stat_Level; + // Status = 0 + Array.Copy(otname, 0, pk1.otname, 0, otname.Length); + Array.Copy(nick, 0, pk1.nick, 0, nick.Length); + + return pk1; + } } public class PokemonList2 diff --git a/PKHeX/PKM/PKMConverter.cs b/PKHeX/PKM/PKMConverter.cs index 27a62531c..55fd04f4d 100644 --- a/PKHeX/PKM/PKMConverter.cs +++ b/PKHeX/PKM/PKMConverter.cs @@ -100,6 +100,9 @@ public static PKM getPKMfromBytes(byte[] data, string ident = null) } internal static PKM convertToFormat(PKM pk, int Format, out string comment) { + string currentFormat = pk.Format.ToString(); + PKM pkm = pk.Clone(); + if (pk == null) { comment = "Null input. Aborting."; @@ -110,6 +113,34 @@ internal static PKM convertToFormat(PKM pk, int Format, out string comment) comment = "No need to convert, current format matches requested format."; return pk; } + if (pk.Format != Format && pk.Format <= 2 && Format <= 2) + { + if (Format == 2) // pk.Format == 1 + { + pkm = ((PK1) pk).convertToPK2(); + } + if (Format == 1) // pk.Format == 2 + { + // Only convert if it's legal to do so. + if (1 <= pk.Species && pk.Species <= 151) + { + foreach (var move in new[] { pk.Move1, pk.Move2, pk.Move3, pk.Move4}) + if (move < 1 || move > 165) + { + comment = $"Pokemon cannot be converted due to invalid move: {Main.movelist[move]}"; + return null; + } + pkm = ((PK2) pk).convertToPK1(); + } + else + { + comment =$"Cannot convert a {PKX.getSpeciesName(pk.Species, ((PK2)pk).Japanese ? 1 : 2)} to pk{Format}"; + return null; + } + } + comment = $"Converted from pk{pk.Format} to pk{Format}"; + return pkm; + } if (pk.Format > Format) { comment = "Cannot convert a PKM backwards." + Environment.NewLine @@ -128,8 +159,6 @@ internal static PKM convertToFormat(PKM pk, int Format, out string comment) + "Please wait for Sun/Moon to release and documentation to occur."; return null; } - string currentFormat = pk.Format.ToString(); - PKM pkm = pk.Clone(); if (pkm.IsEgg) // force hatch { pkm.IsEgg = false; From 45df87f8cc1c94a6fc4bf97b865c3e1129d1d419 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Sun, 4 Sep 2016 15:21:46 -0700 Subject: [PATCH 06/35] PK2 -> PK1 Conversion fix --- PKHeX/PKM/PKMConverter.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKHeX/PKM/PKMConverter.cs b/PKHeX/PKM/PKMConverter.cs index 55fd04f4d..7ea43e1f1 100644 --- a/PKHeX/PKM/PKMConverter.cs +++ b/PKHeX/PKM/PKMConverter.cs @@ -125,7 +125,7 @@ internal static PKM convertToFormat(PKM pk, int Format, out string comment) if (1 <= pk.Species && pk.Species <= 151) { foreach (var move in new[] { pk.Move1, pk.Move2, pk.Move3, pk.Move4}) - if (move < 1 || move > 165) + if (move < 0 || move > 165) { comment = $"Pokemon cannot be converted due to invalid move: {Main.movelist[move]}"; return null; From ce1202ead8fa4c07952f265684c0f8de7aba33e0 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sun, 4 Sep 2016 15:29:55 -0700 Subject: [PATCH 07/35] Tweak 1<->2 conversion Delete gen2 only moves on 2->1 instead of refusing to convert; fix moves afterwards. Simplify PKMConverter checks --- PKHeX/PKM/PK2.cs | 7 +++++++ PKHeX/PKM/PKMConverter.cs | 41 ++++++++++++++------------------------- 2 files changed, 22 insertions(+), 26 deletions(-) diff --git a/PKHeX/PKM/PK2.cs b/PKHeX/PKM/PK2.cs index fcd06f5dd..a6319b95c 100644 --- a/PKHeX/PKM/PK2.cs +++ b/PKHeX/PKM/PK2.cs @@ -337,6 +337,13 @@ public PK1 convertToPK1() Array.Copy(otname, 0, pk1.otname, 0, otname.Length); Array.Copy(nick, 0, pk1.nick, 0, nick.Length); + int[] newMoves = pk1.Moves; + for (int i = 0; i < 4; i++) + if (newMoves[i] > 165) // not present in Gen 1 + newMoves[i] = 0; + pk1.Moves = newMoves; + pk1.FixMoves(); + return pk1; } } diff --git a/PKHeX/PKM/PKMConverter.cs b/PKHeX/PKM/PKMConverter.cs index 55fd04f4d..7ab96784a 100644 --- a/PKHeX/PKM/PKMConverter.cs +++ b/PKHeX/PKM/PKMConverter.cs @@ -100,43 +100,32 @@ public static PKM getPKMfromBytes(byte[] data, string ident = null) } internal static PKM convertToFormat(PKM pk, int Format, out string comment) { - string currentFormat = pk.Format.ToString(); - PKM pkm = pk.Clone(); - - if (pk == null) + if (pk == null || pk.Species == 0) { comment = "Null input. Aborting."; return null; } + + string currentFormat = pk.Format.ToString(); + PKM pkm = pk.Clone(); + if (pk.Format == Format) { comment = "No need to convert, current format matches requested format."; return pk; } - if (pk.Format != Format && pk.Format <= 2 && Format <= 2) + if (pk.Format <= 2 && Format <= 2) // 1<->2, already checked not equal { - if (Format == 2) // pk.Format == 1 + switch (Format) { - pkm = ((PK1) pk).convertToPK2(); - } - if (Format == 1) // pk.Format == 2 - { - // Only convert if it's legal to do so. - if (1 <= pk.Species && pk.Species <= 151) - { - foreach (var move in new[] { pk.Move1, pk.Move2, pk.Move3, pk.Move4}) - if (move < 1 || move > 165) - { - comment = $"Pokemon cannot be converted due to invalid move: {Main.movelist[move]}"; - return null; - } - pkm = ((PK2) pk).convertToPK1(); - } - else - { - comment =$"Cannot convert a {PKX.getSpeciesName(pk.Species, ((PK2)pk).Japanese ? 1 : 2)} to pk{Format}"; - return null; - } + case 1: + if (pk.Species > 151) + { comment = $"Cannot convert a {PKX.getSpeciesName(pk.Species, ((PK2)pk).Japanese ? 1 : 2)} to pk{Format}"; return null; } + pkm = ((PK2)pk).convertToPK1(); + break; + case 2: + pkm = ((PK1)pk).convertToPK2(); + break; } comment = $"Converted from pk{pk.Format} to pk{Format}"; return pkm; From db660355cc2582913d780c9274b4d53b3a66aed8 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sun, 4 Sep 2016 15:32:48 -0700 Subject: [PATCH 08/35] Simplify 1<->2 conversion --- PKHeX/PKM/PKMConverter.cs | 41 ++++++++++++++------------------------- 1 file changed, 15 insertions(+), 26 deletions(-) diff --git a/PKHeX/PKM/PKMConverter.cs b/PKHeX/PKM/PKMConverter.cs index 55fd04f4d..7ab96784a 100644 --- a/PKHeX/PKM/PKMConverter.cs +++ b/PKHeX/PKM/PKMConverter.cs @@ -100,43 +100,32 @@ public static PKM getPKMfromBytes(byte[] data, string ident = null) } internal static PKM convertToFormat(PKM pk, int Format, out string comment) { - string currentFormat = pk.Format.ToString(); - PKM pkm = pk.Clone(); - - if (pk == null) + if (pk == null || pk.Species == 0) { comment = "Null input. Aborting."; return null; } + + string currentFormat = pk.Format.ToString(); + PKM pkm = pk.Clone(); + if (pk.Format == Format) { comment = "No need to convert, current format matches requested format."; return pk; } - if (pk.Format != Format && pk.Format <= 2 && Format <= 2) + if (pk.Format <= 2 && Format <= 2) // 1<->2, already checked not equal { - if (Format == 2) // pk.Format == 1 + switch (Format) { - pkm = ((PK1) pk).convertToPK2(); - } - if (Format == 1) // pk.Format == 2 - { - // Only convert if it's legal to do so. - if (1 <= pk.Species && pk.Species <= 151) - { - foreach (var move in new[] { pk.Move1, pk.Move2, pk.Move3, pk.Move4}) - if (move < 1 || move > 165) - { - comment = $"Pokemon cannot be converted due to invalid move: {Main.movelist[move]}"; - return null; - } - pkm = ((PK2) pk).convertToPK1(); - } - else - { - comment =$"Cannot convert a {PKX.getSpeciesName(pk.Species, ((PK2)pk).Japanese ? 1 : 2)} to pk{Format}"; - return null; - } + case 1: + if (pk.Species > 151) + { comment = $"Cannot convert a {PKX.getSpeciesName(pk.Species, ((PK2)pk).Japanese ? 1 : 2)} to pk{Format}"; return null; } + pkm = ((PK2)pk).convertToPK1(); + break; + case 2: + pkm = ((PK1)pk).convertToPK2(); + break; } comment = $"Converted from pk{pk.Format} to pk{Format}"; return pkm; From d18e17a5992dd0284745f60371f712d3dcc947b4 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sun, 4 Sep 2016 15:33:53 -0700 Subject: [PATCH 09/35] Fix moves 2->1 Unsync'd --- PKHeX/PKM/PK2.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/PKHeX/PKM/PK2.cs b/PKHeX/PKM/PK2.cs index fcd06f5dd..a6319b95c 100644 --- a/PKHeX/PKM/PK2.cs +++ b/PKHeX/PKM/PK2.cs @@ -337,6 +337,13 @@ public PK1 convertToPK1() Array.Copy(otname, 0, pk1.otname, 0, otname.Length); Array.Copy(nick, 0, pk1.nick, 0, nick.Length); + int[] newMoves = pk1.Moves; + for (int i = 0; i < 4; i++) + if (newMoves[i] > 165) // not present in Gen 1 + newMoves[i] = 0; + pk1.Moves = newMoves; + pk1.FixMoves(); + return pk1; } } From fff75df8480874ccf2ac1f19fa010f440d378fea Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sun, 4 Sep 2016 15:44:54 -0700 Subject: [PATCH 10/35] gen1 OT length fix --- PKHeX/Saves/SAV1.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKHeX/Saves/SAV1.cs b/PKHeX/Saves/SAV1.cs index 1bd0ff55c..f5778528d 100644 --- a/PKHeX/Saves/SAV1.cs +++ b/PKHeX/Saves/SAV1.cs @@ -173,7 +173,7 @@ public override byte[] Write(bool DSV) public override int MaxIV => 15; public override int Generation => 1; protected override int GiftCountMax => 0; - public override int OTLength => Japanese ? 5 : 10; + public override int OTLength => Japanese ? 5 : 7; public override int NickLength => Japanese ? 5 : 10; public override int BoxSlotCount => Japanese ? 30 : 20; From f9cfdd6c18d5ed6e94254840a873030230b60448 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sun, 4 Sep 2016 15:54:16 -0700 Subject: [PATCH 11/35] Add more descriptive backup names MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit \u02D0 = ː If anyone has problems with this, speak up (and . will be used instead) --- PKHeX/Saves/SAV1.cs | 2 +- PKHeX/Saves/SAV2.cs | 2 +- PKHeX/Saves/SAV3.cs | 2 +- PKHeX/Saves/SAV4.cs | 2 +- PKHeX/Saves/SAV5.cs | 2 +- PKHeX/Saves/SaveFile.cs | 1 + 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/PKHeX/Saves/SAV1.cs b/PKHeX/Saves/SAV1.cs index f5778528d..e65d73f61 100644 --- a/PKHeX/Saves/SAV1.cs +++ b/PKHeX/Saves/SAV1.cs @@ -5,7 +5,7 @@ namespace PKHeX { public sealed class SAV1 : SaveFile { - public override string BAKName => $"{FileName} [{OT} ({Version})" +/* - {LastSavedTime}*/ "].bak"; + public override string BAKName => $"{FileName} [{OT} ({Version}) - {PlayTimeString}].bak"; public override string Filter => "SAV File|*.sav"; public override string Extension => ".sav"; diff --git a/PKHeX/Saves/SAV2.cs b/PKHeX/Saves/SAV2.cs index 615aa26aa..87367195c 100644 --- a/PKHeX/Saves/SAV2.cs +++ b/PKHeX/Saves/SAV2.cs @@ -5,7 +5,7 @@ namespace PKHeX { public sealed class SAV2 : SaveFile { - public override string BAKName => $"{FileName} [{OT} ({Version})" +/* - {LastSavedTime}*/ "].bak"; + public override string BAKName => $"{FileName} [{OT} ({Version}) - {PlayTimeString}].bak"; public override string Filter => "SAV File|*.sav"; public override string Extension => ".sav"; diff --git a/PKHeX/Saves/SAV3.cs b/PKHeX/Saves/SAV3.cs index b70138539..f9e041d1f 100644 --- a/PKHeX/Saves/SAV3.cs +++ b/PKHeX/Saves/SAV3.cs @@ -5,7 +5,7 @@ namespace PKHeX { public sealed class SAV3 : SaveFile { - public override string BAKName => $"{FileName} [{OT} ({Version})" +/* - {LastSavedTime}*/ "].bak"; + public override string BAKName => $"{FileName} [{OT} ({Version}) - {PlayTimeString}].bak"; public override string Filter => "SAV File|*.sav"; public override string Extension => ".sav"; diff --git a/PKHeX/Saves/SAV4.cs b/PKHeX/Saves/SAV4.cs index 7384563ca..d9a215e0a 100644 --- a/PKHeX/Saves/SAV4.cs +++ b/PKHeX/Saves/SAV4.cs @@ -5,7 +5,7 @@ namespace PKHeX { public sealed class SAV4 : SaveFile { - public override string BAKName => $"{FileName} [{OT} ({Version})" +/* - {LastSavedTime}*/ "].bak"; + public override string BAKName => $"{FileName} [{OT} ({Version}) - {PlayTimeString}].bak"; public override string Filter => (Footer.Length > 0 ? "DeSmuME DSV|*.dsv|" : "") + "SAV File|*.sav"; public override string Extension => ".sav"; public SAV4(byte[] data = null, GameVersion versionOverride = GameVersion.Any) diff --git a/PKHeX/Saves/SAV5.cs b/PKHeX/Saves/SAV5.cs index 5f7870931..ba2120c35 100644 --- a/PKHeX/Saves/SAV5.cs +++ b/PKHeX/Saves/SAV5.cs @@ -7,7 +7,7 @@ namespace PKHeX public sealed class SAV5 : SaveFile { // Save Data Attributes - public override string BAKName => $"{FileName} [{OT} ({(GameVersion)Game})" +/* - {LastSavedTime}*/ "].bak"; + public override string BAKName => $"{FileName} [{OT} ({(GameVersion)Game}) - {PlayTimeString}].bak"; public override string Filter => (Footer.Length > 0 ? "DeSmuME DSV|*.dsv|" : "") + "SAV File|*.sav"; public override string Extension => ".sav"; public SAV5(byte[] data = null, GameVersion versionOverride = GameVersion.Any) diff --git a/PKHeX/Saves/SaveFile.cs b/PKHeX/Saves/SaveFile.cs index a6fac64af..4e142c077 100644 --- a/PKHeX/Saves/SaveFile.cs +++ b/PKHeX/Saves/SaveFile.cs @@ -20,6 +20,7 @@ public abstract class SaveFile public abstract string Filter { get; } public byte[] Footer { protected get; set; } = new byte[0]; // .dsv public bool Japanese { protected get; set; } + public string PlayTimeString => $"{PlayedHours}ː{PlayedMinutes}ː{PlayedSeconds}"; // not : public bool GetJapanese => Japanese; From 9b6552d3146f73c2a33f5254f0b673f8f08d9891 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sun, 4 Sep 2016 18:17:13 -0700 Subject: [PATCH 12/35] Database/MysteryGift fixes gen1/2 Fix unhandled exception loading gen1/2 to gen3+ Fix unhandled exception loading gen1/2 save and opening Database Fix not loading pk1/pk2 dumped files as they aren't in the "List" format (rather, party and stored). --- PKHeX/MainWindow/Main.cs | 7 ++++--- PKHeX/PKM/PKMConverter.cs | 4 ++++ PKHeX/PKM/PKX.cs | 10 +++++++++- PKHeX/Subforms/SAV_Database.Designer.cs | 4 +++- PKHeX/Subforms/SAV_Database.cs | 3 ++- PKHeX/Subforms/SAV_MysteryGiftDB.cs | 3 ++- 6 files changed, 24 insertions(+), 7 deletions(-) diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index ab9df59cc..b8827ce30 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -1350,9 +1350,10 @@ private void populateFilteredDataSources() public void populateFields(PKM pk, bool focus = true) { if (pk == null) { Util.Error("Attempted to load a null file."); return; } - - if (pk.Format > SAV.Generation) - { Util.Alert("Can't load future generation files."); return; } + + if ((pk.Format >= 3 && pk.Format > SAV.Generation) // pk3-7, can't go backwards + || (pk.Format <= 2 && SAV.Generation > 2 && SAV.Generation < 7)) // pk1-2, can't go 3-6 + { Util.Alert($"Can't load Gen{pk.Format} to Gen{SAV.Generation} games."); return; } bool oldInit = fieldsInitialized; fieldsInitialized = fieldsLoaded = false; diff --git a/PKHeX/PKM/PKMConverter.cs b/PKHeX/PKM/PKMConverter.cs index 7ab96784a..bd3e14b73 100644 --- a/PKHeX/PKM/PKMConverter.cs +++ b/PKHeX/PKM/PKMConverter.cs @@ -33,9 +33,13 @@ public static int getPKMDataFormat(byte[] data) { case PKX.SIZE_1JLIST: case PKX.SIZE_1ULIST: + case PKX.SIZE_1PARTY: + case PKX.SIZE_1STORED: return 1; case PKX.SIZE_2ULIST: case PKX.SIZE_2JLIST: + case PKX.SIZE_2PARTY: + case PKX.SIZE_2STORED: return 2; case PKX.SIZE_3PARTY: case PKX.SIZE_3STORED: diff --git a/PKHeX/PKM/PKX.cs b/PKHeX/PKM/PKX.cs index c85c9531a..1c9a62d9f 100644 --- a/PKHeX/PKM/PKX.cs +++ b/PKHeX/PKM/PKX.cs @@ -43,7 +43,15 @@ public static class PKX /// A boolean indicating whether or not the length is valid for a Pokemon file. public static bool getIsPKM(long len) { - return new[] {SIZE_1JLIST, SIZE_1ULIST, SIZE_2ULIST, SIZE_2JLIST, SIZE_3STORED, SIZE_3PARTY, SIZE_4STORED, SIZE_4PARTY, SIZE_5PARTY, SIZE_6STORED, SIZE_6PARTY}.Contains((int)len); + return new[] + { + SIZE_1JLIST, SIZE_1ULIST, SIZE_1PARTY, SIZE_1STORED, + SIZE_2ULIST, SIZE_2JLIST, SIZE_2PARTY, SIZE_2STORED, + SIZE_3STORED, SIZE_3PARTY, + SIZE_4STORED, SIZE_4PARTY, + SIZE_5PARTY, + SIZE_6STORED, SIZE_6PARTY + }.Contains((int)len); } // C# PKX Function Library diff --git a/PKHeX/Subforms/SAV_Database.Designer.cs b/PKHeX/Subforms/SAV_Database.Designer.cs index 8e022359c..3e38131de 100644 --- a/PKHeX/Subforms/SAV_Database.Designer.cs +++ b/PKHeX/Subforms/SAV_Database.Designer.cs @@ -1768,7 +1768,9 @@ private void InitializeComponent() ".pk6", ".pk5", ".pk4", - ".pk3"}); + ".pk3", + ".pk2", + ".pk1"}); this.CB_Format.Location = new System.Drawing.Point(54, 0); this.CB_Format.Margin = new System.Windows.Forms.Padding(0); this.CB_Format.Name = "CB_Format"; diff --git a/PKHeX/Subforms/SAV_Database.cs b/PKHeX/Subforms/SAV_Database.cs index 7aff6ad48..1682e2280 100644 --- a/PKHeX/Subforms/SAV_Database.cs +++ b/PKHeX/Subforms/SAV_Database.cs @@ -594,7 +594,8 @@ private void changeFormatFilter(object sender, EventArgs e) else { CB_Format.Visible = true; - CB_Format.SelectedIndex = MAXFORMAT - Main.SAV.Generation + 1; // SAV generation (offset by 1 for "Any") + int index = MAXFORMAT - Main.SAV.Generation + 1; + CB_Format.SelectedIndex = index < CB_Format.Items.Count ? index : 0; // SAV generation (offset by 1 for "Any") } } } diff --git a/PKHeX/Subforms/SAV_MysteryGiftDB.cs b/PKHeX/Subforms/SAV_MysteryGiftDB.cs index 9d21c3860..0b64d2ef1 100644 --- a/PKHeX/Subforms/SAV_MysteryGiftDB.cs +++ b/PKHeX/Subforms/SAV_MysteryGiftDB.cs @@ -344,7 +344,8 @@ private void changeFormatFilter(object sender, EventArgs e) else { CB_Format.Visible = true; - CB_Format.SelectedIndex = MAXFORMAT - Main.SAV.Generation + 1; // SAV generation (offset by 1 for "Any") + int index = MAXFORMAT - Main.SAV.Generation + 1; + CB_Format.SelectedIndex = index < CB_Format.Items.Count ? index : 0; // SAV generation (offset by 1 for "Any") } } } From fed18d1d51fd017181b325ba231e35cc5d242ec3 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sun, 4 Sep 2016 21:36:41 -0700 Subject: [PATCH 13/35] Ban gen3/4 balls on g4 starters Thanks /u/Subject21_J ! --- PKHeX/Legality/Tables.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/PKHeX/Legality/Tables.cs b/PKHeX/Legality/Tables.cs index 6d9a2a1f6..5555397c7 100644 --- a/PKHeX/Legality/Tables.cs +++ b/PKHeX/Legality/Tables.cs @@ -840,6 +840,9 @@ public static partial class Legal }; internal static readonly int[] Ban_Gen3Ball = { + 387, 390, 393, //1 - Turtwig, Chimchar, Piplup + 388, 391, 394, //2 + 389, 392, 395, //3 495, 498, 501, //1 - Snivy, Tepig, Oshawott 496, 499, 502, //2 497, 500, 503, //3 @@ -850,6 +853,9 @@ public static partial class Legal 152, 155, 158, //1 - Chikorita, Cyndaquil, Totodile 153, 156, 159, //2 154, 157, 160, //3 + 387, 390, 393, //1 - Turtwig, Chimchar, Piplup + 388, 391, 394, //2 + 389, 392, 395, //3 495, 498, 501, //1 - Snivy, Tepig, Oshawott 496, 499, 502, //2 497, 500, 503, //3 From 57122d2f9ddecd1b71237286dbcdeecd95d9c494 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Mon, 5 Sep 2016 14:26:21 -0700 Subject: [PATCH 14/35] Redesign first 3 tabs of editor Uses many FlowLayoutPanel to automatically collapse controls so that when future properties are hidden, the remaining aren't 'randomly' spaced out. With the collapsing of controls, N's sparkle was added for gen5 pkm. --- PKHeX/MainWindow/Main.Designer.cs | 3208 +++++++++++++++++++---------- PKHeX/MainWindow/Main.cs | 106 +- PKHeX/MainWindow/Main.resx | 860 ++++---- PKHeX/MainWindow/MainPK5.cs | 3 + 4 files changed, 2558 insertions(+), 1619 deletions(-) diff --git a/PKHeX/MainWindow/Main.Designer.cs b/PKHeX/MainWindow/Main.Designer.cs index d48ef9d03..6c9e18c95 100644 --- a/PKHeX/MainWindow/Main.Designer.cs +++ b/PKHeX/MainWindow/Main.Designer.cs @@ -33,103 +33,118 @@ public void InitializeComponent() System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Main)); this.tabMain = new System.Windows.Forms.TabControl(); this.Tab_Main = new System.Windows.Forms.TabPage(); - this.CB_Language = new System.Windows.Forms.ComboBox(); - this.MT_Form = new System.Windows.Forms.MaskedTextBox(); - this.CB_Ability = new System.Windows.Forms.ComboBox(); + this.FLP_Main = new System.Windows.Forms.FlowLayoutPanel(); + this.FLP_PID = new System.Windows.Forms.FlowLayoutPanel(); + this.FLP_PIDLeft = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_PID = new System.Windows.Forms.Label(); + this.BTN_Shinytize = new System.Windows.Forms.Button(); + this.Label_IsShiny = new System.Windows.Forms.PictureBox(); + this.FLP_PIDRight = new System.Windows.Forms.FlowLayoutPanel(); this.TB_PID = new System.Windows.Forms.TextBox(); - this.CHK_Nicknamed = new System.Windows.Forms.CheckBox(); this.Label_Gender = new System.Windows.Forms.Label(); - this.CB_Form = new System.Windows.Forms.ComboBox(); - this.CHK_Cured = new System.Windows.Forms.CheckBox(); - this.CHK_Infected = new System.Windows.Forms.CheckBox(); + this.BTN_RerollPID = new System.Windows.Forms.Button(); + this.FLP_Species = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_Species = new System.Windows.Forms.Label(); + this.CB_Species = new System.Windows.Forms.ComboBox(); + this.FLP_Nickname = new System.Windows.Forms.FlowLayoutPanel(); + this.FLP_NicknameLeft = new System.Windows.Forms.FlowLayoutPanel(); + this.CHK_Nicknamed = new System.Windows.Forms.CheckBox(); + this.TB_Nickname = new System.Windows.Forms.TextBox(); + this.FLP_EXPLevel = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_EXP = new System.Windows.Forms.Label(); + this.FLP_EXPLevelRight = new System.Windows.Forms.FlowLayoutPanel(); + this.TB_EXP = new System.Windows.Forms.MaskedTextBox(); + this.Label_CurLevel = new System.Windows.Forms.Label(); + this.TB_Level = new System.Windows.Forms.MaskedTextBox(); + this.MT_Level = new System.Windows.Forms.MaskedTextBox(); + this.FLP_Nature = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_Nature = new System.Windows.Forms.Label(); + this.CB_Nature = new System.Windows.Forms.ComboBox(); + this.FLP_HeldItem = new System.Windows.Forms.FlowLayoutPanel(); this.Label_HeldItem = new System.Windows.Forms.Label(); this.CB_HeldItem = new System.Windows.Forms.ComboBox(); - this.TB_Friendship = new System.Windows.Forms.MaskedTextBox(); - this.TB_Level = new System.Windows.Forms.MaskedTextBox(); - this.TB_EXP = new System.Windows.Forms.MaskedTextBox(); - this.BTN_RerollPID = new System.Windows.Forms.Button(); - this.CB_3DSReg = new System.Windows.Forms.ComboBox(); - this.CB_SubRegion = new System.Windows.Forms.ComboBox(); - this.CB_Country = new System.Windows.Forms.ComboBox(); - this.CB_PKRSDays = new System.Windows.Forms.ComboBox(); - this.CB_PKRSStrain = new System.Windows.Forms.ComboBox(); - this.CB_Nature = new System.Windows.Forms.ComboBox(); - this.Label_3DSRegion = new System.Windows.Forms.Label(); - this.Label_SubRegion = new System.Windows.Forms.Label(); - this.Label_Country = new System.Windows.Forms.Label(); - this.Label_PKRSdays = new System.Windows.Forms.Label(); - this.Label_PKRS = new System.Windows.Forms.Label(); - this.CHK_IsEgg = new System.Windows.Forms.CheckBox(); - this.Label_Language = new System.Windows.Forms.Label(); - this.Label_Form = new System.Windows.Forms.Label(); - this.Label_Ability = new System.Windows.Forms.Label(); + this.FLP_FriendshipForm = new System.Windows.Forms.FlowLayoutPanel(); + this.FLP_FriendshipFormLeft = new System.Windows.Forms.FlowLayoutPanel(); this.Label_Friendship = new System.Windows.Forms.Label(); - this.Label_Nature = new System.Windows.Forms.Label(); - this.Label_CurLevel = new System.Windows.Forms.Label(); - this.TB_Nickname = new System.Windows.Forms.TextBox(); - this.CB_Species = new System.Windows.Forms.ComboBox(); - this.Label_EXP = new System.Windows.Forms.Label(); - this.Label_Species = new System.Windows.Forms.Label(); this.Label_HatchCounter = new System.Windows.Forms.Label(); - this.Label_IsShiny = new System.Windows.Forms.PictureBox(); - this.BTN_Shinytize = new System.Windows.Forms.Button(); - this.Label_PID = new System.Windows.Forms.Label(); - this.TB_AbilityNumber = new System.Windows.Forms.MaskedTextBox(); - this.MT_Level = new System.Windows.Forms.MaskedTextBox(); + this.FLP_FriendshipFormRight = new System.Windows.Forms.FlowLayoutPanel(); + this.TB_Friendship = new System.Windows.Forms.MaskedTextBox(); + this.Label_Form = new System.Windows.Forms.Label(); + this.CB_Form = new System.Windows.Forms.ComboBox(); + this.MT_Form = new System.Windows.Forms.MaskedTextBox(); + this.FLP_Ability = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_Ability = new System.Windows.Forms.Label(); + this.FLP_AbilityRight = new System.Windows.Forms.FlowLayoutPanel(); + this.CB_Ability = new System.Windows.Forms.ComboBox(); this.DEV_Ability = new System.Windows.Forms.ComboBox(); + this.TB_AbilityNumber = new System.Windows.Forms.MaskedTextBox(); + this.FLP_Language = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_Language = new System.Windows.Forms.Label(); + this.CB_Language = new System.Windows.Forms.ComboBox(); + this.FLP_EggPKRS = new System.Windows.Forms.FlowLayoutPanel(); + this.FLP_EggPKRSLeft = new System.Windows.Forms.FlowLayoutPanel(); + this.CHK_IsEgg = new System.Windows.Forms.CheckBox(); + this.FLP_EggPKRSRight = new System.Windows.Forms.FlowLayoutPanel(); + this.CHK_Infected = new System.Windows.Forms.CheckBox(); + this.CHK_Cured = new System.Windows.Forms.CheckBox(); + this.FLP_PKRS = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_PKRS = new System.Windows.Forms.Label(); + this.FLP_PKRSRight = new System.Windows.Forms.FlowLayoutPanel(); + this.CB_PKRSStrain = new System.Windows.Forms.ComboBox(); + this.Label_PKRSdays = new System.Windows.Forms.Label(); + this.CB_PKRSDays = new System.Windows.Forms.ComboBox(); + this.FLP_Country = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_Country = new System.Windows.Forms.Label(); + this.CB_Country = new System.Windows.Forms.ComboBox(); + this.FLP_SubRegion = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_SubRegion = new System.Windows.Forms.Label(); + this.CB_SubRegion = new System.Windows.Forms.ComboBox(); + this.FLP_3DSRegion = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_3DSRegion = new System.Windows.Forms.Label(); + this.CB_3DSReg = new System.Windows.Forms.ComboBox(); + this.FLP_NSparkle = new System.Windows.Forms.FlowLayoutPanel(); + this.L_NSparkle = new System.Windows.Forms.Label(); + this.CHK_NSparkle = new System.Windows.Forms.CheckBox(); this.Tab_Met = new System.Windows.Forms.TabPage(); - this.L_MetTimeOfDay = new System.Windows.Forms.Label(); - this.CB_MetTimeOfDay = new System.Windows.Forms.ComboBox(); this.CHK_AsEgg = new System.Windows.Forms.CheckBox(); - this.CHK_Fateful = new System.Windows.Forms.CheckBox(); this.GB_EggConditions = new System.Windows.Forms.GroupBox(); this.CB_EggLocation = new System.Windows.Forms.ComboBox(); this.CAL_EggDate = new System.Windows.Forms.DateTimePicker(); this.Label_EggDate = new System.Windows.Forms.Label(); this.Label_EggLocation = new System.Windows.Forms.Label(); - this.Label_EncounterType = new System.Windows.Forms.Label(); - this.Label_MetDate = new System.Windows.Forms.Label(); - this.Label_MetLevel = new System.Windows.Forms.Label(); - this.Label_Ball = new System.Windows.Forms.Label(); - this.Label_MetLocation = new System.Windows.Forms.Label(); + this.FLP_Met = new System.Windows.Forms.FlowLayoutPanel(); + this.FLP_OriginGame = new System.Windows.Forms.FlowLayoutPanel(); this.Label_OriginGame = new System.Windows.Forms.Label(); this.CB_GameOrigin = new System.Windows.Forms.ComboBox(); + this.FLP_MetLocation = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_MetLocation = new System.Windows.Forms.Label(); this.CB_MetLocation = new System.Windows.Forms.ComboBox(); + this.FLP_Ball = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_Ball = new System.Windows.Forms.Label(); this.CB_Ball = new System.Windows.Forms.ComboBox(); + this.FLP_MetLevel = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_MetLevel = new System.Windows.Forms.Label(); this.TB_MetLevel = new System.Windows.Forms.MaskedTextBox(); + this.FLP_MetDate = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_MetDate = new System.Windows.Forms.Label(); this.CAL_MetDate = new System.Windows.Forms.DateTimePicker(); + this.FLP_Fateful = new System.Windows.Forms.FlowLayoutPanel(); + this.PAN_Fateful = new System.Windows.Forms.Panel(); + this.CHK_Fateful = new System.Windows.Forms.CheckBox(); + this.FLP_EncounterType = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_EncounterType = new System.Windows.Forms.Label(); this.CB_EncounterType = new System.Windows.Forms.ComboBox(); + this.FLP_TimeOfDay = new System.Windows.Forms.FlowLayoutPanel(); + this.L_MetTimeOfDay = new System.Windows.Forms.Label(); + this.CB_MetTimeOfDay = new System.Windows.Forms.ComboBox(); this.Tab_Stats = new System.Windows.Forms.TabPage(); - this.Stat_SPE = new System.Windows.Forms.MaskedTextBox(); - this.Stat_SPD = new System.Windows.Forms.MaskedTextBox(); - this.Stat_SPA = new System.Windows.Forms.MaskedTextBox(); - this.Stat_DEF = new System.Windows.Forms.MaskedTextBox(); - this.Stat_ATK = new System.Windows.Forms.MaskedTextBox(); - this.Stat_HP = new System.Windows.Forms.MaskedTextBox(); - this.CB_HPType = new System.Windows.Forms.ComboBox(); - this.CHK_HackedStats = new System.Windows.Forms.CheckBox(); - this.Label_CharacteristicPrefix = new System.Windows.Forms.Label(); - this.L_Potential = new System.Windows.Forms.Label(); - this.TB_IVTotal = new System.Windows.Forms.TextBox(); - this.L_Characteristic = new System.Windows.Forms.Label(); + this.PAN_Contest = new System.Windows.Forms.Panel(); this.TB_Sheen = new System.Windows.Forms.MaskedTextBox(); this.TB_Tough = new System.Windows.Forms.MaskedTextBox(); this.TB_Smart = new System.Windows.Forms.MaskedTextBox(); this.TB_Cute = new System.Windows.Forms.MaskedTextBox(); this.TB_Beauty = new System.Windows.Forms.MaskedTextBox(); this.TB_Cool = new System.Windows.Forms.MaskedTextBox(); - this.TB_SPEIV = new System.Windows.Forms.MaskedTextBox(); - this.TB_SPDIV = new System.Windows.Forms.MaskedTextBox(); - this.TB_SPAIV = new System.Windows.Forms.MaskedTextBox(); - this.TB_DEFIV = new System.Windows.Forms.MaskedTextBox(); - this.TB_ATKIV = new System.Windows.Forms.MaskedTextBox(); - this.TB_HPIV = new System.Windows.Forms.MaskedTextBox(); - this.TB_ATKEV = new System.Windows.Forms.MaskedTextBox(); - this.TB_DEFEV = new System.Windows.Forms.MaskedTextBox(); - this.TB_SPEEV = new System.Windows.Forms.MaskedTextBox(); - this.TB_SPDEV = new System.Windows.Forms.MaskedTextBox(); - this.TB_SPAEV = new System.Windows.Forms.MaskedTextBox(); - this.TB_HPEV = new System.Windows.Forms.MaskedTextBox(); this.Label_Sheen = new System.Windows.Forms.Label(); this.Label_Tough = new System.Windows.Forms.Label(); this.Label_Smart = new System.Windows.Forms.Label(); @@ -137,20 +152,66 @@ public void InitializeComponent() this.Label_Beauty = new System.Windows.Forms.Label(); this.Label_Cool = new System.Windows.Forms.Label(); this.Label_ContestStats = new System.Windows.Forms.Label(); + this.FLP_Stats = new System.Windows.Forms.FlowLayoutPanel(); + this.FLP_StatHeader = new System.Windows.Forms.FlowLayoutPanel(); + this.FLP_HackedStats = new System.Windows.Forms.FlowLayoutPanel(); + this.CHK_HackedStats = new System.Windows.Forms.CheckBox(); + this.FLP_StatsHeaderRight = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_IVs = new System.Windows.Forms.Label(); + this.Label_EVs = new System.Windows.Forms.Label(); + this.Label_Stats = new System.Windows.Forms.Label(); + this.FLP_HP = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_HP = new System.Windows.Forms.Label(); + this.FLP_HPRight = new System.Windows.Forms.FlowLayoutPanel(); + this.TB_HPIV = new System.Windows.Forms.MaskedTextBox(); + this.TB_HPEV = new System.Windows.Forms.MaskedTextBox(); + this.Stat_HP = new System.Windows.Forms.MaskedTextBox(); + this.FLP_Atk = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_ATK = new System.Windows.Forms.Label(); + this.FLP_AtkRight = new System.Windows.Forms.FlowLayoutPanel(); + this.TB_ATKIV = new System.Windows.Forms.MaskedTextBox(); + this.TB_ATKEV = new System.Windows.Forms.MaskedTextBox(); + this.Stat_ATK = new System.Windows.Forms.MaskedTextBox(); + this.FLP_Def = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_DEF = new System.Windows.Forms.Label(); + this.FLP_DefRight = new System.Windows.Forms.FlowLayoutPanel(); + this.TB_DEFIV = new System.Windows.Forms.MaskedTextBox(); + this.TB_DEFEV = new System.Windows.Forms.MaskedTextBox(); + this.Stat_DEF = new System.Windows.Forms.MaskedTextBox(); + this.FLP_SpA = new System.Windows.Forms.FlowLayoutPanel(); + this.FLP_SpALeft = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_SPA = new System.Windows.Forms.Label(); + this.Label_SPC = new System.Windows.Forms.Label(); + this.FLP_SpARight = new System.Windows.Forms.FlowLayoutPanel(); + this.TB_SPAIV = new System.Windows.Forms.MaskedTextBox(); + this.TB_SPAEV = new System.Windows.Forms.MaskedTextBox(); + this.Stat_SPA = new System.Windows.Forms.MaskedTextBox(); + this.FLP_SpD = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_SPD = new System.Windows.Forms.Label(); + this.FLP_SpDRight = new System.Windows.Forms.FlowLayoutPanel(); + this.TB_SPDIV = new System.Windows.Forms.MaskedTextBox(); + this.TB_SPDEV = new System.Windows.Forms.MaskedTextBox(); + this.Stat_SPD = new System.Windows.Forms.MaskedTextBox(); + this.FLP_Spe = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_SPE = new System.Windows.Forms.Label(); + this.FLP_SpeRight = new System.Windows.Forms.FlowLayoutPanel(); + this.TB_SPEIV = new System.Windows.Forms.MaskedTextBox(); + this.TB_SPEEV = new System.Windows.Forms.MaskedTextBox(); + this.Stat_SPE = new System.Windows.Forms.MaskedTextBox(); + this.FLP_StatsTotal = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_Total = new System.Windows.Forms.Label(); + this.FLP_StatsTotalRight = new System.Windows.Forms.FlowLayoutPanel(); + this.TB_IVTotal = new System.Windows.Forms.TextBox(); + this.TB_EVTotal = new System.Windows.Forms.TextBox(); + this.L_Potential = new System.Windows.Forms.Label(); + this.FLP_HPType = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_HiddenPowerPrefix = new System.Windows.Forms.Label(); + this.CB_HPType = new System.Windows.Forms.ComboBox(); + this.FLP_Characteristic = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_CharacteristicPrefix = new System.Windows.Forms.Label(); + this.L_Characteristic = new System.Windows.Forms.Label(); this.BTN_RandomEVs = new System.Windows.Forms.Button(); this.BTN_RandomIVs = new System.Windows.Forms.Button(); - this.Label_HiddenPowerPrefix = new System.Windows.Forms.Label(); - this.Label_Stats = new System.Windows.Forms.Label(); - this.Label_EVs = new System.Windows.Forms.Label(); - this.Label_IVs = new System.Windows.Forms.Label(); - this.Label_Total = new System.Windows.Forms.Label(); - this.Label_SPE = new System.Windows.Forms.Label(); - this.Label_SPD = new System.Windows.Forms.Label(); - this.Label_SPA = new System.Windows.Forms.Label(); - this.Label_DEF = new System.Windows.Forms.Label(); - this.Label_ATK = new System.Windows.Forms.Label(); - this.Label_HP = new System.Windows.Forms.Label(); - this.TB_EVTotal = new System.Windows.Forms.TextBox(); this.Tab_Attacks = new System.Windows.Forms.TabPage(); this.PB_WarnMove4 = new System.Windows.Forms.PictureBox(); this.PB_WarnMove3 = new System.Windows.Forms.PictureBox(); @@ -368,10 +429,67 @@ public void InitializeComponent() this.L_UpdateAvailable = new System.Windows.Forms.LinkLabel(); this.tabMain.SuspendLayout(); this.Tab_Main.SuspendLayout(); + this.FLP_Main.SuspendLayout(); + this.FLP_PID.SuspendLayout(); + this.FLP_PIDLeft.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.Label_IsShiny)).BeginInit(); + this.FLP_PIDRight.SuspendLayout(); + this.FLP_Species.SuspendLayout(); + this.FLP_Nickname.SuspendLayout(); + this.FLP_NicknameLeft.SuspendLayout(); + this.FLP_EXPLevel.SuspendLayout(); + this.FLP_EXPLevelRight.SuspendLayout(); + this.FLP_Nature.SuspendLayout(); + this.FLP_HeldItem.SuspendLayout(); + this.FLP_FriendshipForm.SuspendLayout(); + this.FLP_FriendshipFormLeft.SuspendLayout(); + this.FLP_FriendshipFormRight.SuspendLayout(); + this.FLP_Ability.SuspendLayout(); + this.FLP_AbilityRight.SuspendLayout(); + this.FLP_Language.SuspendLayout(); + this.FLP_EggPKRS.SuspendLayout(); + this.FLP_EggPKRSLeft.SuspendLayout(); + this.FLP_EggPKRSRight.SuspendLayout(); + this.FLP_PKRS.SuspendLayout(); + this.FLP_PKRSRight.SuspendLayout(); + this.FLP_Country.SuspendLayout(); + this.FLP_SubRegion.SuspendLayout(); + this.FLP_3DSRegion.SuspendLayout(); + this.FLP_NSparkle.SuspendLayout(); this.Tab_Met.SuspendLayout(); this.GB_EggConditions.SuspendLayout(); + this.FLP_Met.SuspendLayout(); + this.FLP_OriginGame.SuspendLayout(); + this.FLP_MetLocation.SuspendLayout(); + this.FLP_Ball.SuspendLayout(); + this.FLP_MetLevel.SuspendLayout(); + this.FLP_MetDate.SuspendLayout(); + this.FLP_Fateful.SuspendLayout(); + this.FLP_EncounterType.SuspendLayout(); + this.FLP_TimeOfDay.SuspendLayout(); this.Tab_Stats.SuspendLayout(); + this.PAN_Contest.SuspendLayout(); + this.FLP_Stats.SuspendLayout(); + this.FLP_StatHeader.SuspendLayout(); + this.FLP_HackedStats.SuspendLayout(); + this.FLP_StatsHeaderRight.SuspendLayout(); + this.FLP_HP.SuspendLayout(); + this.FLP_HPRight.SuspendLayout(); + this.FLP_Atk.SuspendLayout(); + this.FLP_AtkRight.SuspendLayout(); + this.FLP_Def.SuspendLayout(); + this.FLP_DefRight.SuspendLayout(); + this.FLP_SpA.SuspendLayout(); + this.FLP_SpALeft.SuspendLayout(); + this.FLP_SpARight.SuspendLayout(); + this.FLP_SpD.SuspendLayout(); + this.FLP_SpDRight.SuspendLayout(); + this.FLP_Spe.SuspendLayout(); + this.FLP_SpeRight.SuspendLayout(); + this.FLP_StatsTotal.SuspendLayout(); + this.FLP_StatsTotalRight.SuspendLayout(); + this.FLP_HPType.SuspendLayout(); + this.FLP_Characteristic.SuspendLayout(); this.Tab_Attacks.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.PB_WarnMove4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.PB_WarnMove3)).BeginInit(); @@ -489,50 +607,7 @@ public void InitializeComponent() // Tab_Main // this.Tab_Main.AllowDrop = true; - this.Tab_Main.Controls.Add(this.CB_Language); - this.Tab_Main.Controls.Add(this.MT_Form); - this.Tab_Main.Controls.Add(this.CB_Ability); - this.Tab_Main.Controls.Add(this.TB_PID); - this.Tab_Main.Controls.Add(this.CHK_Nicknamed); - this.Tab_Main.Controls.Add(this.Label_Gender); - this.Tab_Main.Controls.Add(this.CB_Form); - this.Tab_Main.Controls.Add(this.CHK_Cured); - this.Tab_Main.Controls.Add(this.CHK_Infected); - this.Tab_Main.Controls.Add(this.Label_HeldItem); - this.Tab_Main.Controls.Add(this.CB_HeldItem); - this.Tab_Main.Controls.Add(this.TB_Friendship); - this.Tab_Main.Controls.Add(this.TB_Level); - this.Tab_Main.Controls.Add(this.TB_EXP); - this.Tab_Main.Controls.Add(this.BTN_RerollPID); - this.Tab_Main.Controls.Add(this.CB_3DSReg); - this.Tab_Main.Controls.Add(this.CB_SubRegion); - this.Tab_Main.Controls.Add(this.CB_Country); - this.Tab_Main.Controls.Add(this.CB_PKRSDays); - this.Tab_Main.Controls.Add(this.CB_PKRSStrain); - this.Tab_Main.Controls.Add(this.CB_Nature); - this.Tab_Main.Controls.Add(this.Label_3DSRegion); - this.Tab_Main.Controls.Add(this.Label_SubRegion); - this.Tab_Main.Controls.Add(this.Label_Country); - this.Tab_Main.Controls.Add(this.Label_PKRSdays); - this.Tab_Main.Controls.Add(this.Label_PKRS); - this.Tab_Main.Controls.Add(this.CHK_IsEgg); - this.Tab_Main.Controls.Add(this.Label_Language); - this.Tab_Main.Controls.Add(this.Label_Form); - this.Tab_Main.Controls.Add(this.Label_Ability); - this.Tab_Main.Controls.Add(this.Label_Friendship); - this.Tab_Main.Controls.Add(this.Label_Nature); - this.Tab_Main.Controls.Add(this.Label_CurLevel); - this.Tab_Main.Controls.Add(this.TB_Nickname); - this.Tab_Main.Controls.Add(this.CB_Species); - this.Tab_Main.Controls.Add(this.Label_EXP); - this.Tab_Main.Controls.Add(this.Label_Species); - this.Tab_Main.Controls.Add(this.Label_HatchCounter); - this.Tab_Main.Controls.Add(this.Label_IsShiny); - this.Tab_Main.Controls.Add(this.BTN_Shinytize); - this.Tab_Main.Controls.Add(this.Label_PID); - this.Tab_Main.Controls.Add(this.TB_AbilityNumber); - this.Tab_Main.Controls.Add(this.MT_Level); - this.Tab_Main.Controls.Add(this.DEV_Ability); + this.Tab_Main.Controls.Add(this.FLP_Main); this.Tab_Main.Location = new System.Drawing.Point(4, 22); this.Tab_Main.Name = "Tab_Main"; this.Tab_Main.Padding = new System.Windows.Forms.Padding(3); @@ -541,48 +616,109 @@ public void InitializeComponent() this.Tab_Main.Text = "Main"; this.Tab_Main.UseVisualStyleBackColor = true; // - // CB_Language + // FLP_Main // - this.CB_Language.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.CB_Language.FormattingEnabled = true; - this.CB_Language.Location = new System.Drawing.Point(105, 174); - this.CB_Language.Name = "CB_Language"; - this.CB_Language.Size = new System.Drawing.Size(122, 21); - this.CB_Language.TabIndex = 15; - this.CB_Language.SelectedIndexChanged += new System.EventHandler(this.updateNickname); + this.FLP_Main.Controls.Add(this.FLP_PID); + this.FLP_Main.Controls.Add(this.FLP_Species); + this.FLP_Main.Controls.Add(this.FLP_Nickname); + this.FLP_Main.Controls.Add(this.FLP_EXPLevel); + this.FLP_Main.Controls.Add(this.FLP_Nature); + this.FLP_Main.Controls.Add(this.FLP_HeldItem); + this.FLP_Main.Controls.Add(this.FLP_FriendshipForm); + this.FLP_Main.Controls.Add(this.FLP_Ability); + this.FLP_Main.Controls.Add(this.FLP_Language); + this.FLP_Main.Controls.Add(this.FLP_EggPKRS); + this.FLP_Main.Controls.Add(this.FLP_PKRS); + this.FLP_Main.Controls.Add(this.FLP_Country); + this.FLP_Main.Controls.Add(this.FLP_SubRegion); + this.FLP_Main.Controls.Add(this.FLP_3DSRegion); + this.FLP_Main.Controls.Add(this.FLP_NSparkle); + this.FLP_Main.Location = new System.Drawing.Point(0, 2); + this.FLP_Main.Name = "FLP_Main"; + this.FLP_Main.Size = new System.Drawing.Size(272, 322); + this.FLP_Main.TabIndex = 103; // - // MT_Form + // FLP_PID // - this.MT_Form.Enabled = false; - this.MT_Form.Location = new System.Drawing.Point(229, 133); - this.MT_Form.Mask = "00"; - this.MT_Form.Name = "MT_Form"; - this.MT_Form.Size = new System.Drawing.Size(19, 20); - this.MT_Form.TabIndex = 18; - this.MT_Form.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.MT_Form.Visible = false; - this.MT_Form.TextChanged += new System.EventHandler(this.updateHaXForm); + this.FLP_PID.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_PID.Controls.Add(this.FLP_PIDLeft); + this.FLP_PID.Controls.Add(this.FLP_PIDRight); + this.FLP_PID.Location = new System.Drawing.Point(0, 0); + this.FLP_PID.Margin = new System.Windows.Forms.Padding(0); + this.FLP_PID.Name = "FLP_PID"; + this.FLP_PID.Size = new System.Drawing.Size(272, 22); + this.FLP_PID.TabIndex = 0; // - // CB_Ability + // FLP_PIDLeft // - this.CB_Ability.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.CB_Ability.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.CB_Ability.FormattingEnabled = true; - this.CB_Ability.Items.AddRange(new object[] { - "Item"}); - this.CB_Ability.Location = new System.Drawing.Point(105, 153); - this.CB_Ability.Name = "CB_Ability"; - this.CB_Ability.Size = new System.Drawing.Size(122, 21); - this.CB_Ability.TabIndex = 13; - this.CB_Ability.SelectedIndexChanged += new System.EventHandler(this.validateComboBox2); - this.CB_Ability.KeyDown += new System.Windows.Forms.KeyEventHandler(this.removedropCB); - this.CB_Ability.Validating += new System.ComponentModel.CancelEventHandler(this.validateComboBox); + this.FLP_PIDLeft.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.FLP_PIDLeft.Controls.Add(this.Label_PID); + this.FLP_PIDLeft.Controls.Add(this.BTN_Shinytize); + this.FLP_PIDLeft.Controls.Add(this.Label_IsShiny); + this.FLP_PIDLeft.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft; + this.FLP_PIDLeft.Location = new System.Drawing.Point(0, 0); + this.FLP_PIDLeft.Margin = new System.Windows.Forms.Padding(0); + this.FLP_PIDLeft.Name = "FLP_PIDLeft"; + this.FLP_PIDLeft.Size = new System.Drawing.Size(110, 22); + this.FLP_PIDLeft.TabIndex = 0; + // + // Label_PID + // + this.Label_PID.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.Label_PID.AutoSize = true; + this.Label_PID.Location = new System.Drawing.Point(82, 5); + this.Label_PID.Margin = new System.Windows.Forms.Padding(0, 5, 0, 4); + this.Label_PID.Name = "Label_PID"; + this.Label_PID.Size = new System.Drawing.Size(28, 13); + this.Label_PID.TabIndex = 0; + this.Label_PID.Text = "PID:"; + this.Label_PID.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // BTN_Shinytize + // + this.BTN_Shinytize.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.BTN_Shinytize.Location = new System.Drawing.Point(58, 0); + this.BTN_Shinytize.Margin = new System.Windows.Forms.Padding(0); + this.BTN_Shinytize.Name = "BTN_Shinytize"; + this.BTN_Shinytize.Size = new System.Drawing.Size(24, 22); + this.BTN_Shinytize.TabIndex = 1; + this.BTN_Shinytize.Text = "☆"; + this.BTN_Shinytize.UseVisualStyleBackColor = true; + this.BTN_Shinytize.Click += new System.EventHandler(this.updateShinyPID); + // + // Label_IsShiny + // + this.Label_IsShiny.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.Label_IsShiny.Image = ((System.Drawing.Image)(resources.GetObject("Label_IsShiny.Image"))); + this.Label_IsShiny.InitialImage = ((System.Drawing.Image)(resources.GetObject("Label_IsShiny.InitialImage"))); + this.Label_IsShiny.Location = new System.Drawing.Point(36, 2); + this.Label_IsShiny.Margin = new System.Windows.Forms.Padding(0, 2, 2, 0); + this.Label_IsShiny.Name = "Label_IsShiny"; + this.Label_IsShiny.Size = new System.Drawing.Size(20, 20); + this.Label_IsShiny.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.Label_IsShiny.TabIndex = 62; + this.Label_IsShiny.TabStop = false; + this.Label_IsShiny.Visible = false; + // + // FLP_PIDRight + // + this.FLP_PIDRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_PIDRight.Controls.Add(this.TB_PID); + this.FLP_PIDRight.Controls.Add(this.Label_Gender); + this.FLP_PIDRight.Controls.Add(this.BTN_RerollPID); + this.FLP_PIDRight.Location = new System.Drawing.Point(110, 0); + this.FLP_PIDRight.Margin = new System.Windows.Forms.Padding(0); + this.FLP_PIDRight.Name = "FLP_PIDRight"; + this.FLP_PIDRight.Size = new System.Drawing.Size(162, 22); + this.FLP_PIDRight.TabIndex = 104; // // TB_PID // + this.TB_PID.Anchor = System.Windows.Forms.AnchorStyles.Left; this.TB_PID.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.TB_PID.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.TB_PID.Location = new System.Drawing.Point(105, 7); + this.TB_PID.Location = new System.Drawing.Point(0, 1); + this.TB_PID.Margin = new System.Windows.Forms.Padding(0, 1, 0, 0); this.TB_PID.MaxLength = 8; this.TB_PID.Name = "TB_PID"; this.TB_PID.Size = new System.Drawing.Size(60, 20); @@ -591,69 +727,253 @@ public void InitializeComponent() this.TB_PID.TextChanged += new System.EventHandler(this.update_ID); this.TB_PID.MouseHover += new System.EventHandler(this.updateTSV); // - // CHK_Nicknamed - // - this.CHK_Nicknamed.Location = new System.Drawing.Point(25, 51); - this.CHK_Nicknamed.Name = "CHK_Nicknamed"; - this.CHK_Nicknamed.Size = new System.Drawing.Size(80, 17); - this.CHK_Nicknamed.TabIndex = 4; - this.CHK_Nicknamed.Text = "Nickname:"; - this.CHK_Nicknamed.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.CHK_Nicknamed.UseVisualStyleBackColor = true; - this.CHK_Nicknamed.CheckedChanged += new System.EventHandler(this.updateNickname); - // // Label_Gender // + this.Label_Gender.Anchor = System.Windows.Forms.AnchorStyles.Left; this.Label_Gender.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Label_Gender.Location = new System.Drawing.Point(170, 10); + this.Label_Gender.Location = new System.Drawing.Point(60, 0); + this.Label_Gender.Margin = new System.Windows.Forms.Padding(0); this.Label_Gender.Name = "Label_Gender"; - this.Label_Gender.Size = new System.Drawing.Size(16, 13); + this.Label_Gender.Size = new System.Drawing.Size(19, 21); this.Label_Gender.TabIndex = 55; this.Label_Gender.Text = "-"; this.Label_Gender.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.Label_Gender.Click += new System.EventHandler(this.clickGender); // - // CB_Form + // BTN_RerollPID // - this.CB_Form.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.CB_Form.DropDownWidth = 85; - this.CB_Form.Enabled = false; - this.CB_Form.FormattingEnabled = true; - this.CB_Form.Location = new System.Drawing.Point(158, 132); - this.CB_Form.Name = "CB_Form"; - this.CB_Form.Size = new System.Drawing.Size(69, 21); - this.CB_Form.TabIndex = 12; - this.CB_Form.SelectedIndexChanged += new System.EventHandler(this.updateForm); + this.BTN_RerollPID.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.BTN_RerollPID.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.BTN_RerollPID.Location = new System.Drawing.Point(79, 1); + this.BTN_RerollPID.Margin = new System.Windows.Forms.Padding(0, 1, 0, 0); + this.BTN_RerollPID.Name = "BTN_RerollPID"; + this.BTN_RerollPID.Size = new System.Drawing.Size(47, 20); + this.BTN_RerollPID.TabIndex = 1; + this.BTN_RerollPID.Text = "Reroll"; + this.BTN_RerollPID.UseVisualStyleBackColor = true; + this.BTN_RerollPID.Click += new System.EventHandler(this.updateRandomPID); // - // CHK_Cured + // FLP_Species // - this.CHK_Cured.AutoSize = true; - this.CHK_Cured.Location = new System.Drawing.Point(179, 196); - this.CHK_Cured.Name = "CHK_Cured"; - this.CHK_Cured.Size = new System.Drawing.Size(54, 17); - this.CHK_Cured.TabIndex = 18; - this.CHK_Cured.Text = "Cured"; - this.CHK_Cured.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.CHK_Cured.UseVisualStyleBackColor = true; - this.CHK_Cured.CheckedChanged += new System.EventHandler(this.updatePKRSCured); + this.FLP_Species.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_Species.Controls.Add(this.Label_Species); + this.FLP_Species.Controls.Add(this.CB_Species); + this.FLP_Species.Location = new System.Drawing.Point(0, 22); + this.FLP_Species.Margin = new System.Windows.Forms.Padding(0); + this.FLP_Species.Name = "FLP_Species"; + this.FLP_Species.Size = new System.Drawing.Size(272, 21); + this.FLP_Species.TabIndex = 1; // - // CHK_Infected + // Label_Species // - this.CHK_Infected.AutoSize = true; - this.CHK_Infected.Location = new System.Drawing.Point(105, 196); - this.CHK_Infected.Name = "CHK_Infected"; - this.CHK_Infected.Size = new System.Drawing.Size(65, 17); - this.CHK_Infected.TabIndex = 17; - this.CHK_Infected.Text = "Infected"; - this.CHK_Infected.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.CHK_Infected.UseVisualStyleBackColor = true; - this.CHK_Infected.CheckedChanged += new System.EventHandler(this.updatePKRSInfected); + this.Label_Species.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.Label_Species.Location = new System.Drawing.Point(0, 0); + this.Label_Species.Margin = new System.Windows.Forms.Padding(0); + this.Label_Species.Name = "Label_Species"; + this.Label_Species.Size = new System.Drawing.Size(110, 21); + this.Label_Species.TabIndex = 1; + this.Label_Species.Text = "Species:"; + this.Label_Species.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.Label_Species.Click += new System.EventHandler(this.updateNickname); + // + // CB_Species + // + this.CB_Species.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.CB_Species.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_Species.FormattingEnabled = true; + this.CB_Species.Location = new System.Drawing.Point(110, 0); + this.CB_Species.Margin = new System.Windows.Forms.Padding(0); + this.CB_Species.Name = "CB_Species"; + this.CB_Species.Size = new System.Drawing.Size(126, 21); + this.CB_Species.TabIndex = 3; + this.CB_Species.SelectedIndexChanged += new System.EventHandler(this.validateComboBox2); + this.CB_Species.SelectedValueChanged += new System.EventHandler(this.updateSpecies); + this.CB_Species.KeyDown += new System.Windows.Forms.KeyEventHandler(this.removedropCB); + this.CB_Species.Validating += new System.ComponentModel.CancelEventHandler(this.validateComboBox); + // + // FLP_Nickname + // + this.FLP_Nickname.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_Nickname.Controls.Add(this.FLP_NicknameLeft); + this.FLP_Nickname.Controls.Add(this.TB_Nickname); + this.FLP_Nickname.Location = new System.Drawing.Point(0, 43); + this.FLP_Nickname.Margin = new System.Windows.Forms.Padding(0); + this.FLP_Nickname.Name = "FLP_Nickname"; + this.FLP_Nickname.Size = new System.Drawing.Size(272, 22); + this.FLP_Nickname.TabIndex = 2; + // + // FLP_NicknameLeft + // + this.FLP_NicknameLeft.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.FLP_NicknameLeft.Controls.Add(this.CHK_Nicknamed); + this.FLP_NicknameLeft.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft; + this.FLP_NicknameLeft.Location = new System.Drawing.Point(0, 0); + this.FLP_NicknameLeft.Margin = new System.Windows.Forms.Padding(0); + this.FLP_NicknameLeft.Name = "FLP_NicknameLeft"; + this.FLP_NicknameLeft.Size = new System.Drawing.Size(110, 21); + this.FLP_NicknameLeft.TabIndex = 109; + // + // CHK_Nicknamed + // + this.CHK_Nicknamed.AutoSize = true; + this.CHK_Nicknamed.Location = new System.Drawing.Point(36, 3); + this.CHK_Nicknamed.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.CHK_Nicknamed.Name = "CHK_Nicknamed"; + this.CHK_Nicknamed.Size = new System.Drawing.Size(74, 17); + this.CHK_Nicknamed.TabIndex = 4; + this.CHK_Nicknamed.Text = "Nickname"; + this.CHK_Nicknamed.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.CHK_Nicknamed.UseVisualStyleBackColor = true; + this.CHK_Nicknamed.CheckedChanged += new System.EventHandler(this.updateNickname); + // + // TB_Nickname + // + this.TB_Nickname.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_Nickname.Location = new System.Drawing.Point(110, 0); + this.TB_Nickname.Margin = new System.Windows.Forms.Padding(0); + this.TB_Nickname.MaxLength = 12; + this.TB_Nickname.Name = "TB_Nickname"; + this.TB_Nickname.Size = new System.Drawing.Size(126, 20); + this.TB_Nickname.TabIndex = 5; + this.TB_Nickname.TextChanged += new System.EventHandler(this.updateIsNicknamed); + this.TB_Nickname.MouseDown += new System.Windows.Forms.MouseEventHandler(this.updateNicknameClick); + // + // FLP_EXPLevel + // + this.FLP_EXPLevel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_EXPLevel.Controls.Add(this.Label_EXP); + this.FLP_EXPLevel.Controls.Add(this.FLP_EXPLevelRight); + this.FLP_EXPLevel.Location = new System.Drawing.Point(0, 65); + this.FLP_EXPLevel.Margin = new System.Windows.Forms.Padding(0); + this.FLP_EXPLevel.Name = "FLP_EXPLevel"; + this.FLP_EXPLevel.Size = new System.Drawing.Size(272, 21); + this.FLP_EXPLevel.TabIndex = 3; + // + // Label_EXP + // + this.Label_EXP.Location = new System.Drawing.Point(0, 0); + this.Label_EXP.Margin = new System.Windows.Forms.Padding(0); + this.Label_EXP.Name = "Label_EXP"; + this.Label_EXP.Size = new System.Drawing.Size(110, 21); + this.Label_EXP.TabIndex = 3; + this.Label_EXP.Text = "EXP:"; + this.Label_EXP.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // FLP_EXPLevelRight + // + this.FLP_EXPLevelRight.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.FLP_EXPLevelRight.Controls.Add(this.TB_EXP); + this.FLP_EXPLevelRight.Controls.Add(this.Label_CurLevel); + this.FLP_EXPLevelRight.Controls.Add(this.TB_Level); + this.FLP_EXPLevelRight.Controls.Add(this.MT_Level); + this.FLP_EXPLevelRight.Location = new System.Drawing.Point(110, 0); + this.FLP_EXPLevelRight.Margin = new System.Windows.Forms.Padding(0); + this.FLP_EXPLevelRight.Name = "FLP_EXPLevelRight"; + this.FLP_EXPLevelRight.Size = new System.Drawing.Size(162, 21); + this.FLP_EXPLevelRight.TabIndex = 0; + // + // TB_EXP + // + this.TB_EXP.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.TB_EXP.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_EXP.Location = new System.Drawing.Point(0, 0); + this.TB_EXP.Margin = new System.Windows.Forms.Padding(0); + this.TB_EXP.Mask = "0000000"; + this.TB_EXP.Name = "TB_EXP"; + this.TB_EXP.Size = new System.Drawing.Size(46, 20); + this.TB_EXP.TabIndex = 7; + this.TB_EXP.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_EXP.TextChanged += new System.EventHandler(this.updateEXPLevel); + // + // Label_CurLevel + // + this.Label_CurLevel.Location = new System.Drawing.Point(46, 0); + this.Label_CurLevel.Margin = new System.Windows.Forms.Padding(0); + this.Label_CurLevel.Name = "Label_CurLevel"; + this.Label_CurLevel.Size = new System.Drawing.Size(58, 21); + this.Label_CurLevel.TabIndex = 7; + this.Label_CurLevel.Text = "Level:"; + this.Label_CurLevel.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // TB_Level + // + this.TB_Level.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_Level.Location = new System.Drawing.Point(104, 0); + this.TB_Level.Margin = new System.Windows.Forms.Padding(0); + this.TB_Level.Mask = "000"; + this.TB_Level.Name = "TB_Level"; + this.TB_Level.Size = new System.Drawing.Size(22, 20); + this.TB_Level.TabIndex = 8; + this.TB_Level.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_Level.TextChanged += new System.EventHandler(this.updateEXPLevel); + // + // MT_Level + // + this.MT_Level.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.MT_Level.Enabled = false; + this.MT_Level.Location = new System.Drawing.Point(126, 0); + this.MT_Level.Margin = new System.Windows.Forms.Padding(0); + this.MT_Level.Mask = "000"; + this.MT_Level.Name = "MT_Level"; + this.MT_Level.Size = new System.Drawing.Size(22, 20); + this.MT_Level.TabIndex = 17; + this.MT_Level.Visible = false; + this.MT_Level.TextChanged += new System.EventHandler(this.updateEXPLevel); + // + // FLP_Nature + // + this.FLP_Nature.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_Nature.Controls.Add(this.Label_Nature); + this.FLP_Nature.Controls.Add(this.CB_Nature); + this.FLP_Nature.Location = new System.Drawing.Point(0, 86); + this.FLP_Nature.Margin = new System.Windows.Forms.Padding(0); + this.FLP_Nature.Name = "FLP_Nature"; + this.FLP_Nature.Size = new System.Drawing.Size(272, 21); + this.FLP_Nature.TabIndex = 4; + // + // Label_Nature + // + this.Label_Nature.Location = new System.Drawing.Point(0, 0); + this.Label_Nature.Margin = new System.Windows.Forms.Padding(0); + this.Label_Nature.Name = "Label_Nature"; + this.Label_Nature.Size = new System.Drawing.Size(110, 21); + this.Label_Nature.TabIndex = 8; + this.Label_Nature.Text = "Nature:"; + this.Label_Nature.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // CB_Nature + // + this.CB_Nature.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.CB_Nature.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_Nature.FormattingEnabled = true; + this.CB_Nature.Location = new System.Drawing.Point(110, 0); + this.CB_Nature.Margin = new System.Windows.Forms.Padding(0); + this.CB_Nature.Name = "CB_Nature"; + this.CB_Nature.Size = new System.Drawing.Size(126, 21); + this.CB_Nature.TabIndex = 9; + this.CB_Nature.SelectedIndexChanged += new System.EventHandler(this.validateComboBox2); + this.CB_Nature.KeyDown += new System.Windows.Forms.KeyEventHandler(this.removedropCB); + this.CB_Nature.MouseHover += new System.EventHandler(this.updateNatureModification); + this.CB_Nature.Validating += new System.ComponentModel.CancelEventHandler(this.validateComboBox); + // + // FLP_HeldItem + // + this.FLP_HeldItem.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_HeldItem.Controls.Add(this.Label_HeldItem); + this.FLP_HeldItem.Controls.Add(this.CB_HeldItem); + this.FLP_HeldItem.Location = new System.Drawing.Point(0, 107); + this.FLP_HeldItem.Margin = new System.Windows.Forms.Padding(0); + this.FLP_HeldItem.Name = "FLP_HeldItem"; + this.FLP_HeldItem.Size = new System.Drawing.Size(272, 21); + this.FLP_HeldItem.TabIndex = 5; // // Label_HeldItem // - this.Label_HeldItem.Location = new System.Drawing.Point(25, 114); + this.Label_HeldItem.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.Label_HeldItem.Location = new System.Drawing.Point(0, 0); + this.Label_HeldItem.Margin = new System.Windows.Forms.Padding(0); this.Label_HeldItem.Name = "Label_HeldItem"; - this.Label_HeldItem.Size = new System.Drawing.Size(77, 13); + this.Label_HeldItem.Size = new System.Drawing.Size(110, 21); this.Label_HeldItem.TabIndex = 51; this.Label_HeldItem.Text = "Held Item:"; this.Label_HeldItem.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -663,18 +983,77 @@ public void InitializeComponent() this.CB_HeldItem.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.CB_HeldItem.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_HeldItem.FormattingEnabled = true; - this.CB_HeldItem.Location = new System.Drawing.Point(105, 111); + this.CB_HeldItem.Location = new System.Drawing.Point(110, 0); + this.CB_HeldItem.Margin = new System.Windows.Forms.Padding(0); this.CB_HeldItem.Name = "CB_HeldItem"; - this.CB_HeldItem.Size = new System.Drawing.Size(122, 21); + this.CB_HeldItem.Size = new System.Drawing.Size(126, 21); this.CB_HeldItem.TabIndex = 10; this.CB_HeldItem.SelectedIndexChanged += new System.EventHandler(this.validateComboBox2); this.CB_HeldItem.KeyDown += new System.Windows.Forms.KeyEventHandler(this.removedropCB); this.CB_HeldItem.Validating += new System.ComponentModel.CancelEventHandler(this.validateComboBox); // + // FLP_FriendshipForm + // + this.FLP_FriendshipForm.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_FriendshipForm.Controls.Add(this.FLP_FriendshipFormLeft); + this.FLP_FriendshipForm.Controls.Add(this.FLP_FriendshipFormRight); + this.FLP_FriendshipForm.Location = new System.Drawing.Point(0, 128); + this.FLP_FriendshipForm.Margin = new System.Windows.Forms.Padding(0); + this.FLP_FriendshipForm.Name = "FLP_FriendshipForm"; + this.FLP_FriendshipForm.Size = new System.Drawing.Size(272, 21); + this.FLP_FriendshipForm.TabIndex = 6; + // + // FLP_FriendshipFormLeft + // + this.FLP_FriendshipFormLeft.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.FLP_FriendshipFormLeft.Controls.Add(this.Label_Friendship); + this.FLP_FriendshipFormLeft.Controls.Add(this.Label_HatchCounter); + this.FLP_FriendshipFormLeft.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft; + this.FLP_FriendshipFormLeft.Location = new System.Drawing.Point(0, 0); + this.FLP_FriendshipFormLeft.Margin = new System.Windows.Forms.Padding(0); + this.FLP_FriendshipFormLeft.Name = "FLP_FriendshipFormLeft"; + this.FLP_FriendshipFormLeft.Size = new System.Drawing.Size(110, 21); + this.FLP_FriendshipFormLeft.TabIndex = 0; + // + // Label_Friendship + // + this.Label_Friendship.Location = new System.Drawing.Point(0, 0); + this.Label_Friendship.Margin = new System.Windows.Forms.Padding(0); + this.Label_Friendship.Name = "Label_Friendship"; + this.Label_Friendship.Size = new System.Drawing.Size(110, 21); + this.Label_Friendship.TabIndex = 9; + this.Label_Friendship.Text = "Friendship:"; + this.Label_Friendship.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.Label_Friendship.Click += new System.EventHandler(this.clickFriendship); + // + // Label_HatchCounter + // + this.Label_HatchCounter.Location = new System.Drawing.Point(0, 21); + this.Label_HatchCounter.Margin = new System.Windows.Forms.Padding(0); + this.Label_HatchCounter.Name = "Label_HatchCounter"; + this.Label_HatchCounter.Size = new System.Drawing.Size(110, 21); + this.Label_HatchCounter.TabIndex = 61; + this.Label_HatchCounter.Text = "Hatch Counter:"; + this.Label_HatchCounter.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // FLP_FriendshipFormRight + // + this.FLP_FriendshipFormRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_FriendshipFormRight.Controls.Add(this.TB_Friendship); + this.FLP_FriendshipFormRight.Controls.Add(this.Label_Form); + this.FLP_FriendshipFormRight.Controls.Add(this.CB_Form); + this.FLP_FriendshipFormRight.Controls.Add(this.MT_Form); + this.FLP_FriendshipFormRight.Location = new System.Drawing.Point(110, 0); + this.FLP_FriendshipFormRight.Margin = new System.Windows.Forms.Padding(0); + this.FLP_FriendshipFormRight.Name = "FLP_FriendshipFormRight"; + this.FLP_FriendshipFormRight.Size = new System.Drawing.Size(162, 21); + this.FLP_FriendshipFormRight.TabIndex = 104; + // // TB_Friendship // this.TB_Friendship.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_Friendship.Location = new System.Drawing.Point(105, 133); + this.TB_Friendship.Location = new System.Drawing.Point(0, 0); + this.TB_Friendship.Margin = new System.Windows.Forms.Padding(0); this.TB_Friendship.Mask = "000"; this.TB_Friendship.Name = "TB_Friendship"; this.TB_Friendship.Size = new System.Drawing.Size(22, 20); @@ -682,86 +1061,256 @@ public void InitializeComponent() this.TB_Friendship.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.TB_Friendship.TextChanged += new System.EventHandler(this.update255_MTB); // - // TB_Level + // Label_Form // - this.TB_Level.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_Level.Location = new System.Drawing.Point(205, 70); - this.TB_Level.Mask = "000"; - this.TB_Level.Name = "TB_Level"; - this.TB_Level.Size = new System.Drawing.Size(22, 20); - this.TB_Level.TabIndex = 8; - this.TB_Level.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_Level.TextChanged += new System.EventHandler(this.updateEXPLevel); + this.Label_Form.Location = new System.Drawing.Point(22, 0); + this.Label_Form.Margin = new System.Windows.Forms.Padding(0); + this.Label_Form.Name = "Label_Form"; + this.Label_Form.Size = new System.Drawing.Size(35, 21); + this.Label_Form.TabIndex = 11; + this.Label_Form.Text = "Form:"; + this.Label_Form.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // TB_EXP + // CB_Form // - this.TB_EXP.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_EXP.Location = new System.Drawing.Point(105, 70); - this.TB_EXP.Mask = "0000000"; - this.TB_EXP.Name = "TB_EXP"; - this.TB_EXP.Size = new System.Drawing.Size(46, 20); - this.TB_EXP.TabIndex = 7; - this.TB_EXP.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_EXP.TextChanged += new System.EventHandler(this.updateEXPLevel); + this.CB_Form.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CB_Form.DropDownWidth = 85; + this.CB_Form.Enabled = false; + this.CB_Form.FormattingEnabled = true; + this.CB_Form.Location = new System.Drawing.Point(57, 0); + this.CB_Form.Margin = new System.Windows.Forms.Padding(0); + this.CB_Form.Name = "CB_Form"; + this.CB_Form.Size = new System.Drawing.Size(69, 21); + this.CB_Form.TabIndex = 12; + this.CB_Form.SelectedIndexChanged += new System.EventHandler(this.updateForm); // - // BTN_RerollPID + // MT_Form // - this.BTN_RerollPID.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.BTN_RerollPID.Location = new System.Drawing.Point(188, 7); - this.BTN_RerollPID.Name = "BTN_RerollPID"; - this.BTN_RerollPID.Size = new System.Drawing.Size(40, 20); - this.BTN_RerollPID.TabIndex = 1; - this.BTN_RerollPID.Text = "Reroll"; - this.BTN_RerollPID.UseVisualStyleBackColor = true; - this.BTN_RerollPID.Click += new System.EventHandler(this.updateRandomPID); + this.MT_Form.Enabled = false; + this.MT_Form.Location = new System.Drawing.Point(126, 0); + this.MT_Form.Margin = new System.Windows.Forms.Padding(0); + this.MT_Form.Mask = "00"; + this.MT_Form.Name = "MT_Form"; + this.MT_Form.Size = new System.Drawing.Size(19, 20); + this.MT_Form.TabIndex = 18; + this.MT_Form.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.MT_Form.Visible = false; + this.MT_Form.TextChanged += new System.EventHandler(this.updateHaXForm); // - // CB_3DSReg + // FLP_Ability // - this.CB_3DSReg.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.CB_3DSReg.FormattingEnabled = true; - this.CB_3DSReg.Location = new System.Drawing.Point(105, 276); - this.CB_3DSReg.Name = "CB_3DSReg"; - this.CB_3DSReg.Size = new System.Drawing.Size(122, 21); - this.CB_3DSReg.TabIndex = 23; + this.FLP_Ability.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_Ability.Controls.Add(this.Label_Ability); + this.FLP_Ability.Controls.Add(this.FLP_AbilityRight); + this.FLP_Ability.Location = new System.Drawing.Point(0, 149); + this.FLP_Ability.Margin = new System.Windows.Forms.Padding(0); + this.FLP_Ability.Name = "FLP_Ability"; + this.FLP_Ability.Size = new System.Drawing.Size(272, 21); + this.FLP_Ability.TabIndex = 7; // - // CB_SubRegion + // Label_Ability // - this.CB_SubRegion.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.CB_SubRegion.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.CB_SubRegion.DropDownWidth = 180; - this.CB_SubRegion.FormattingEnabled = true; - this.CB_SubRegion.Location = new System.Drawing.Point(105, 256); - this.CB_SubRegion.Name = "CB_SubRegion"; - this.CB_SubRegion.Size = new System.Drawing.Size(122, 21); - this.CB_SubRegion.TabIndex = 22; - this.CB_SubRegion.SelectedIndexChanged += new System.EventHandler(this.validateComboBox2); - this.CB_SubRegion.KeyDown += new System.Windows.Forms.KeyEventHandler(this.removedropCB); - this.CB_SubRegion.Validating += new System.ComponentModel.CancelEventHandler(this.validateComboBox); + this.Label_Ability.Location = new System.Drawing.Point(0, 0); + this.Label_Ability.Margin = new System.Windows.Forms.Padding(0); + this.Label_Ability.Name = "Label_Ability"; + this.Label_Ability.Size = new System.Drawing.Size(110, 21); + this.Label_Ability.TabIndex = 10; + this.Label_Ability.Text = "Ability:"; + this.Label_Ability.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // CB_Country + // FLP_AbilityRight // - this.CB_Country.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.CB_Country.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.CB_Country.DropDownWidth = 180; - this.CB_Country.FormattingEnabled = true; - this.CB_Country.Location = new System.Drawing.Point(105, 236); - this.CB_Country.Name = "CB_Country"; - this.CB_Country.Size = new System.Drawing.Size(122, 21); - this.CB_Country.TabIndex = 21; - this.CB_Country.SelectedIndexChanged += new System.EventHandler(this.updateCountry); - this.CB_Country.KeyDown += new System.Windows.Forms.KeyEventHandler(this.removedropCB); - this.CB_Country.Validating += new System.ComponentModel.CancelEventHandler(this.validateComboBox); + this.FLP_AbilityRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_AbilityRight.Controls.Add(this.CB_Ability); + this.FLP_AbilityRight.Controls.Add(this.DEV_Ability); + this.FLP_AbilityRight.Controls.Add(this.TB_AbilityNumber); + this.FLP_AbilityRight.Location = new System.Drawing.Point(110, 0); + this.FLP_AbilityRight.Margin = new System.Windows.Forms.Padding(0); + this.FLP_AbilityRight.Name = "FLP_AbilityRight"; + this.FLP_AbilityRight.Size = new System.Drawing.Size(162, 21); + this.FLP_AbilityRight.TabIndex = 109; // - // CB_PKRSDays + // CB_Ability // - this.CB_PKRSDays.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.CB_PKRSDays.FormattingEnabled = true; - this.CB_PKRSDays.Location = new System.Drawing.Point(197, 213); - this.CB_PKRSDays.Name = "CB_PKRSDays"; - this.CB_PKRSDays.Size = new System.Drawing.Size(30, 21); - this.CB_PKRSDays.TabIndex = 20; - this.CB_PKRSDays.Visible = false; - this.CB_PKRSDays.SelectedIndexChanged += new System.EventHandler(this.updatePKRSdays); + this.CB_Ability.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.CB_Ability.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_Ability.FormattingEnabled = true; + this.CB_Ability.Items.AddRange(new object[] { + "Item"}); + this.CB_Ability.Location = new System.Drawing.Point(0, 0); + this.CB_Ability.Margin = new System.Windows.Forms.Padding(0); + this.CB_Ability.Name = "CB_Ability"; + this.CB_Ability.Size = new System.Drawing.Size(126, 21); + this.CB_Ability.TabIndex = 13; + this.CB_Ability.SelectedIndexChanged += new System.EventHandler(this.validateComboBox2); + this.CB_Ability.KeyDown += new System.Windows.Forms.KeyEventHandler(this.removedropCB); + this.CB_Ability.Validating += new System.ComponentModel.CancelEventHandler(this.validateComboBox); + // + // DEV_Ability + // + this.DEV_Ability.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.DEV_Ability.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.DEV_Ability.Enabled = false; + this.DEV_Ability.FormattingEnabled = true; + this.DEV_Ability.Items.AddRange(new object[] { + "Item"}); + this.DEV_Ability.Location = new System.Drawing.Point(0, 21); + this.DEV_Ability.Margin = new System.Windows.Forms.Padding(0); + this.DEV_Ability.Name = "DEV_Ability"; + this.DEV_Ability.Size = new System.Drawing.Size(122, 21); + this.DEV_Ability.TabIndex = 14; + this.DEV_Ability.Visible = false; + // + // TB_AbilityNumber + // + this.TB_AbilityNumber.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_AbilityNumber.Location = new System.Drawing.Point(122, 21); + this.TB_AbilityNumber.Margin = new System.Windows.Forms.Padding(0); + this.TB_AbilityNumber.Mask = "0"; + this.TB_AbilityNumber.Name = "TB_AbilityNumber"; + this.TB_AbilityNumber.Size = new System.Drawing.Size(19, 20); + this.TB_AbilityNumber.TabIndex = 14; + this.TB_AbilityNumber.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_AbilityNumber.Visible = false; + // + // FLP_Language + // + this.FLP_Language.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_Language.Controls.Add(this.Label_Language); + this.FLP_Language.Controls.Add(this.CB_Language); + this.FLP_Language.Location = new System.Drawing.Point(0, 170); + this.FLP_Language.Margin = new System.Windows.Forms.Padding(0); + this.FLP_Language.Name = "FLP_Language"; + this.FLP_Language.Size = new System.Drawing.Size(272, 21); + this.FLP_Language.TabIndex = 8; + // + // Label_Language + // + this.Label_Language.Location = new System.Drawing.Point(0, 0); + this.Label_Language.Margin = new System.Windows.Forms.Padding(0); + this.Label_Language.Name = "Label_Language"; + this.Label_Language.Size = new System.Drawing.Size(110, 21); + this.Label_Language.TabIndex = 12; + this.Label_Language.Text = "Language:"; + this.Label_Language.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // CB_Language + // + this.CB_Language.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.CB_Language.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CB_Language.FormattingEnabled = true; + this.CB_Language.Location = new System.Drawing.Point(110, 0); + this.CB_Language.Margin = new System.Windows.Forms.Padding(0); + this.CB_Language.Name = "CB_Language"; + this.CB_Language.Size = new System.Drawing.Size(126, 21); + this.CB_Language.TabIndex = 15; + this.CB_Language.SelectedIndexChanged += new System.EventHandler(this.updateNickname); + // + // FLP_EggPKRS + // + this.FLP_EggPKRS.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_EggPKRS.Controls.Add(this.FLP_EggPKRSLeft); + this.FLP_EggPKRS.Controls.Add(this.FLP_EggPKRSRight); + this.FLP_EggPKRS.Location = new System.Drawing.Point(0, 191); + this.FLP_EggPKRS.Margin = new System.Windows.Forms.Padding(0); + this.FLP_EggPKRS.Name = "FLP_EggPKRS"; + this.FLP_EggPKRS.Size = new System.Drawing.Size(272, 21); + this.FLP_EggPKRS.TabIndex = 9; + // + // FLP_EggPKRSLeft + // + this.FLP_EggPKRSLeft.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.FLP_EggPKRSLeft.Controls.Add(this.CHK_IsEgg); + this.FLP_EggPKRSLeft.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft; + this.FLP_EggPKRSLeft.Location = new System.Drawing.Point(0, 0); + this.FLP_EggPKRSLeft.Margin = new System.Windows.Forms.Padding(0); + this.FLP_EggPKRSLeft.Name = "FLP_EggPKRSLeft"; + this.FLP_EggPKRSLeft.Size = new System.Drawing.Size(110, 21); + this.FLP_EggPKRSLeft.TabIndex = 0; + // + // CHK_IsEgg + // + this.CHK_IsEgg.AutoSize = true; + this.CHK_IsEgg.Location = new System.Drawing.Point(54, 3); + this.CHK_IsEgg.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.CHK_IsEgg.Name = "CHK_IsEgg"; + this.CHK_IsEgg.Size = new System.Drawing.Size(56, 17); + this.CHK_IsEgg.TabIndex = 16; + this.CHK_IsEgg.Text = "Is Egg"; + this.CHK_IsEgg.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.CHK_IsEgg.UseVisualStyleBackColor = true; + this.CHK_IsEgg.CheckedChanged += new System.EventHandler(this.updateIsEgg); + // + // FLP_EggPKRSRight + // + this.FLP_EggPKRSRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_EggPKRSRight.Controls.Add(this.CHK_Infected); + this.FLP_EggPKRSRight.Controls.Add(this.CHK_Cured); + this.FLP_EggPKRSRight.Location = new System.Drawing.Point(110, 0); + this.FLP_EggPKRSRight.Margin = new System.Windows.Forms.Padding(0); + this.FLP_EggPKRSRight.Name = "FLP_EggPKRSRight"; + this.FLP_EggPKRSRight.Size = new System.Drawing.Size(162, 21); + this.FLP_EggPKRSRight.TabIndex = 104; + // + // CHK_Infected + // + this.CHK_Infected.AutoSize = true; + this.CHK_Infected.Location = new System.Drawing.Point(0, 3); + this.CHK_Infected.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.CHK_Infected.Name = "CHK_Infected"; + this.CHK_Infected.Size = new System.Drawing.Size(65, 17); + this.CHK_Infected.TabIndex = 17; + this.CHK_Infected.Text = "Infected"; + this.CHK_Infected.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.CHK_Infected.UseVisualStyleBackColor = true; + this.CHK_Infected.CheckedChanged += new System.EventHandler(this.updatePKRSInfected); + // + // CHK_Cured + // + this.CHK_Cured.AutoSize = true; + this.CHK_Cured.Location = new System.Drawing.Point(65, 3); + this.CHK_Cured.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.CHK_Cured.Name = "CHK_Cured"; + this.CHK_Cured.Size = new System.Drawing.Size(54, 17); + this.CHK_Cured.TabIndex = 18; + this.CHK_Cured.Text = "Cured"; + this.CHK_Cured.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.CHK_Cured.UseVisualStyleBackColor = true; + this.CHK_Cured.CheckedChanged += new System.EventHandler(this.updatePKRSCured); + // + // FLP_PKRS + // + this.FLP_PKRS.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_PKRS.Controls.Add(this.Label_PKRS); + this.FLP_PKRS.Controls.Add(this.FLP_PKRSRight); + this.FLP_PKRS.Location = new System.Drawing.Point(0, 212); + this.FLP_PKRS.Margin = new System.Windows.Forms.Padding(0); + this.FLP_PKRS.Name = "FLP_PKRS"; + this.FLP_PKRS.Size = new System.Drawing.Size(272, 21); + this.FLP_PKRS.TabIndex = 10; + // + // Label_PKRS + // + this.Label_PKRS.Location = new System.Drawing.Point(0, 0); + this.Label_PKRS.Margin = new System.Windows.Forms.Padding(0); + this.Label_PKRS.Name = "Label_PKRS"; + this.Label_PKRS.Size = new System.Drawing.Size(110, 21); + this.Label_PKRS.TabIndex = 14; + this.Label_PKRS.Text = "PkRs:"; + this.Label_PKRS.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.Label_PKRS.Visible = false; + // + // FLP_PKRSRight + // + this.FLP_PKRSRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_PKRSRight.Controls.Add(this.CB_PKRSStrain); + this.FLP_PKRSRight.Controls.Add(this.Label_PKRSdays); + this.FLP_PKRSRight.Controls.Add(this.CB_PKRSDays); + this.FLP_PKRSRight.Location = new System.Drawing.Point(110, 0); + this.FLP_PKRSRight.Margin = new System.Windows.Forms.Padding(0); + this.FLP_PKRSRight.Name = "FLP_PKRSRight"; + this.FLP_PKRSRight.Size = new System.Drawing.Size(162, 21); + this.FLP_PKRSRight.TabIndex = 105; // // CB_PKRSStrain // @@ -784,284 +1333,176 @@ public void InitializeComponent() "13", "14", "15"}); - this.CB_PKRSStrain.Location = new System.Drawing.Point(135, 213); + this.CB_PKRSStrain.Location = new System.Drawing.Point(0, 0); + this.CB_PKRSStrain.Margin = new System.Windows.Forms.Padding(0); this.CB_PKRSStrain.Name = "CB_PKRSStrain"; this.CB_PKRSStrain.Size = new System.Drawing.Size(43, 21); this.CB_PKRSStrain.TabIndex = 19; this.CB_PKRSStrain.Visible = false; this.CB_PKRSStrain.SelectedValueChanged += new System.EventHandler(this.updatePKRSstrain); // - // CB_Nature - // - this.CB_Nature.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.CB_Nature.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.CB_Nature.FormattingEnabled = true; - this.CB_Nature.Location = new System.Drawing.Point(105, 90); - this.CB_Nature.Name = "CB_Nature"; - this.CB_Nature.Size = new System.Drawing.Size(122, 21); - this.CB_Nature.TabIndex = 9; - this.CB_Nature.SelectedIndexChanged += new System.EventHandler(this.validateComboBox2); - this.CB_Nature.KeyDown += new System.Windows.Forms.KeyEventHandler(this.removedropCB); - this.CB_Nature.MouseHover += new System.EventHandler(this.updateNatureModification); - this.CB_Nature.Validating += new System.ComponentModel.CancelEventHandler(this.validateComboBox); - // - // Label_3DSRegion - // - this.Label_3DSRegion.Location = new System.Drawing.Point(25, 279); - this.Label_3DSRegion.Name = "Label_3DSRegion"; - this.Label_3DSRegion.Size = new System.Drawing.Size(77, 13); - this.Label_3DSRegion.TabIndex = 18; - this.Label_3DSRegion.Text = "3DS Region:"; - this.Label_3DSRegion.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // Label_SubRegion - // - this.Label_SubRegion.Location = new System.Drawing.Point(25, 259); - this.Label_SubRegion.Name = "Label_SubRegion"; - this.Label_SubRegion.Size = new System.Drawing.Size(77, 13); - this.Label_SubRegion.TabIndex = 17; - this.Label_SubRegion.Text = "Sub Region:"; - this.Label_SubRegion.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // Label_Country - // - this.Label_Country.Location = new System.Drawing.Point(25, 239); - this.Label_Country.Name = "Label_Country"; - this.Label_Country.Size = new System.Drawing.Size(77, 13); - this.Label_Country.TabIndex = 16; - this.Label_Country.Text = "Country:"; - this.Label_Country.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // // Label_PKRSdays // - this.Label_PKRSdays.Location = new System.Drawing.Point(178, 216); + this.Label_PKRSdays.Location = new System.Drawing.Point(43, 0); + this.Label_PKRSdays.Margin = new System.Windows.Forms.Padding(0); this.Label_PKRSdays.Name = "Label_PKRSdays"; - this.Label_PKRSdays.Size = new System.Drawing.Size(20, 13); + this.Label_PKRSdays.Size = new System.Drawing.Size(25, 21); this.Label_PKRSdays.TabIndex = 15; this.Label_PKRSdays.Text = "d:"; this.Label_PKRSdays.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.Label_PKRSdays.Visible = false; // - // Label_PKRS + // CB_PKRSDays // - this.Label_PKRS.Location = new System.Drawing.Point(80, 216); - this.Label_PKRS.Name = "Label_PKRS"; - this.Label_PKRS.Size = new System.Drawing.Size(56, 13); - this.Label_PKRS.TabIndex = 14; - this.Label_PKRS.Text = "PkRs:"; - this.Label_PKRS.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.Label_PKRS.Visible = false; + this.CB_PKRSDays.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CB_PKRSDays.FormattingEnabled = true; + this.CB_PKRSDays.Location = new System.Drawing.Point(68, 0); + this.CB_PKRSDays.Margin = new System.Windows.Forms.Padding(0); + this.CB_PKRSDays.Name = "CB_PKRSDays"; + this.CB_PKRSDays.Size = new System.Drawing.Size(30, 21); + this.CB_PKRSDays.TabIndex = 20; + this.CB_PKRSDays.Visible = false; + this.CB_PKRSDays.SelectedIndexChanged += new System.EventHandler(this.updatePKRSdays); // - // CHK_IsEgg + // FLP_Country // - this.CHK_IsEgg.AutoSize = true; - this.CHK_IsEgg.Location = new System.Drawing.Point(35, 196); - this.CHK_IsEgg.Name = "CHK_IsEgg"; - this.CHK_IsEgg.Size = new System.Drawing.Size(56, 17); - this.CHK_IsEgg.TabIndex = 16; - this.CHK_IsEgg.Text = "Is Egg"; - this.CHK_IsEgg.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.CHK_IsEgg.UseVisualStyleBackColor = true; - this.CHK_IsEgg.CheckedChanged += new System.EventHandler(this.updateIsEgg); + this.FLP_Country.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_Country.Controls.Add(this.Label_Country); + this.FLP_Country.Controls.Add(this.CB_Country); + this.FLP_Country.Location = new System.Drawing.Point(0, 233); + this.FLP_Country.Margin = new System.Windows.Forms.Padding(0); + this.FLP_Country.Name = "FLP_Country"; + this.FLP_Country.Size = new System.Drawing.Size(272, 21); + this.FLP_Country.TabIndex = 107; // - // Label_Language + // Label_Country // - this.Label_Language.Location = new System.Drawing.Point(25, 177); - this.Label_Language.Name = "Label_Language"; - this.Label_Language.Size = new System.Drawing.Size(77, 13); - this.Label_Language.TabIndex = 12; - this.Label_Language.Text = "Language:"; - this.Label_Language.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.Label_Country.Location = new System.Drawing.Point(0, 0); + this.Label_Country.Margin = new System.Windows.Forms.Padding(0); + this.Label_Country.Name = "Label_Country"; + this.Label_Country.Size = new System.Drawing.Size(110, 21); + this.Label_Country.TabIndex = 16; + this.Label_Country.Text = "Country:"; + this.Label_Country.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // Label_Form + // CB_Country // - this.Label_Form.AutoSize = true; - this.Label_Form.Location = new System.Drawing.Point(125, 136); - this.Label_Form.Name = "Label_Form"; - this.Label_Form.Size = new System.Drawing.Size(33, 13); - this.Label_Form.TabIndex = 11; - this.Label_Form.Text = "Form:"; + this.CB_Country.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.CB_Country.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_Country.DropDownWidth = 180; + this.CB_Country.FormattingEnabled = true; + this.CB_Country.Location = new System.Drawing.Point(110, 0); + this.CB_Country.Margin = new System.Windows.Forms.Padding(0); + this.CB_Country.Name = "CB_Country"; + this.CB_Country.Size = new System.Drawing.Size(126, 21); + this.CB_Country.TabIndex = 21; + this.CB_Country.SelectedIndexChanged += new System.EventHandler(this.updateCountry); + this.CB_Country.KeyDown += new System.Windows.Forms.KeyEventHandler(this.removedropCB); + this.CB_Country.Validating += new System.ComponentModel.CancelEventHandler(this.validateComboBox); // - // Label_Ability + // FLP_SubRegion // - this.Label_Ability.Location = new System.Drawing.Point(25, 157); - this.Label_Ability.Name = "Label_Ability"; - this.Label_Ability.Size = new System.Drawing.Size(77, 13); - this.Label_Ability.TabIndex = 10; - this.Label_Ability.Text = "Ability:"; - this.Label_Ability.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.FLP_SubRegion.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_SubRegion.Controls.Add(this.Label_SubRegion); + this.FLP_SubRegion.Controls.Add(this.CB_SubRegion); + this.FLP_SubRegion.Location = new System.Drawing.Point(0, 254); + this.FLP_SubRegion.Margin = new System.Windows.Forms.Padding(0); + this.FLP_SubRegion.Name = "FLP_SubRegion"; + this.FLP_SubRegion.Size = new System.Drawing.Size(272, 21); + this.FLP_SubRegion.TabIndex = 110; // - // Label_Friendship + // Label_SubRegion // - this.Label_Friendship.Location = new System.Drawing.Point(25, 135); - this.Label_Friendship.Name = "Label_Friendship"; - this.Label_Friendship.Size = new System.Drawing.Size(77, 13); - this.Label_Friendship.TabIndex = 9; - this.Label_Friendship.Text = "Friendship:"; - this.Label_Friendship.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.Label_Friendship.Click += new System.EventHandler(this.clickFriendship); + this.Label_SubRegion.Location = new System.Drawing.Point(0, 0); + this.Label_SubRegion.Margin = new System.Windows.Forms.Padding(0); + this.Label_SubRegion.Name = "Label_SubRegion"; + this.Label_SubRegion.Size = new System.Drawing.Size(110, 21); + this.Label_SubRegion.TabIndex = 17; + this.Label_SubRegion.Text = "Sub Region:"; + this.Label_SubRegion.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // Label_Nature + // CB_SubRegion // - this.Label_Nature.Location = new System.Drawing.Point(25, 93); - this.Label_Nature.Name = "Label_Nature"; - this.Label_Nature.Size = new System.Drawing.Size(77, 13); - this.Label_Nature.TabIndex = 8; - this.Label_Nature.Text = "Nature:"; - this.Label_Nature.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.CB_SubRegion.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.CB_SubRegion.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_SubRegion.DropDownWidth = 180; + this.CB_SubRegion.FormattingEnabled = true; + this.CB_SubRegion.Location = new System.Drawing.Point(110, 0); + this.CB_SubRegion.Margin = new System.Windows.Forms.Padding(0); + this.CB_SubRegion.Name = "CB_SubRegion"; + this.CB_SubRegion.Size = new System.Drawing.Size(126, 21); + this.CB_SubRegion.TabIndex = 22; // - // Label_CurLevel + // FLP_3DSRegion // - this.Label_CurLevel.Location = new System.Drawing.Point(153, 73); - this.Label_CurLevel.Name = "Label_CurLevel"; - this.Label_CurLevel.Size = new System.Drawing.Size(50, 13); - this.Label_CurLevel.TabIndex = 7; - this.Label_CurLevel.Text = "Level:"; - this.Label_CurLevel.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.FLP_3DSRegion.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_3DSRegion.Controls.Add(this.Label_3DSRegion); + this.FLP_3DSRegion.Controls.Add(this.CB_3DSReg); + this.FLP_3DSRegion.Location = new System.Drawing.Point(0, 275); + this.FLP_3DSRegion.Margin = new System.Windows.Forms.Padding(0); + this.FLP_3DSRegion.Name = "FLP_3DSRegion"; + this.FLP_3DSRegion.Size = new System.Drawing.Size(272, 21); + this.FLP_3DSRegion.TabIndex = 111; // - // TB_Nickname + // Label_3DSRegion // - this.TB_Nickname.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_Nickname.Location = new System.Drawing.Point(105, 49); - this.TB_Nickname.MaximumSize = new System.Drawing.Size(122, 20); - this.TB_Nickname.MaxLength = 12; - this.TB_Nickname.MinimumSize = new System.Drawing.Size(122, 20); - this.TB_Nickname.Name = "TB_Nickname"; - this.TB_Nickname.Size = new System.Drawing.Size(122, 20); - this.TB_Nickname.TabIndex = 5; - this.TB_Nickname.TextChanged += new System.EventHandler(this.updateIsNicknamed); - this.TB_Nickname.MouseDown += new System.Windows.Forms.MouseEventHandler(this.updateNicknameClick); + this.Label_3DSRegion.Location = new System.Drawing.Point(0, 0); + this.Label_3DSRegion.Margin = new System.Windows.Forms.Padding(0); + this.Label_3DSRegion.Name = "Label_3DSRegion"; + this.Label_3DSRegion.Size = new System.Drawing.Size(110, 21); + this.Label_3DSRegion.TabIndex = 18; + this.Label_3DSRegion.Text = "3DS Region:"; + this.Label_3DSRegion.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // CB_Species + // CB_3DSReg // - this.CB_Species.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.CB_Species.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.CB_Species.FormattingEnabled = true; - this.CB_Species.Location = new System.Drawing.Point(105, 27); - this.CB_Species.Name = "CB_Species"; - this.CB_Species.Size = new System.Drawing.Size(122, 21); - this.CB_Species.TabIndex = 3; - this.CB_Species.SelectedIndexChanged += new System.EventHandler(this.validateComboBox2); - this.CB_Species.SelectedValueChanged += new System.EventHandler(this.updateSpecies); - this.CB_Species.KeyDown += new System.Windows.Forms.KeyEventHandler(this.removedropCB); - this.CB_Species.Validating += new System.ComponentModel.CancelEventHandler(this.validateComboBox); + this.CB_3DSReg.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CB_3DSReg.FormattingEnabled = true; + this.CB_3DSReg.Location = new System.Drawing.Point(110, 0); + this.CB_3DSReg.Margin = new System.Windows.Forms.Padding(0); + this.CB_3DSReg.Name = "CB_3DSReg"; + this.CB_3DSReg.Size = new System.Drawing.Size(126, 21); + this.CB_3DSReg.TabIndex = 23; // - // Label_EXP + // FLP_NSparkle // - this.Label_EXP.Location = new System.Drawing.Point(25, 73); - this.Label_EXP.Name = "Label_EXP"; - this.Label_EXP.Size = new System.Drawing.Size(77, 13); - this.Label_EXP.TabIndex = 3; - this.Label_EXP.Text = "EXP:"; - this.Label_EXP.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.FLP_NSparkle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_NSparkle.Controls.Add(this.L_NSparkle); + this.FLP_NSparkle.Controls.Add(this.CHK_NSparkle); + this.FLP_NSparkle.Location = new System.Drawing.Point(0, 296); + this.FLP_NSparkle.Margin = new System.Windows.Forms.Padding(0); + this.FLP_NSparkle.Name = "FLP_NSparkle"; + this.FLP_NSparkle.Size = new System.Drawing.Size(272, 21); + this.FLP_NSparkle.TabIndex = 112; // - // Label_Species + // L_NSparkle // - this.Label_Species.Location = new System.Drawing.Point(25, 30); - this.Label_Species.Name = "Label_Species"; - this.Label_Species.Size = new System.Drawing.Size(77, 13); - this.Label_Species.TabIndex = 1; - this.Label_Species.Text = "Species:"; - this.Label_Species.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.Label_Species.Click += new System.EventHandler(this.updateNickname); + this.L_NSparkle.Location = new System.Drawing.Point(0, 0); + this.L_NSparkle.Margin = new System.Windows.Forms.Padding(0); + this.L_NSparkle.Name = "L_NSparkle"; + this.L_NSparkle.Size = new System.Drawing.Size(110, 21); + this.L_NSparkle.TabIndex = 17; + this.L_NSparkle.Text = "N\'s Sparkle:"; + this.L_NSparkle.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // Label_HatchCounter + // CHK_NSparkle // - this.Label_HatchCounter.Location = new System.Drawing.Point(20, 134); - this.Label_HatchCounter.Name = "Label_HatchCounter"; - this.Label_HatchCounter.Size = new System.Drawing.Size(82, 13); - this.Label_HatchCounter.TabIndex = 61; - this.Label_HatchCounter.Text = "Hatch Counter:"; - this.Label_HatchCounter.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // Label_IsShiny - // - this.Label_IsShiny.Image = ((System.Drawing.Image)(resources.GetObject("Label_IsShiny.Image"))); - this.Label_IsShiny.InitialImage = ((System.Drawing.Image)(resources.GetObject("Label_IsShiny.InitialImage"))); - this.Label_IsShiny.Location = new System.Drawing.Point(53, 7); - this.Label_IsShiny.Name = "Label_IsShiny"; - this.Label_IsShiny.Size = new System.Drawing.Size(20, 20); - this.Label_IsShiny.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.Label_IsShiny.TabIndex = 62; - this.Label_IsShiny.TabStop = false; - this.Label_IsShiny.Visible = false; - // - // BTN_Shinytize - // - this.BTN_Shinytize.Location = new System.Drawing.Point(50, 6); - this.BTN_Shinytize.Name = "BTN_Shinytize"; - this.BTN_Shinytize.Size = new System.Drawing.Size(26, 22); - this.BTN_Shinytize.TabIndex = 1; - this.BTN_Shinytize.Text = "☆"; - this.BTN_Shinytize.UseVisualStyleBackColor = true; - this.BTN_Shinytize.Click += new System.EventHandler(this.updateShinyPID); - // - // Label_PID - // - this.Label_PID.Location = new System.Drawing.Point(25, 11); - this.Label_PID.Name = "Label_PID"; - this.Label_PID.Size = new System.Drawing.Size(77, 13); - this.Label_PID.TabIndex = 0; - this.Label_PID.Text = "PID:"; - this.Label_PID.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // TB_AbilityNumber - // - this.TB_AbilityNumber.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_AbilityNumber.Location = new System.Drawing.Point(229, 153); - this.TB_AbilityNumber.Mask = "0"; - this.TB_AbilityNumber.Name = "TB_AbilityNumber"; - this.TB_AbilityNumber.Size = new System.Drawing.Size(19, 20); - this.TB_AbilityNumber.TabIndex = 14; - this.TB_AbilityNumber.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_AbilityNumber.Visible = false; - // - // MT_Level - // - this.MT_Level.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.MT_Level.Enabled = false; - this.MT_Level.Location = new System.Drawing.Point(205, 70); - this.MT_Level.Mask = "000"; - this.MT_Level.Name = "MT_Level"; - this.MT_Level.Size = new System.Drawing.Size(22, 20); - this.MT_Level.TabIndex = 17; - this.MT_Level.Visible = false; - this.MT_Level.TextChanged += new System.EventHandler(this.updateEXPLevel); - // - // DEV_Ability - // - this.DEV_Ability.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.DEV_Ability.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.DEV_Ability.Enabled = false; - this.DEV_Ability.FormattingEnabled = true; - this.DEV_Ability.Items.AddRange(new object[] { - "Item"}); - this.DEV_Ability.Location = new System.Drawing.Point(105, 153); - this.DEV_Ability.Name = "DEV_Ability"; - this.DEV_Ability.Size = new System.Drawing.Size(122, 21); - this.DEV_Ability.TabIndex = 14; - this.DEV_Ability.Visible = false; + this.CHK_NSparkle.AutoSize = true; + this.CHK_NSparkle.Location = new System.Drawing.Point(110, 3); + this.CHK_NSparkle.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.CHK_NSparkle.Name = "CHK_NSparkle"; + this.CHK_NSparkle.Size = new System.Drawing.Size(56, 17); + this.CHK_NSparkle.TabIndex = 18; + this.CHK_NSparkle.Text = "Active"; + this.CHK_NSparkle.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.CHK_NSparkle.UseVisualStyleBackColor = true; // // Tab_Met // this.Tab_Met.AllowDrop = true; - this.Tab_Met.Controls.Add(this.L_MetTimeOfDay); - this.Tab_Met.Controls.Add(this.CB_MetTimeOfDay); this.Tab_Met.Controls.Add(this.CHK_AsEgg); - this.Tab_Met.Controls.Add(this.CHK_Fateful); this.Tab_Met.Controls.Add(this.GB_EggConditions); - this.Tab_Met.Controls.Add(this.Label_EncounterType); - this.Tab_Met.Controls.Add(this.Label_MetDate); - this.Tab_Met.Controls.Add(this.Label_MetLevel); - this.Tab_Met.Controls.Add(this.Label_Ball); - this.Tab_Met.Controls.Add(this.Label_MetLocation); - this.Tab_Met.Controls.Add(this.Label_OriginGame); - this.Tab_Met.Controls.Add(this.CB_GameOrigin); - this.Tab_Met.Controls.Add(this.CB_MetLocation); - this.Tab_Met.Controls.Add(this.CB_Ball); - this.Tab_Met.Controls.Add(this.TB_MetLevel); - this.Tab_Met.Controls.Add(this.CAL_MetDate); - this.Tab_Met.Controls.Add(this.CB_EncounterType); + this.Tab_Met.Controls.Add(this.FLP_Met); this.Tab_Met.Location = new System.Drawing.Point(4, 22); this.Tab_Met.Name = "Tab_Met"; this.Tab_Met.Padding = new System.Windows.Forms.Padding(3); @@ -1070,37 +1511,10 @@ public void InitializeComponent() this.Tab_Met.Text = "Met"; this.Tab_Met.UseVisualStyleBackColor = true; // - // L_MetTimeOfDay - // - this.L_MetTimeOfDay.Location = new System.Drawing.Point(25, 165); - this.L_MetTimeOfDay.Name = "L_MetTimeOfDay"; - this.L_MetTimeOfDay.Size = new System.Drawing.Size(77, 13); - this.L_MetTimeOfDay.TabIndex = 10; - this.L_MetTimeOfDay.Text = "Time of Day:"; - this.L_MetTimeOfDay.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.L_MetTimeOfDay.Visible = false; - // - // CB_MetTimeOfDay - // - this.CB_MetTimeOfDay.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.CB_MetTimeOfDay.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.CB_MetTimeOfDay.DropDownWidth = 150; - this.CB_MetTimeOfDay.FormattingEnabled = true; - this.CB_MetTimeOfDay.Items.AddRange(new object[] { - "(None)", - "Morning", - "Day", - "Night"}); - this.CB_MetTimeOfDay.Location = new System.Drawing.Point(105, 162); - this.CB_MetTimeOfDay.Name = "CB_MetTimeOfDay"; - this.CB_MetTimeOfDay.Size = new System.Drawing.Size(122, 21); - this.CB_MetTimeOfDay.TabIndex = 11; - this.CB_MetTimeOfDay.Visible = false; - // // CHK_AsEgg // this.CHK_AsEgg.AutoSize = true; - this.CHK_AsEgg.Location = new System.Drawing.Point(105, 204); + this.CHK_AsEgg.Location = new System.Drawing.Point(110, 204); this.CHK_AsEgg.Name = "CHK_AsEgg"; this.CHK_AsEgg.Size = new System.Drawing.Size(60, 17); this.CHK_AsEgg.TabIndex = 8; @@ -1108,16 +1522,6 @@ public void InitializeComponent() this.CHK_AsEgg.UseVisualStyleBackColor = true; this.CHK_AsEgg.Click += new System.EventHandler(this.updateMetAsEgg); // - // CHK_Fateful - // - this.CHK_Fateful.AutoSize = true; - this.CHK_Fateful.Location = new System.Drawing.Point(105, 115); - this.CHK_Fateful.Name = "CHK_Fateful"; - this.CHK_Fateful.Size = new System.Drawing.Size(110, 17); - this.CHK_Fateful.TabIndex = 6; - this.CHK_Fateful.Text = "Fateful Encounter"; - this.CHK_Fateful.UseVisualStyleBackColor = true; - // // GB_EggConditions // this.GB_EggConditions.Controls.Add(this.CB_EggLocation); @@ -1125,7 +1529,7 @@ public void InitializeComponent() this.GB_EggConditions.Controls.Add(this.Label_EggDate); this.GB_EggConditions.Controls.Add(this.Label_EggLocation); this.GB_EggConditions.Enabled = false; - this.GB_EggConditions.Location = new System.Drawing.Point(37, 226); + this.GB_EggConditions.Location = new System.Drawing.Point(39, 226); this.GB_EggConditions.Name = "GB_EggConditions"; this.GB_EggConditions.Size = new System.Drawing.Size(200, 67); this.GB_EggConditions.TabIndex = 9; @@ -1176,56 +1580,38 @@ public void InitializeComponent() this.Label_EggLocation.Text = "Location:"; this.Label_EggLocation.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // Label_EncounterType + // FLP_Met // - this.Label_EncounterType.Location = new System.Drawing.Point(25, 138); - this.Label_EncounterType.Name = "Label_EncounterType"; - this.Label_EncounterType.Size = new System.Drawing.Size(77, 13); - this.Label_EncounterType.TabIndex = 5; - this.Label_EncounterType.Text = "Encounter:"; - this.Label_EncounterType.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.FLP_Met.Controls.Add(this.FLP_OriginGame); + this.FLP_Met.Controls.Add(this.FLP_MetLocation); + this.FLP_Met.Controls.Add(this.FLP_Ball); + this.FLP_Met.Controls.Add(this.FLP_MetLevel); + this.FLP_Met.Controls.Add(this.FLP_MetDate); + this.FLP_Met.Controls.Add(this.FLP_Fateful); + this.FLP_Met.Controls.Add(this.FLP_EncounterType); + this.FLP_Met.Controls.Add(this.FLP_TimeOfDay); + this.FLP_Met.Location = new System.Drawing.Point(0, 24); + this.FLP_Met.Name = "FLP_Met"; + this.FLP_Met.Size = new System.Drawing.Size(272, 175); + this.FLP_Met.TabIndex = 103; // - // Label_MetDate + // FLP_OriginGame // - this.Label_MetDate.Location = new System.Drawing.Point(25, 93); - this.Label_MetDate.Name = "Label_MetDate"; - this.Label_MetDate.Size = new System.Drawing.Size(77, 13); - this.Label_MetDate.TabIndex = 4; - this.Label_MetDate.Text = "Met Date:"; - this.Label_MetDate.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // Label_MetLevel - // - this.Label_MetLevel.Location = new System.Drawing.Point(25, 73); - this.Label_MetLevel.Name = "Label_MetLevel"; - this.Label_MetLevel.Size = new System.Drawing.Size(77, 13); - this.Label_MetLevel.TabIndex = 3; - this.Label_MetLevel.Text = "Met Level:"; - this.Label_MetLevel.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // Label_Ball - // - this.Label_Ball.Location = new System.Drawing.Point(25, 52); - this.Label_Ball.Name = "Label_Ball"; - this.Label_Ball.Size = new System.Drawing.Size(77, 13); - this.Label_Ball.TabIndex = 2; - this.Label_Ball.Text = "Ball:"; - this.Label_Ball.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // Label_MetLocation - // - this.Label_MetLocation.Location = new System.Drawing.Point(25, 30); - this.Label_MetLocation.Name = "Label_MetLocation"; - this.Label_MetLocation.Size = new System.Drawing.Size(77, 13); - this.Label_MetLocation.TabIndex = 1; - this.Label_MetLocation.Text = "Met Location:"; - this.Label_MetLocation.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.FLP_OriginGame.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_OriginGame.Controls.Add(this.Label_OriginGame); + this.FLP_OriginGame.Controls.Add(this.CB_GameOrigin); + this.FLP_OriginGame.Location = new System.Drawing.Point(0, 0); + this.FLP_OriginGame.Margin = new System.Windows.Forms.Padding(0); + this.FLP_OriginGame.Name = "FLP_OriginGame"; + this.FLP_OriginGame.Size = new System.Drawing.Size(272, 21); + this.FLP_OriginGame.TabIndex = 112; // // Label_OriginGame // - this.Label_OriginGame.Location = new System.Drawing.Point(25, 11); + this.Label_OriginGame.Location = new System.Drawing.Point(0, 0); + this.Label_OriginGame.Margin = new System.Windows.Forms.Padding(0); this.Label_OriginGame.Name = "Label_OriginGame"; - this.Label_OriginGame.Size = new System.Drawing.Size(77, 13); + this.Label_OriginGame.Size = new System.Drawing.Size(110, 21); this.Label_OriginGame.TabIndex = 0; this.Label_OriginGame.Text = "Origin Game:"; this.Label_OriginGame.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -1234,125 +1620,259 @@ public void InitializeComponent() // this.CB_GameOrigin.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CB_GameOrigin.FormattingEnabled = true; - this.CB_GameOrigin.Location = new System.Drawing.Point(105, 7); + this.CB_GameOrigin.Location = new System.Drawing.Point(110, 0); + this.CB_GameOrigin.Margin = new System.Windows.Forms.Padding(0); this.CB_GameOrigin.Name = "CB_GameOrigin"; - this.CB_GameOrigin.Size = new System.Drawing.Size(122, 21); + this.CB_GameOrigin.Size = new System.Drawing.Size(126, 21); this.CB_GameOrigin.TabIndex = 1; this.CB_GameOrigin.SelectedIndexChanged += new System.EventHandler(this.updateOriginGame); // + // FLP_MetLocation + // + this.FLP_MetLocation.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_MetLocation.Controls.Add(this.Label_MetLocation); + this.FLP_MetLocation.Controls.Add(this.CB_MetLocation); + this.FLP_MetLocation.Location = new System.Drawing.Point(0, 21); + this.FLP_MetLocation.Margin = new System.Windows.Forms.Padding(0); + this.FLP_MetLocation.Name = "FLP_MetLocation"; + this.FLP_MetLocation.Size = new System.Drawing.Size(272, 21); + this.FLP_MetLocation.TabIndex = 113; + // + // Label_MetLocation + // + this.Label_MetLocation.Location = new System.Drawing.Point(0, 0); + this.Label_MetLocation.Margin = new System.Windows.Forms.Padding(0); + this.Label_MetLocation.Name = "Label_MetLocation"; + this.Label_MetLocation.Size = new System.Drawing.Size(110, 21); + this.Label_MetLocation.TabIndex = 1; + this.Label_MetLocation.Text = "Met Location:"; + this.Label_MetLocation.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // // CB_MetLocation // this.CB_MetLocation.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.CB_MetLocation.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_MetLocation.DropDownWidth = 150; this.CB_MetLocation.FormattingEnabled = true; - this.CB_MetLocation.Location = new System.Drawing.Point(105, 27); + this.CB_MetLocation.Location = new System.Drawing.Point(110, 0); + this.CB_MetLocation.Margin = new System.Windows.Forms.Padding(0); this.CB_MetLocation.Name = "CB_MetLocation"; - this.CB_MetLocation.Size = new System.Drawing.Size(122, 21); + this.CB_MetLocation.Size = new System.Drawing.Size(126, 21); this.CB_MetLocation.TabIndex = 2; this.CB_MetLocation.SelectedIndexChanged += new System.EventHandler(this.validateLocation); this.CB_MetLocation.KeyDown += new System.Windows.Forms.KeyEventHandler(this.removedropCB); this.CB_MetLocation.Validating += new System.ComponentModel.CancelEventHandler(this.validateComboBox); // + // FLP_Ball + // + this.FLP_Ball.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_Ball.Controls.Add(this.Label_Ball); + this.FLP_Ball.Controls.Add(this.CB_Ball); + this.FLP_Ball.Location = new System.Drawing.Point(0, 42); + this.FLP_Ball.Margin = new System.Windows.Forms.Padding(0); + this.FLP_Ball.Name = "FLP_Ball"; + this.FLP_Ball.Size = new System.Drawing.Size(272, 21); + this.FLP_Ball.TabIndex = 114; + // + // Label_Ball + // + this.Label_Ball.Location = new System.Drawing.Point(0, 0); + this.Label_Ball.Margin = new System.Windows.Forms.Padding(0); + this.Label_Ball.Name = "Label_Ball"; + this.Label_Ball.Size = new System.Drawing.Size(110, 21); + this.Label_Ball.TabIndex = 2; + this.Label_Ball.Text = "Ball:"; + this.Label_Ball.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // // CB_Ball // this.CB_Ball.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.CB_Ball.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_Ball.FormattingEnabled = true; - this.CB_Ball.Location = new System.Drawing.Point(105, 48); + this.CB_Ball.Location = new System.Drawing.Point(110, 0); + this.CB_Ball.Margin = new System.Windows.Forms.Padding(0); this.CB_Ball.Name = "CB_Ball"; - this.CB_Ball.Size = new System.Drawing.Size(122, 21); + this.CB_Ball.Size = new System.Drawing.Size(126, 21); this.CB_Ball.TabIndex = 3; this.CB_Ball.SelectedIndexChanged += new System.EventHandler(this.validateComboBox2); this.CB_Ball.KeyDown += new System.Windows.Forms.KeyEventHandler(this.removedropCB); this.CB_Ball.Validating += new System.ComponentModel.CancelEventHandler(this.validateComboBox); // + // FLP_MetLevel + // + this.FLP_MetLevel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_MetLevel.Controls.Add(this.Label_MetLevel); + this.FLP_MetLevel.Controls.Add(this.TB_MetLevel); + this.FLP_MetLevel.Location = new System.Drawing.Point(0, 63); + this.FLP_MetLevel.Margin = new System.Windows.Forms.Padding(0); + this.FLP_MetLevel.Name = "FLP_MetLevel"; + this.FLP_MetLevel.Size = new System.Drawing.Size(272, 21); + this.FLP_MetLevel.TabIndex = 115; + // + // Label_MetLevel + // + this.Label_MetLevel.Location = new System.Drawing.Point(0, 0); + this.Label_MetLevel.Margin = new System.Windows.Forms.Padding(0); + this.Label_MetLevel.Name = "Label_MetLevel"; + this.Label_MetLevel.Size = new System.Drawing.Size(110, 21); + this.Label_MetLevel.TabIndex = 3; + this.Label_MetLevel.Text = "Met Level:"; + this.Label_MetLevel.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // // TB_MetLevel // this.TB_MetLevel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_MetLevel.Location = new System.Drawing.Point(105, 70); + this.TB_MetLevel.Location = new System.Drawing.Point(110, 0); + this.TB_MetLevel.Margin = new System.Windows.Forms.Padding(0); this.TB_MetLevel.Mask = "000"; this.TB_MetLevel.Name = "TB_MetLevel"; - this.TB_MetLevel.Size = new System.Drawing.Size(122, 20); + this.TB_MetLevel.Size = new System.Drawing.Size(126, 20); this.TB_MetLevel.TabIndex = 4; this.TB_MetLevel.TextChanged += new System.EventHandler(this.update255_MTB); // + // FLP_MetDate + // + this.FLP_MetDate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_MetDate.Controls.Add(this.Label_MetDate); + this.FLP_MetDate.Controls.Add(this.CAL_MetDate); + this.FLP_MetDate.Location = new System.Drawing.Point(0, 84); + this.FLP_MetDate.Margin = new System.Windows.Forms.Padding(0); + this.FLP_MetDate.Name = "FLP_MetDate"; + this.FLP_MetDate.Size = new System.Drawing.Size(272, 21); + this.FLP_MetDate.TabIndex = 116; + // + // Label_MetDate + // + this.Label_MetDate.Location = new System.Drawing.Point(0, 0); + this.Label_MetDate.Margin = new System.Windows.Forms.Padding(0); + this.Label_MetDate.Name = "Label_MetDate"; + this.Label_MetDate.Size = new System.Drawing.Size(110, 21); + this.Label_MetDate.TabIndex = 4; + this.Label_MetDate.Text = "Met Date:"; + this.Label_MetDate.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // // CAL_MetDate // this.CAL_MetDate.CustomFormat = "MM/dd/yyyy"; this.CAL_MetDate.Format = System.Windows.Forms.DateTimePickerFormat.Short; - this.CAL_MetDate.Location = new System.Drawing.Point(105, 90); + this.CAL_MetDate.Location = new System.Drawing.Point(110, 0); + this.CAL_MetDate.Margin = new System.Windows.Forms.Padding(0); this.CAL_MetDate.MaxDate = new System.DateTime(2099, 12, 31, 0, 0, 0, 0); this.CAL_MetDate.MinDate = new System.DateTime(2000, 1, 1, 0, 0, 0, 0); this.CAL_MetDate.Name = "CAL_MetDate"; - this.CAL_MetDate.Size = new System.Drawing.Size(122, 20); + this.CAL_MetDate.Size = new System.Drawing.Size(126, 20); this.CAL_MetDate.TabIndex = 5; this.CAL_MetDate.Value = new System.DateTime(2000, 1, 1, 0, 0, 0, 0); // + // FLP_Fateful + // + this.FLP_Fateful.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_Fateful.Controls.Add(this.PAN_Fateful); + this.FLP_Fateful.Controls.Add(this.CHK_Fateful); + this.FLP_Fateful.Location = new System.Drawing.Point(0, 105); + this.FLP_Fateful.Margin = new System.Windows.Forms.Padding(0); + this.FLP_Fateful.Name = "FLP_Fateful"; + this.FLP_Fateful.Size = new System.Drawing.Size(272, 21); + this.FLP_Fateful.TabIndex = 117; + // + // PAN_Fateful + // + this.PAN_Fateful.Location = new System.Drawing.Point(0, 0); + this.PAN_Fateful.Margin = new System.Windows.Forms.Padding(0); + this.PAN_Fateful.Name = "PAN_Fateful"; + this.PAN_Fateful.Size = new System.Drawing.Size(110, 21); + this.PAN_Fateful.TabIndex = 104; + // + // CHK_Fateful + // + this.CHK_Fateful.AutoSize = true; + this.CHK_Fateful.Location = new System.Drawing.Point(110, 3); + this.CHK_Fateful.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.CHK_Fateful.Name = "CHK_Fateful"; + this.CHK_Fateful.Size = new System.Drawing.Size(110, 17); + this.CHK_Fateful.TabIndex = 6; + this.CHK_Fateful.Text = "Fateful Encounter"; + this.CHK_Fateful.UseVisualStyleBackColor = true; + // + // FLP_EncounterType + // + this.FLP_EncounterType.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_EncounterType.Controls.Add(this.Label_EncounterType); + this.FLP_EncounterType.Controls.Add(this.CB_EncounterType); + this.FLP_EncounterType.Location = new System.Drawing.Point(0, 126); + this.FLP_EncounterType.Margin = new System.Windows.Forms.Padding(0); + this.FLP_EncounterType.Name = "FLP_EncounterType"; + this.FLP_EncounterType.Size = new System.Drawing.Size(272, 21); + this.FLP_EncounterType.TabIndex = 118; + // + // Label_EncounterType + // + this.Label_EncounterType.Location = new System.Drawing.Point(0, 0); + this.Label_EncounterType.Margin = new System.Windows.Forms.Padding(0); + this.Label_EncounterType.Name = "Label_EncounterType"; + this.Label_EncounterType.Size = new System.Drawing.Size(110, 21); + this.Label_EncounterType.TabIndex = 5; + this.Label_EncounterType.Text = "Encounter:"; + this.Label_EncounterType.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // // CB_EncounterType // this.CB_EncounterType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CB_EncounterType.DropDownWidth = 160; this.CB_EncounterType.FormattingEnabled = true; - this.CB_EncounterType.Location = new System.Drawing.Point(105, 135); + this.CB_EncounterType.Location = new System.Drawing.Point(110, 0); + this.CB_EncounterType.Margin = new System.Windows.Forms.Padding(0); this.CB_EncounterType.Name = "CB_EncounterType"; - this.CB_EncounterType.Size = new System.Drawing.Size(122, 21); + this.CB_EncounterType.Size = new System.Drawing.Size(126, 21); this.CB_EncounterType.TabIndex = 7; // + // FLP_TimeOfDay + // + this.FLP_TimeOfDay.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_TimeOfDay.Controls.Add(this.L_MetTimeOfDay); + this.FLP_TimeOfDay.Controls.Add(this.CB_MetTimeOfDay); + this.FLP_TimeOfDay.Location = new System.Drawing.Point(0, 147); + this.FLP_TimeOfDay.Margin = new System.Windows.Forms.Padding(0); + this.FLP_TimeOfDay.Name = "FLP_TimeOfDay"; + this.FLP_TimeOfDay.Size = new System.Drawing.Size(272, 21); + this.FLP_TimeOfDay.TabIndex = 119; + // + // L_MetTimeOfDay + // + this.L_MetTimeOfDay.Location = new System.Drawing.Point(0, 0); + this.L_MetTimeOfDay.Margin = new System.Windows.Forms.Padding(0); + this.L_MetTimeOfDay.Name = "L_MetTimeOfDay"; + this.L_MetTimeOfDay.Size = new System.Drawing.Size(110, 21); + this.L_MetTimeOfDay.TabIndex = 10; + this.L_MetTimeOfDay.Text = "Time of Day:"; + this.L_MetTimeOfDay.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.L_MetTimeOfDay.Visible = false; + // + // CB_MetTimeOfDay + // + this.CB_MetTimeOfDay.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.CB_MetTimeOfDay.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_MetTimeOfDay.DropDownWidth = 150; + this.CB_MetTimeOfDay.FormattingEnabled = true; + this.CB_MetTimeOfDay.Items.AddRange(new object[] { + "(None)", + "Morning", + "Day", + "Night"}); + this.CB_MetTimeOfDay.Location = new System.Drawing.Point(110, 0); + this.CB_MetTimeOfDay.Margin = new System.Windows.Forms.Padding(0); + this.CB_MetTimeOfDay.Name = "CB_MetTimeOfDay"; + this.CB_MetTimeOfDay.Size = new System.Drawing.Size(126, 21); + this.CB_MetTimeOfDay.TabIndex = 11; + this.CB_MetTimeOfDay.Visible = false; + // // Tab_Stats // this.Tab_Stats.AllowDrop = true; - this.Tab_Stats.Controls.Add(this.Stat_SPE); - this.Tab_Stats.Controls.Add(this.Stat_SPD); - this.Tab_Stats.Controls.Add(this.Stat_SPA); - this.Tab_Stats.Controls.Add(this.Stat_DEF); - this.Tab_Stats.Controls.Add(this.Stat_ATK); - this.Tab_Stats.Controls.Add(this.Stat_HP); - this.Tab_Stats.Controls.Add(this.CB_HPType); - this.Tab_Stats.Controls.Add(this.CHK_HackedStats); - this.Tab_Stats.Controls.Add(this.Label_CharacteristicPrefix); - this.Tab_Stats.Controls.Add(this.L_Potential); - this.Tab_Stats.Controls.Add(this.TB_IVTotal); - this.Tab_Stats.Controls.Add(this.L_Characteristic); - this.Tab_Stats.Controls.Add(this.TB_Sheen); - this.Tab_Stats.Controls.Add(this.TB_Tough); - this.Tab_Stats.Controls.Add(this.TB_Smart); - this.Tab_Stats.Controls.Add(this.TB_Cute); - this.Tab_Stats.Controls.Add(this.TB_Beauty); - this.Tab_Stats.Controls.Add(this.TB_Cool); - this.Tab_Stats.Controls.Add(this.TB_SPEIV); - this.Tab_Stats.Controls.Add(this.TB_SPDIV); - this.Tab_Stats.Controls.Add(this.TB_SPAIV); - this.Tab_Stats.Controls.Add(this.TB_DEFIV); - this.Tab_Stats.Controls.Add(this.TB_ATKIV); - this.Tab_Stats.Controls.Add(this.TB_HPIV); - this.Tab_Stats.Controls.Add(this.TB_ATKEV); - this.Tab_Stats.Controls.Add(this.TB_DEFEV); - this.Tab_Stats.Controls.Add(this.TB_SPEEV); - this.Tab_Stats.Controls.Add(this.TB_SPDEV); - this.Tab_Stats.Controls.Add(this.TB_SPAEV); - this.Tab_Stats.Controls.Add(this.TB_HPEV); - this.Tab_Stats.Controls.Add(this.Label_Sheen); - this.Tab_Stats.Controls.Add(this.Label_Tough); - this.Tab_Stats.Controls.Add(this.Label_Smart); - this.Tab_Stats.Controls.Add(this.Label_Cute); - this.Tab_Stats.Controls.Add(this.Label_Beauty); - this.Tab_Stats.Controls.Add(this.Label_Cool); - this.Tab_Stats.Controls.Add(this.Label_ContestStats); + this.Tab_Stats.Controls.Add(this.PAN_Contest); + this.Tab_Stats.Controls.Add(this.FLP_Stats); this.Tab_Stats.Controls.Add(this.BTN_RandomEVs); this.Tab_Stats.Controls.Add(this.BTN_RandomIVs); - this.Tab_Stats.Controls.Add(this.Label_HiddenPowerPrefix); - this.Tab_Stats.Controls.Add(this.Label_Stats); - this.Tab_Stats.Controls.Add(this.Label_EVs); - this.Tab_Stats.Controls.Add(this.Label_IVs); - this.Tab_Stats.Controls.Add(this.Label_Total); - this.Tab_Stats.Controls.Add(this.Label_SPE); - this.Tab_Stats.Controls.Add(this.Label_SPD); - this.Tab_Stats.Controls.Add(this.Label_SPA); - this.Tab_Stats.Controls.Add(this.Label_DEF); - this.Tab_Stats.Controls.Add(this.Label_ATK); - this.Tab_Stats.Controls.Add(this.Label_HP); - this.Tab_Stats.Controls.Add(this.TB_EVTotal); this.Tab_Stats.Location = new System.Drawing.Point(4, 22); this.Tab_Stats.Name = "Tab_Stats"; this.Tab_Stats.Padding = new System.Windows.Forms.Padding(3); @@ -1361,96 +1881,193 @@ public void InitializeComponent() this.Tab_Stats.Text = "Stats"; this.Tab_Stats.UseVisualStyleBackColor = true; // - // Stat_SPE + // PAN_Contest // - this.Stat_SPE.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.Stat_SPE.Enabled = false; - this.Stat_SPE.Location = new System.Drawing.Point(167, 129); - this.Stat_SPE.Mask = "00000"; - this.Stat_SPE.Name = "Stat_SPE"; - this.Stat_SPE.PromptChar = ' '; - this.Stat_SPE.Size = new System.Drawing.Size(31, 20); - this.Stat_SPE.TabIndex = 50; - this.Stat_SPE.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.PAN_Contest.Controls.Add(this.TB_Sheen); + this.PAN_Contest.Controls.Add(this.TB_Tough); + this.PAN_Contest.Controls.Add(this.TB_Smart); + this.PAN_Contest.Controls.Add(this.TB_Cute); + this.PAN_Contest.Controls.Add(this.TB_Beauty); + this.PAN_Contest.Controls.Add(this.TB_Cool); + this.PAN_Contest.Controls.Add(this.Label_Sheen); + this.PAN_Contest.Controls.Add(this.Label_Tough); + this.PAN_Contest.Controls.Add(this.Label_Smart); + this.PAN_Contest.Controls.Add(this.Label_Cute); + this.PAN_Contest.Controls.Add(this.Label_Beauty); + this.PAN_Contest.Controls.Add(this.Label_Cool); + this.PAN_Contest.Controls.Add(this.Label_ContestStats); + this.PAN_Contest.Location = new System.Drawing.Point(21, 247); + this.PAN_Contest.Name = "PAN_Contest"; + this.PAN_Contest.Size = new System.Drawing.Size(230, 50); + this.PAN_Contest.TabIndex = 104; // - // Stat_SPD + // TB_Sheen // - this.Stat_SPD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.Stat_SPD.Enabled = false; - this.Stat_SPD.Location = new System.Drawing.Point(167, 107); - this.Stat_SPD.Mask = "00000"; - this.Stat_SPD.Name = "Stat_SPD"; - this.Stat_SPD.PromptChar = ' '; - this.Stat_SPD.Size = new System.Drawing.Size(31, 20); - this.Stat_SPD.TabIndex = 49; - this.Stat_SPD.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_Sheen.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_Sheen.Location = new System.Drawing.Point(192, 30); + this.TB_Sheen.Mask = "000"; + this.TB_Sheen.Name = "TB_Sheen"; + this.TB_Sheen.Size = new System.Drawing.Size(31, 20); + this.TB_Sheen.TabIndex = 45; + this.TB_Sheen.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // - // Stat_SPA + // TB_Tough // - this.Stat_SPA.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.Stat_SPA.Enabled = false; - this.Stat_SPA.Location = new System.Drawing.Point(167, 85); - this.Stat_SPA.Mask = "00000"; - this.Stat_SPA.Name = "Stat_SPA"; - this.Stat_SPA.PromptChar = ' '; - this.Stat_SPA.Size = new System.Drawing.Size(31, 20); - this.Stat_SPA.TabIndex = 48; - this.Stat_SPA.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_Tough.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_Tough.Location = new System.Drawing.Point(155, 30); + this.TB_Tough.Mask = "000"; + this.TB_Tough.Name = "TB_Tough"; + this.TB_Tough.Size = new System.Drawing.Size(31, 20); + this.TB_Tough.TabIndex = 44; + this.TB_Tough.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // - // Stat_DEF + // TB_Smart // - this.Stat_DEF.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.Stat_DEF.Enabled = false; - this.Stat_DEF.Location = new System.Drawing.Point(167, 63); - this.Stat_DEF.Mask = "00000"; - this.Stat_DEF.Name = "Stat_DEF"; - this.Stat_DEF.PromptChar = ' '; - this.Stat_DEF.Size = new System.Drawing.Size(31, 20); - this.Stat_DEF.TabIndex = 47; - this.Stat_DEF.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_Smart.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_Smart.Location = new System.Drawing.Point(118, 30); + this.TB_Smart.Mask = "000"; + this.TB_Smart.Name = "TB_Smart"; + this.TB_Smart.Size = new System.Drawing.Size(31, 20); + this.TB_Smart.TabIndex = 43; + this.TB_Smart.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // - // Stat_ATK + // TB_Cute // - this.Stat_ATK.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.Stat_ATK.Enabled = false; - this.Stat_ATK.Location = new System.Drawing.Point(167, 41); - this.Stat_ATK.Mask = "00000"; - this.Stat_ATK.Name = "Stat_ATK"; - this.Stat_ATK.PromptChar = ' '; - this.Stat_ATK.Size = new System.Drawing.Size(31, 20); - this.Stat_ATK.TabIndex = 46; - this.Stat_ATK.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_Cute.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_Cute.Location = new System.Drawing.Point(81, 30); + this.TB_Cute.Mask = "000"; + this.TB_Cute.Name = "TB_Cute"; + this.TB_Cute.Size = new System.Drawing.Size(31, 20); + this.TB_Cute.TabIndex = 42; + this.TB_Cute.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // - // Stat_HP + // TB_Beauty // - this.Stat_HP.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.Stat_HP.Enabled = false; - this.Stat_HP.Location = new System.Drawing.Point(167, 19); - this.Stat_HP.Mask = "00000"; - this.Stat_HP.Name = "Stat_HP"; - this.Stat_HP.PromptChar = ' '; - this.Stat_HP.Size = new System.Drawing.Size(31, 20); - this.Stat_HP.TabIndex = 45; - this.Stat_HP.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.Stat_HP.TextChanged += new System.EventHandler(this.updateHackedStatText); + this.TB_Beauty.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_Beauty.Location = new System.Drawing.Point(44, 30); + this.TB_Beauty.Mask = "000"; + this.TB_Beauty.Name = "TB_Beauty"; + this.TB_Beauty.Size = new System.Drawing.Size(31, 20); + this.TB_Beauty.TabIndex = 41; + this.TB_Beauty.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // - // CB_HPType + // TB_Cool // - this.CB_HPType.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.CB_HPType.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.CB_HPType.DropDownWidth = 80; - this.CB_HPType.FormattingEnabled = true; - this.CB_HPType.Location = new System.Drawing.Point(162, 176); - this.CB_HPType.Name = "CB_HPType"; - this.CB_HPType.Size = new System.Drawing.Size(70, 21); - this.CB_HPType.TabIndex = 44; - this.CB_HPType.SelectedIndexChanged += new System.EventHandler(this.updateHPType); + this.TB_Cool.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_Cool.Location = new System.Drawing.Point(7, 30); + this.TB_Cool.Mask = "000"; + this.TB_Cool.Name = "TB_Cool"; + this.TB_Cool.Size = new System.Drawing.Size(31, 20); + this.TB_Cool.TabIndex = 40; + this.TB_Cool.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // Label_Sheen + // + this.Label_Sheen.Location = new System.Drawing.Point(186, 17); + this.Label_Sheen.Name = "Label_Sheen"; + this.Label_Sheen.Size = new System.Drawing.Size(43, 13); + this.Label_Sheen.TabIndex = 52; + this.Label_Sheen.Text = "Sheen"; + this.Label_Sheen.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // Label_Tough + // + this.Label_Tough.Location = new System.Drawing.Point(149, 17); + this.Label_Tough.Name = "Label_Tough"; + this.Label_Tough.Size = new System.Drawing.Size(43, 13); + this.Label_Tough.TabIndex = 51; + this.Label_Tough.Text = "Tough"; + this.Label_Tough.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // Label_Smart + // + this.Label_Smart.Location = new System.Drawing.Point(112, 17); + this.Label_Smart.Name = "Label_Smart"; + this.Label_Smart.Size = new System.Drawing.Size(43, 13); + this.Label_Smart.TabIndex = 50; + this.Label_Smart.Text = "Clever"; + this.Label_Smart.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // Label_Cute + // + this.Label_Cute.Location = new System.Drawing.Point(75, 17); + this.Label_Cute.Name = "Label_Cute"; + this.Label_Cute.Size = new System.Drawing.Size(43, 13); + this.Label_Cute.TabIndex = 49; + this.Label_Cute.Text = "Cute"; + this.Label_Cute.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // Label_Beauty + // + this.Label_Beauty.Location = new System.Drawing.Point(38, 17); + this.Label_Beauty.Name = "Label_Beauty"; + this.Label_Beauty.Size = new System.Drawing.Size(43, 13); + this.Label_Beauty.TabIndex = 48; + this.Label_Beauty.Text = "Beauty"; + this.Label_Beauty.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // Label_Cool + // + this.Label_Cool.Location = new System.Drawing.Point(1, 17); + this.Label_Cool.Name = "Label_Cool"; + this.Label_Cool.Size = new System.Drawing.Size(43, 13); + this.Label_Cool.TabIndex = 47; + this.Label_Cool.Text = "Cool"; + this.Label_Cool.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // Label_ContestStats + // + this.Label_ContestStats.Location = new System.Drawing.Point(46, 1); + this.Label_ContestStats.Name = "Label_ContestStats"; + this.Label_ContestStats.Size = new System.Drawing.Size(140, 13); + this.Label_ContestStats.TabIndex = 46; + this.Label_ContestStats.Text = "Contest Stats"; + this.Label_ContestStats.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // FLP_Stats + // + this.FLP_Stats.Controls.Add(this.FLP_StatHeader); + this.FLP_Stats.Controls.Add(this.FLP_HP); + this.FLP_Stats.Controls.Add(this.FLP_Atk); + this.FLP_Stats.Controls.Add(this.FLP_Def); + this.FLP_Stats.Controls.Add(this.FLP_SpA); + this.FLP_Stats.Controls.Add(this.FLP_SpD); + this.FLP_Stats.Controls.Add(this.FLP_Spe); + this.FLP_Stats.Controls.Add(this.FLP_StatsTotal); + this.FLP_Stats.Controls.Add(this.FLP_HPType); + this.FLP_Stats.Controls.Add(this.FLP_Characteristic); + this.FLP_Stats.Location = new System.Drawing.Point(0, 2); + this.FLP_Stats.Name = "FLP_Stats"; + this.FLP_Stats.Size = new System.Drawing.Size(272, 206); + this.FLP_Stats.TabIndex = 103; + // + // FLP_StatHeader + // + this.FLP_StatHeader.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_StatHeader.Controls.Add(this.FLP_HackedStats); + this.FLP_StatHeader.Controls.Add(this.FLP_StatsHeaderRight); + this.FLP_StatHeader.Location = new System.Drawing.Point(0, 0); + this.FLP_StatHeader.Margin = new System.Windows.Forms.Padding(0); + this.FLP_StatHeader.Name = "FLP_StatHeader"; + this.FLP_StatHeader.Size = new System.Drawing.Size(272, 22); + this.FLP_StatHeader.TabIndex = 122; + // + // FLP_HackedStats + // + this.FLP_HackedStats.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_HackedStats.Controls.Add(this.CHK_HackedStats); + this.FLP_HackedStats.Location = new System.Drawing.Point(0, 0); + this.FLP_HackedStats.Margin = new System.Windows.Forms.Padding(0); + this.FLP_HackedStats.Name = "FLP_HackedStats"; + this.FLP_HackedStats.Size = new System.Drawing.Size(107, 21); + this.FLP_HackedStats.TabIndex = 122; // // CHK_HackedStats // this.CHK_HackedStats.AutoSize = true; this.CHK_HackedStats.Enabled = false; - this.CHK_HackedStats.Location = new System.Drawing.Point(3, 3); + this.CHK_HackedStats.Location = new System.Drawing.Point(0, 3); + this.CHK_HackedStats.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); this.CHK_HackedStats.Name = "CHK_HackedStats"; this.CHK_HackedStats.Size = new System.Drawing.Size(91, 17); this.CHK_HackedStats.TabIndex = 18; @@ -1459,175 +2076,87 @@ public void InitializeComponent() this.CHK_HackedStats.Visible = false; this.CHK_HackedStats.Click += new System.EventHandler(this.updateHackedStats); // - // Label_CharacteristicPrefix + // FLP_StatsHeaderRight // - this.Label_CharacteristicPrefix.Location = new System.Drawing.Point(29, 198); - this.Label_CharacteristicPrefix.Name = "Label_CharacteristicPrefix"; - this.Label_CharacteristicPrefix.Size = new System.Drawing.Size(103, 13); - this.Label_CharacteristicPrefix.TabIndex = 43; - this.Label_CharacteristicPrefix.Text = "Characteristic:"; - this.Label_CharacteristicPrefix.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.FLP_StatsHeaderRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_StatsHeaderRight.Controls.Add(this.Label_IVs); + this.FLP_StatsHeaderRight.Controls.Add(this.Label_EVs); + this.FLP_StatsHeaderRight.Controls.Add(this.Label_Stats); + this.FLP_StatsHeaderRight.Location = new System.Drawing.Point(107, 0); + this.FLP_StatsHeaderRight.Margin = new System.Windows.Forms.Padding(0); + this.FLP_StatsHeaderRight.Name = "FLP_StatsHeaderRight"; + this.FLP_StatsHeaderRight.Size = new System.Drawing.Size(162, 21); + this.FLP_StatsHeaderRight.TabIndex = 123; // - // L_Potential + // Label_IVs // - this.L_Potential.AutoSize = true; - this.L_Potential.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.L_Potential.Location = new System.Drawing.Point(165, 153); - this.L_Potential.Name = "L_Potential"; - this.L_Potential.Size = new System.Drawing.Size(67, 16); - this.L_Potential.TabIndex = 42; - this.L_Potential.Text = "(potential)"; + this.Label_IVs.Location = new System.Drawing.Point(0, 0); + this.Label_IVs.Margin = new System.Windows.Forms.Padding(0); + this.Label_IVs.Name = "Label_IVs"; + this.Label_IVs.Size = new System.Drawing.Size(30, 21); + this.Label_IVs.TabIndex = 26; + this.Label_IVs.Text = "IVs"; + this.Label_IVs.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // - // TB_IVTotal + // Label_EVs // - this.TB_IVTotal.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_IVTotal.Enabled = false; - this.TB_IVTotal.Location = new System.Drawing.Point(102, 151); - this.TB_IVTotal.MaxLength = 3; - this.TB_IVTotal.Name = "TB_IVTotal"; - this.TB_IVTotal.Size = new System.Drawing.Size(22, 20); - this.TB_IVTotal.TabIndex = 41; - this.TB_IVTotal.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.Label_EVs.Location = new System.Drawing.Point(30, 0); + this.Label_EVs.Margin = new System.Windows.Forms.Padding(0); + this.Label_EVs.Name = "Label_EVs"; + this.Label_EVs.Size = new System.Drawing.Size(35, 21); + this.Label_EVs.TabIndex = 27; + this.Label_EVs.Text = "EVs"; + this.Label_EVs.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // - // L_Characteristic + // Label_Stats // - this.L_Characteristic.AutoSize = true; - this.L_Characteristic.Location = new System.Drawing.Point(131, 198); - this.L_Characteristic.Name = "L_Characteristic"; - this.L_Characteristic.Size = new System.Drawing.Size(34, 13); - this.L_Characteristic.TabIndex = 40; - this.L_Characteristic.Text = "(char)"; + this.Label_Stats.Location = new System.Drawing.Point(65, 0); + this.Label_Stats.Margin = new System.Windows.Forms.Padding(0); + this.Label_Stats.Name = "Label_Stats"; + this.Label_Stats.Size = new System.Drawing.Size(35, 21); + this.Label_Stats.TabIndex = 28; + this.Label_Stats.Text = "Stats"; + this.Label_Stats.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // - // TB_Sheen + // FLP_HP // - this.TB_Sheen.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_Sheen.Location = new System.Drawing.Point(213, 279); - this.TB_Sheen.Mask = "000"; - this.TB_Sheen.Name = "TB_Sheen"; - this.TB_Sheen.Size = new System.Drawing.Size(31, 20); - this.TB_Sheen.TabIndex = 20; - this.TB_Sheen.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_Sheen.TextChanged += new System.EventHandler(this.update255_MTB); + this.FLP_HP.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_HP.Controls.Add(this.Label_HP); + this.FLP_HP.Controls.Add(this.FLP_HPRight); + this.FLP_HP.Location = new System.Drawing.Point(0, 22); + this.FLP_HP.Margin = new System.Windows.Forms.Padding(0); + this.FLP_HP.Name = "FLP_HP"; + this.FLP_HP.Size = new System.Drawing.Size(272, 21); + this.FLP_HP.TabIndex = 123; // - // TB_Tough + // Label_HP // - this.TB_Tough.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_Tough.Location = new System.Drawing.Point(176, 279); - this.TB_Tough.Mask = "000"; - this.TB_Tough.Name = "TB_Tough"; - this.TB_Tough.Size = new System.Drawing.Size(31, 20); - this.TB_Tough.TabIndex = 19; - this.TB_Tough.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_Tough.TextChanged += new System.EventHandler(this.update255_MTB); + this.Label_HP.Location = new System.Drawing.Point(0, 0); + this.Label_HP.Margin = new System.Windows.Forms.Padding(0); + this.Label_HP.Name = "Label_HP"; + this.Label_HP.Size = new System.Drawing.Size(110, 21); + this.Label_HP.TabIndex = 19; + this.Label_HP.Text = "HP:"; + this.Label_HP.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.Label_HP.MouseDown += new System.Windows.Forms.MouseEventHandler(this.clickStatLabel); // - // TB_Smart + // FLP_HPRight // - this.TB_Smart.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_Smart.Location = new System.Drawing.Point(139, 279); - this.TB_Smart.Mask = "000"; - this.TB_Smart.Name = "TB_Smart"; - this.TB_Smart.Size = new System.Drawing.Size(31, 20); - this.TB_Smart.TabIndex = 18; - this.TB_Smart.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_Smart.TextChanged += new System.EventHandler(this.update255_MTB); - // - // TB_Cute - // - this.TB_Cute.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_Cute.Location = new System.Drawing.Point(102, 279); - this.TB_Cute.Mask = "000"; - this.TB_Cute.Name = "TB_Cute"; - this.TB_Cute.Size = new System.Drawing.Size(31, 20); - this.TB_Cute.TabIndex = 17; - this.TB_Cute.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_Cute.TextChanged += new System.EventHandler(this.update255_MTB); - // - // TB_Beauty - // - this.TB_Beauty.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_Beauty.Location = new System.Drawing.Point(65, 279); - this.TB_Beauty.Mask = "000"; - this.TB_Beauty.Name = "TB_Beauty"; - this.TB_Beauty.Size = new System.Drawing.Size(31, 20); - this.TB_Beauty.TabIndex = 16; - this.TB_Beauty.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_Beauty.TextChanged += new System.EventHandler(this.update255_MTB); - // - // TB_Cool - // - this.TB_Cool.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_Cool.Location = new System.Drawing.Point(28, 279); - this.TB_Cool.Mask = "000"; - this.TB_Cool.Name = "TB_Cool"; - this.TB_Cool.Size = new System.Drawing.Size(31, 20); - this.TB_Cool.TabIndex = 15; - this.TB_Cool.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_Cool.TextChanged += new System.EventHandler(this.update255_MTB); - // - // TB_SPEIV - // - this.TB_SPEIV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_SPEIV.Location = new System.Drawing.Point(102, 129); - this.TB_SPEIV.Mask = "00"; - this.TB_SPEIV.Name = "TB_SPEIV"; - this.TB_SPEIV.Size = new System.Drawing.Size(22, 20); - this.TB_SPEIV.TabIndex = 6; - this.TB_SPEIV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_SPEIV.Click += new System.EventHandler(this.clickIV); - this.TB_SPEIV.TextChanged += new System.EventHandler(this.updateIVs); - // - // TB_SPDIV - // - this.TB_SPDIV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_SPDIV.Location = new System.Drawing.Point(102, 107); - this.TB_SPDIV.Mask = "00"; - this.TB_SPDIV.Name = "TB_SPDIV"; - this.TB_SPDIV.Size = new System.Drawing.Size(22, 20); - this.TB_SPDIV.TabIndex = 5; - this.TB_SPDIV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_SPDIV.Click += new System.EventHandler(this.clickIV); - this.TB_SPDIV.TextChanged += new System.EventHandler(this.updateIVs); - // - // TB_SPAIV - // - this.TB_SPAIV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_SPAIV.Location = new System.Drawing.Point(102, 85); - this.TB_SPAIV.Mask = "00"; - this.TB_SPAIV.Name = "TB_SPAIV"; - this.TB_SPAIV.Size = new System.Drawing.Size(22, 20); - this.TB_SPAIV.TabIndex = 4; - this.TB_SPAIV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_SPAIV.Click += new System.EventHandler(this.clickIV); - this.TB_SPAIV.TextChanged += new System.EventHandler(this.updateIVs); - // - // TB_DEFIV - // - this.TB_DEFIV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_DEFIV.Location = new System.Drawing.Point(102, 63); - this.TB_DEFIV.Mask = "00"; - this.TB_DEFIV.Name = "TB_DEFIV"; - this.TB_DEFIV.Size = new System.Drawing.Size(22, 20); - this.TB_DEFIV.TabIndex = 3; - this.TB_DEFIV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_DEFIV.Click += new System.EventHandler(this.clickIV); - this.TB_DEFIV.TextChanged += new System.EventHandler(this.updateIVs); - // - // TB_ATKIV - // - this.TB_ATKIV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_ATKIV.Location = new System.Drawing.Point(102, 41); - this.TB_ATKIV.Mask = "00"; - this.TB_ATKIV.Name = "TB_ATKIV"; - this.TB_ATKIV.Size = new System.Drawing.Size(22, 20); - this.TB_ATKIV.TabIndex = 2; - this.TB_ATKIV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_ATKIV.Click += new System.EventHandler(this.clickIV); - this.TB_ATKIV.TextChanged += new System.EventHandler(this.updateIVs); + this.FLP_HPRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_HPRight.Controls.Add(this.TB_HPIV); + this.FLP_HPRight.Controls.Add(this.TB_HPEV); + this.FLP_HPRight.Controls.Add(this.Stat_HP); + this.FLP_HPRight.Location = new System.Drawing.Point(110, 0); + this.FLP_HPRight.Margin = new System.Windows.Forms.Padding(0); + this.FLP_HPRight.Name = "FLP_HPRight"; + this.FLP_HPRight.Size = new System.Drawing.Size(162, 21); + this.FLP_HPRight.TabIndex = 121; // // TB_HPIV // this.TB_HPIV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_HPIV.Location = new System.Drawing.Point(102, 19); + this.TB_HPIV.Location = new System.Drawing.Point(0, 0); + this.TB_HPIV.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); this.TB_HPIV.Mask = "00"; this.TB_HPIV.Name = "TB_HPIV"; this.TB_HPIV.Size = new System.Drawing.Size(22, 20); @@ -1636,140 +2165,552 @@ public void InitializeComponent() this.TB_HPIV.Click += new System.EventHandler(this.clickIV); this.TB_HPIV.TextChanged += new System.EventHandler(this.updateIVs); // - // TB_ATKEV - // - this.TB_ATKEV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_ATKEV.Location = new System.Drawing.Point(130, 41); - this.TB_ATKEV.Mask = "000"; - this.TB_ATKEV.Name = "TB_ATKEV"; - this.TB_ATKEV.Size = new System.Drawing.Size(31, 20); - this.TB_ATKEV.TabIndex = 8; - this.TB_ATKEV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_ATKEV.Click += new System.EventHandler(this.clickEV); - this.TB_ATKEV.TextChanged += new System.EventHandler(this.updateEVs); - // - // TB_DEFEV - // - this.TB_DEFEV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_DEFEV.Location = new System.Drawing.Point(130, 63); - this.TB_DEFEV.Mask = "000"; - this.TB_DEFEV.Name = "TB_DEFEV"; - this.TB_DEFEV.Size = new System.Drawing.Size(31, 20); - this.TB_DEFEV.TabIndex = 9; - this.TB_DEFEV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_DEFEV.Click += new System.EventHandler(this.clickEV); - this.TB_DEFEV.TextChanged += new System.EventHandler(this.updateEVs); - // - // TB_SPEEV - // - this.TB_SPEEV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_SPEEV.Location = new System.Drawing.Point(130, 129); - this.TB_SPEEV.Mask = "000"; - this.TB_SPEEV.Name = "TB_SPEEV"; - this.TB_SPEEV.Size = new System.Drawing.Size(31, 20); - this.TB_SPEEV.TabIndex = 12; - this.TB_SPEEV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_SPEEV.Click += new System.EventHandler(this.clickEV); - this.TB_SPEEV.TextChanged += new System.EventHandler(this.updateEVs); - // - // TB_SPDEV - // - this.TB_SPDEV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_SPDEV.Location = new System.Drawing.Point(130, 107); - this.TB_SPDEV.Mask = "000"; - this.TB_SPDEV.Name = "TB_SPDEV"; - this.TB_SPDEV.Size = new System.Drawing.Size(31, 20); - this.TB_SPDEV.TabIndex = 11; - this.TB_SPDEV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_SPDEV.Click += new System.EventHandler(this.clickEV); - this.TB_SPDEV.TextChanged += new System.EventHandler(this.updateEVs); - // - // TB_SPAEV - // - this.TB_SPAEV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_SPAEV.Location = new System.Drawing.Point(130, 85); - this.TB_SPAEV.Mask = "000"; - this.TB_SPAEV.Name = "TB_SPAEV"; - this.TB_SPAEV.Size = new System.Drawing.Size(31, 20); - this.TB_SPAEV.TabIndex = 10; - this.TB_SPAEV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_SPAEV.Click += new System.EventHandler(this.clickEV); - this.TB_SPAEV.TextChanged += new System.EventHandler(this.updateEVs); - // // TB_HPEV // this.TB_HPEV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_HPEV.Location = new System.Drawing.Point(130, 19); + this.TB_HPEV.Location = new System.Drawing.Point(28, 0); + this.TB_HPEV.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); this.TB_HPEV.Mask = "000"; this.TB_HPEV.Name = "TB_HPEV"; - this.TB_HPEV.Size = new System.Drawing.Size(31, 20); + this.TB_HPEV.Size = new System.Drawing.Size(28, 20); this.TB_HPEV.TabIndex = 7; this.TB_HPEV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.TB_HPEV.Click += new System.EventHandler(this.clickEV); this.TB_HPEV.TextChanged += new System.EventHandler(this.updateEVs); // - // Label_Sheen + // Stat_HP // - this.Label_Sheen.Location = new System.Drawing.Point(207, 266); - this.Label_Sheen.Name = "Label_Sheen"; - this.Label_Sheen.Size = new System.Drawing.Size(43, 13); - this.Label_Sheen.TabIndex = 39; - this.Label_Sheen.Text = "Sheen"; - this.Label_Sheen.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.Stat_HP.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.Stat_HP.Enabled = false; + this.Stat_HP.Location = new System.Drawing.Point(62, 0); + this.Stat_HP.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.Stat_HP.Mask = "00000"; + this.Stat_HP.Name = "Stat_HP"; + this.Stat_HP.PromptChar = ' '; + this.Stat_HP.Size = new System.Drawing.Size(37, 20); + this.Stat_HP.TabIndex = 45; + this.Stat_HP.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.Stat_HP.TextChanged += new System.EventHandler(this.updateHackedStatText); // - // Label_Tough + // FLP_Atk // - this.Label_Tough.Location = new System.Drawing.Point(170, 266); - this.Label_Tough.Name = "Label_Tough"; - this.Label_Tough.Size = new System.Drawing.Size(43, 13); - this.Label_Tough.TabIndex = 38; - this.Label_Tough.Text = "Tough"; - this.Label_Tough.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.FLP_Atk.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_Atk.Controls.Add(this.Label_ATK); + this.FLP_Atk.Controls.Add(this.FLP_AtkRight); + this.FLP_Atk.Location = new System.Drawing.Point(0, 43); + this.FLP_Atk.Margin = new System.Windows.Forms.Padding(0); + this.FLP_Atk.Name = "FLP_Atk"; + this.FLP_Atk.Size = new System.Drawing.Size(272, 21); + this.FLP_Atk.TabIndex = 124; // - // Label_Smart + // Label_ATK // - this.Label_Smart.Location = new System.Drawing.Point(133, 266); - this.Label_Smart.Name = "Label_Smart"; - this.Label_Smart.Size = new System.Drawing.Size(43, 13); - this.Label_Smart.TabIndex = 37; - this.Label_Smart.Text = "Clever"; - this.Label_Smart.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.Label_ATK.Location = new System.Drawing.Point(0, 0); + this.Label_ATK.Margin = new System.Windows.Forms.Padding(0); + this.Label_ATK.Name = "Label_ATK"; + this.Label_ATK.Size = new System.Drawing.Size(110, 21); + this.Label_ATK.TabIndex = 20; + this.Label_ATK.Text = "Atk:"; + this.Label_ATK.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.Label_ATK.MouseDown += new System.Windows.Forms.MouseEventHandler(this.clickStatLabel); // - // Label_Cute + // FLP_AtkRight // - this.Label_Cute.Location = new System.Drawing.Point(96, 266); - this.Label_Cute.Name = "Label_Cute"; - this.Label_Cute.Size = new System.Drawing.Size(43, 13); - this.Label_Cute.TabIndex = 36; - this.Label_Cute.Text = "Cute"; - this.Label_Cute.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.FLP_AtkRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_AtkRight.Controls.Add(this.TB_ATKIV); + this.FLP_AtkRight.Controls.Add(this.TB_ATKEV); + this.FLP_AtkRight.Controls.Add(this.Stat_ATK); + this.FLP_AtkRight.Location = new System.Drawing.Point(110, 0); + this.FLP_AtkRight.Margin = new System.Windows.Forms.Padding(0); + this.FLP_AtkRight.Name = "FLP_AtkRight"; + this.FLP_AtkRight.Size = new System.Drawing.Size(162, 21); + this.FLP_AtkRight.TabIndex = 123; // - // Label_Beauty + // TB_ATKIV // - this.Label_Beauty.Location = new System.Drawing.Point(59, 266); - this.Label_Beauty.Name = "Label_Beauty"; - this.Label_Beauty.Size = new System.Drawing.Size(43, 13); - this.Label_Beauty.TabIndex = 35; - this.Label_Beauty.Text = "Beauty"; - this.Label_Beauty.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.TB_ATKIV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_ATKIV.Location = new System.Drawing.Point(0, 0); + this.TB_ATKIV.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); + this.TB_ATKIV.Mask = "00"; + this.TB_ATKIV.Name = "TB_ATKIV"; + this.TB_ATKIV.Size = new System.Drawing.Size(22, 20); + this.TB_ATKIV.TabIndex = 2; + this.TB_ATKIV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_ATKIV.Click += new System.EventHandler(this.clickIV); + this.TB_ATKIV.TextChanged += new System.EventHandler(this.updateIVs); // - // Label_Cool + // TB_ATKEV // - this.Label_Cool.Location = new System.Drawing.Point(22, 266); - this.Label_Cool.Name = "Label_Cool"; - this.Label_Cool.Size = new System.Drawing.Size(43, 13); - this.Label_Cool.TabIndex = 34; - this.Label_Cool.Text = "Cool"; - this.Label_Cool.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.TB_ATKEV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_ATKEV.Location = new System.Drawing.Point(28, 0); + this.TB_ATKEV.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.TB_ATKEV.Mask = "000"; + this.TB_ATKEV.Name = "TB_ATKEV"; + this.TB_ATKEV.Size = new System.Drawing.Size(28, 20); + this.TB_ATKEV.TabIndex = 8; + this.TB_ATKEV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_ATKEV.Click += new System.EventHandler(this.clickEV); + this.TB_ATKEV.TextChanged += new System.EventHandler(this.updateEVs); // - // Label_ContestStats + // Stat_ATK // - this.Label_ContestStats.Location = new System.Drawing.Point(67, 250); - this.Label_ContestStats.Name = "Label_ContestStats"; - this.Label_ContestStats.Size = new System.Drawing.Size(140, 13); - this.Label_ContestStats.TabIndex = 33; - this.Label_ContestStats.Text = "Contest Stats"; - this.Label_ContestStats.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.Stat_ATK.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.Stat_ATK.Enabled = false; + this.Stat_ATK.Location = new System.Drawing.Point(62, 0); + this.Stat_ATK.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.Stat_ATK.Mask = "00000"; + this.Stat_ATK.Name = "Stat_ATK"; + this.Stat_ATK.PromptChar = ' '; + this.Stat_ATK.Size = new System.Drawing.Size(37, 20); + this.Stat_ATK.TabIndex = 46; + this.Stat_ATK.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // FLP_Def + // + this.FLP_Def.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_Def.Controls.Add(this.Label_DEF); + this.FLP_Def.Controls.Add(this.FLP_DefRight); + this.FLP_Def.Location = new System.Drawing.Point(0, 64); + this.FLP_Def.Margin = new System.Windows.Forms.Padding(0); + this.FLP_Def.Name = "FLP_Def"; + this.FLP_Def.Size = new System.Drawing.Size(272, 21); + this.FLP_Def.TabIndex = 125; + // + // Label_DEF + // + this.Label_DEF.Location = new System.Drawing.Point(0, 0); + this.Label_DEF.Margin = new System.Windows.Forms.Padding(0); + this.Label_DEF.Name = "Label_DEF"; + this.Label_DEF.Size = new System.Drawing.Size(110, 21); + this.Label_DEF.TabIndex = 21; + this.Label_DEF.Text = "Def:"; + this.Label_DEF.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.Label_DEF.MouseDown += new System.Windows.Forms.MouseEventHandler(this.clickStatLabel); + // + // FLP_DefRight + // + this.FLP_DefRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_DefRight.Controls.Add(this.TB_DEFIV); + this.FLP_DefRight.Controls.Add(this.TB_DEFEV); + this.FLP_DefRight.Controls.Add(this.Stat_DEF); + this.FLP_DefRight.Location = new System.Drawing.Point(110, 0); + this.FLP_DefRight.Margin = new System.Windows.Forms.Padding(0); + this.FLP_DefRight.Name = "FLP_DefRight"; + this.FLP_DefRight.Size = new System.Drawing.Size(162, 21); + this.FLP_DefRight.TabIndex = 123; + // + // TB_DEFIV + // + this.TB_DEFIV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_DEFIV.Location = new System.Drawing.Point(0, 0); + this.TB_DEFIV.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); + this.TB_DEFIV.Mask = "00"; + this.TB_DEFIV.Name = "TB_DEFIV"; + this.TB_DEFIV.Size = new System.Drawing.Size(22, 20); + this.TB_DEFIV.TabIndex = 3; + this.TB_DEFIV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_DEFIV.Click += new System.EventHandler(this.clickIV); + this.TB_DEFIV.TextChanged += new System.EventHandler(this.updateIVs); + // + // TB_DEFEV + // + this.TB_DEFEV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_DEFEV.Location = new System.Drawing.Point(28, 0); + this.TB_DEFEV.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.TB_DEFEV.Mask = "000"; + this.TB_DEFEV.Name = "TB_DEFEV"; + this.TB_DEFEV.Size = new System.Drawing.Size(28, 20); + this.TB_DEFEV.TabIndex = 9; + this.TB_DEFEV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_DEFEV.Click += new System.EventHandler(this.clickEV); + this.TB_DEFEV.TextChanged += new System.EventHandler(this.updateEVs); + // + // Stat_DEF + // + this.Stat_DEF.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.Stat_DEF.Enabled = false; + this.Stat_DEF.Location = new System.Drawing.Point(62, 0); + this.Stat_DEF.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.Stat_DEF.Mask = "00000"; + this.Stat_DEF.Name = "Stat_DEF"; + this.Stat_DEF.PromptChar = ' '; + this.Stat_DEF.Size = new System.Drawing.Size(37, 20); + this.Stat_DEF.TabIndex = 47; + this.Stat_DEF.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // FLP_SpA + // + this.FLP_SpA.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_SpA.Controls.Add(this.FLP_SpALeft); + this.FLP_SpA.Controls.Add(this.FLP_SpARight); + this.FLP_SpA.Location = new System.Drawing.Point(0, 85); + this.FLP_SpA.Margin = new System.Windows.Forms.Padding(0); + this.FLP_SpA.Name = "FLP_SpA"; + this.FLP_SpA.Size = new System.Drawing.Size(272, 21); + this.FLP_SpA.TabIndex = 126; + // + // FLP_SpALeft + // + this.FLP_SpALeft.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.FLP_SpALeft.Controls.Add(this.Label_SPA); + this.FLP_SpALeft.Controls.Add(this.Label_SPC); + this.FLP_SpALeft.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft; + this.FLP_SpALeft.Location = new System.Drawing.Point(0, 0); + this.FLP_SpALeft.Margin = new System.Windows.Forms.Padding(0); + this.FLP_SpALeft.Name = "FLP_SpALeft"; + this.FLP_SpALeft.Size = new System.Drawing.Size(110, 21); + this.FLP_SpALeft.TabIndex = 124; + // + // Label_SPA + // + this.Label_SPA.Location = new System.Drawing.Point(0, 0); + this.Label_SPA.Margin = new System.Windows.Forms.Padding(0); + this.Label_SPA.Name = "Label_SPA"; + this.Label_SPA.Size = new System.Drawing.Size(110, 21); + this.Label_SPA.TabIndex = 22; + this.Label_SPA.Text = "SpA:"; + this.Label_SPA.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.Label_SPA.MouseDown += new System.Windows.Forms.MouseEventHandler(this.clickStatLabel); + // + // Label_SPC + // + this.Label_SPC.Location = new System.Drawing.Point(0, 21); + this.Label_SPC.Margin = new System.Windows.Forms.Padding(0); + this.Label_SPC.Name = "Label_SPC"; + this.Label_SPC.Size = new System.Drawing.Size(110, 21); + this.Label_SPC.TabIndex = 125; + this.Label_SPC.Text = "SpC:"; + this.Label_SPC.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // FLP_SpARight + // + this.FLP_SpARight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_SpARight.Controls.Add(this.TB_SPAIV); + this.FLP_SpARight.Controls.Add(this.TB_SPAEV); + this.FLP_SpARight.Controls.Add(this.Stat_SPA); + this.FLP_SpARight.Location = new System.Drawing.Point(110, 0); + this.FLP_SpARight.Margin = new System.Windows.Forms.Padding(0); + this.FLP_SpARight.Name = "FLP_SpARight"; + this.FLP_SpARight.Size = new System.Drawing.Size(162, 21); + this.FLP_SpARight.TabIndex = 123; + // + // TB_SPAIV + // + this.TB_SPAIV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_SPAIV.Location = new System.Drawing.Point(0, 0); + this.TB_SPAIV.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); + this.TB_SPAIV.Mask = "00"; + this.TB_SPAIV.Name = "TB_SPAIV"; + this.TB_SPAIV.Size = new System.Drawing.Size(22, 20); + this.TB_SPAIV.TabIndex = 4; + this.TB_SPAIV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_SPAIV.Click += new System.EventHandler(this.clickIV); + this.TB_SPAIV.TextChanged += new System.EventHandler(this.updateIVs); + // + // TB_SPAEV + // + this.TB_SPAEV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_SPAEV.Location = new System.Drawing.Point(28, 0); + this.TB_SPAEV.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.TB_SPAEV.Mask = "000"; + this.TB_SPAEV.Name = "TB_SPAEV"; + this.TB_SPAEV.Size = new System.Drawing.Size(28, 20); + this.TB_SPAEV.TabIndex = 10; + this.TB_SPAEV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_SPAEV.Click += new System.EventHandler(this.clickEV); + this.TB_SPAEV.TextChanged += new System.EventHandler(this.updateEVs); + // + // Stat_SPA + // + this.Stat_SPA.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.Stat_SPA.Enabled = false; + this.Stat_SPA.Location = new System.Drawing.Point(62, 0); + this.Stat_SPA.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.Stat_SPA.Mask = "00000"; + this.Stat_SPA.Name = "Stat_SPA"; + this.Stat_SPA.PromptChar = ' '; + this.Stat_SPA.Size = new System.Drawing.Size(37, 20); + this.Stat_SPA.TabIndex = 48; + this.Stat_SPA.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // FLP_SpD + // + this.FLP_SpD.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_SpD.Controls.Add(this.Label_SPD); + this.FLP_SpD.Controls.Add(this.FLP_SpDRight); + this.FLP_SpD.Location = new System.Drawing.Point(0, 106); + this.FLP_SpD.Margin = new System.Windows.Forms.Padding(0); + this.FLP_SpD.Name = "FLP_SpD"; + this.FLP_SpD.Size = new System.Drawing.Size(272, 21); + this.FLP_SpD.TabIndex = 127; + // + // Label_SPD + // + this.Label_SPD.Location = new System.Drawing.Point(0, 0); + this.Label_SPD.Margin = new System.Windows.Forms.Padding(0); + this.Label_SPD.Name = "Label_SPD"; + this.Label_SPD.Size = new System.Drawing.Size(110, 21); + this.Label_SPD.TabIndex = 23; + this.Label_SPD.Text = "SpD:"; + this.Label_SPD.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.Label_SPD.MouseDown += new System.Windows.Forms.MouseEventHandler(this.clickStatLabel); + // + // FLP_SpDRight + // + this.FLP_SpDRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_SpDRight.Controls.Add(this.TB_SPDIV); + this.FLP_SpDRight.Controls.Add(this.TB_SPDEV); + this.FLP_SpDRight.Controls.Add(this.Stat_SPD); + this.FLP_SpDRight.Location = new System.Drawing.Point(110, 0); + this.FLP_SpDRight.Margin = new System.Windows.Forms.Padding(0); + this.FLP_SpDRight.Name = "FLP_SpDRight"; + this.FLP_SpDRight.Size = new System.Drawing.Size(162, 21); + this.FLP_SpDRight.TabIndex = 123; + // + // TB_SPDIV + // + this.TB_SPDIV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_SPDIV.Location = new System.Drawing.Point(0, 0); + this.TB_SPDIV.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); + this.TB_SPDIV.Mask = "00"; + this.TB_SPDIV.Name = "TB_SPDIV"; + this.TB_SPDIV.Size = new System.Drawing.Size(22, 20); + this.TB_SPDIV.TabIndex = 5; + this.TB_SPDIV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_SPDIV.Click += new System.EventHandler(this.clickIV); + this.TB_SPDIV.TextChanged += new System.EventHandler(this.updateIVs); + // + // TB_SPDEV + // + this.TB_SPDEV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_SPDEV.Location = new System.Drawing.Point(28, 0); + this.TB_SPDEV.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.TB_SPDEV.Mask = "000"; + this.TB_SPDEV.Name = "TB_SPDEV"; + this.TB_SPDEV.Size = new System.Drawing.Size(28, 20); + this.TB_SPDEV.TabIndex = 11; + this.TB_SPDEV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_SPDEV.Click += new System.EventHandler(this.clickEV); + this.TB_SPDEV.TextChanged += new System.EventHandler(this.updateEVs); + // + // Stat_SPD + // + this.Stat_SPD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.Stat_SPD.Enabled = false; + this.Stat_SPD.Location = new System.Drawing.Point(62, 0); + this.Stat_SPD.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.Stat_SPD.Mask = "00000"; + this.Stat_SPD.Name = "Stat_SPD"; + this.Stat_SPD.PromptChar = ' '; + this.Stat_SPD.Size = new System.Drawing.Size(37, 20); + this.Stat_SPD.TabIndex = 49; + this.Stat_SPD.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // FLP_Spe + // + this.FLP_Spe.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_Spe.Controls.Add(this.Label_SPE); + this.FLP_Spe.Controls.Add(this.FLP_SpeRight); + this.FLP_Spe.Location = new System.Drawing.Point(0, 127); + this.FLP_Spe.Margin = new System.Windows.Forms.Padding(0); + this.FLP_Spe.Name = "FLP_Spe"; + this.FLP_Spe.Size = new System.Drawing.Size(272, 21); + this.FLP_Spe.TabIndex = 128; + // + // Label_SPE + // + this.Label_SPE.Location = new System.Drawing.Point(0, 0); + this.Label_SPE.Margin = new System.Windows.Forms.Padding(0); + this.Label_SPE.Name = "Label_SPE"; + this.Label_SPE.Size = new System.Drawing.Size(110, 21); + this.Label_SPE.TabIndex = 24; + this.Label_SPE.Text = "Spe:"; + this.Label_SPE.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.Label_SPE.MouseDown += new System.Windows.Forms.MouseEventHandler(this.clickStatLabel); + // + // FLP_SpeRight + // + this.FLP_SpeRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_SpeRight.Controls.Add(this.TB_SPEIV); + this.FLP_SpeRight.Controls.Add(this.TB_SPEEV); + this.FLP_SpeRight.Controls.Add(this.Stat_SPE); + this.FLP_SpeRight.Location = new System.Drawing.Point(110, 0); + this.FLP_SpeRight.Margin = new System.Windows.Forms.Padding(0); + this.FLP_SpeRight.Name = "FLP_SpeRight"; + this.FLP_SpeRight.Size = new System.Drawing.Size(162, 21); + this.FLP_SpeRight.TabIndex = 123; + // + // TB_SPEIV + // + this.TB_SPEIV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_SPEIV.Location = new System.Drawing.Point(0, 0); + this.TB_SPEIV.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); + this.TB_SPEIV.Mask = "00"; + this.TB_SPEIV.Name = "TB_SPEIV"; + this.TB_SPEIV.Size = new System.Drawing.Size(22, 20); + this.TB_SPEIV.TabIndex = 6; + this.TB_SPEIV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_SPEIV.Click += new System.EventHandler(this.clickIV); + this.TB_SPEIV.TextChanged += new System.EventHandler(this.updateIVs); + // + // TB_SPEEV + // + this.TB_SPEEV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_SPEEV.Location = new System.Drawing.Point(28, 0); + this.TB_SPEEV.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.TB_SPEEV.Mask = "000"; + this.TB_SPEEV.Name = "TB_SPEEV"; + this.TB_SPEEV.Size = new System.Drawing.Size(28, 20); + this.TB_SPEEV.TabIndex = 12; + this.TB_SPEEV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_SPEEV.Click += new System.EventHandler(this.clickEV); + this.TB_SPEEV.TextChanged += new System.EventHandler(this.updateEVs); + // + // Stat_SPE + // + this.Stat_SPE.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.Stat_SPE.Enabled = false; + this.Stat_SPE.Location = new System.Drawing.Point(62, 0); + this.Stat_SPE.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.Stat_SPE.Mask = "00000"; + this.Stat_SPE.Name = "Stat_SPE"; + this.Stat_SPE.PromptChar = ' '; + this.Stat_SPE.Size = new System.Drawing.Size(37, 20); + this.Stat_SPE.TabIndex = 50; + this.Stat_SPE.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // FLP_StatsTotal + // + this.FLP_StatsTotal.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_StatsTotal.Controls.Add(this.Label_Total); + this.FLP_StatsTotal.Controls.Add(this.FLP_StatsTotalRight); + this.FLP_StatsTotal.Location = new System.Drawing.Point(0, 148); + this.FLP_StatsTotal.Margin = new System.Windows.Forms.Padding(0); + this.FLP_StatsTotal.Name = "FLP_StatsTotal"; + this.FLP_StatsTotal.Size = new System.Drawing.Size(272, 21); + this.FLP_StatsTotal.TabIndex = 129; + // + // Label_Total + // + this.Label_Total.Location = new System.Drawing.Point(0, 0); + this.Label_Total.Margin = new System.Windows.Forms.Padding(0); + this.Label_Total.Name = "Label_Total"; + this.Label_Total.Size = new System.Drawing.Size(110, 21); + this.Label_Total.TabIndex = 25; + this.Label_Total.Text = "Total:"; + this.Label_Total.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // FLP_StatsTotalRight + // + this.FLP_StatsTotalRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_StatsTotalRight.Controls.Add(this.TB_IVTotal); + this.FLP_StatsTotalRight.Controls.Add(this.TB_EVTotal); + this.FLP_StatsTotalRight.Controls.Add(this.L_Potential); + this.FLP_StatsTotalRight.Location = new System.Drawing.Point(110, 0); + this.FLP_StatsTotalRight.Margin = new System.Windows.Forms.Padding(0); + this.FLP_StatsTotalRight.Name = "FLP_StatsTotalRight"; + this.FLP_StatsTotalRight.Size = new System.Drawing.Size(162, 21); + this.FLP_StatsTotalRight.TabIndex = 123; + // + // TB_IVTotal + // + this.TB_IVTotal.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_IVTotal.Enabled = false; + this.TB_IVTotal.Location = new System.Drawing.Point(0, 0); + this.TB_IVTotal.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); + this.TB_IVTotal.MaxLength = 3; + this.TB_IVTotal.Name = "TB_IVTotal"; + this.TB_IVTotal.Size = new System.Drawing.Size(22, 20); + this.TB_IVTotal.TabIndex = 41; + this.TB_IVTotal.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // TB_EVTotal + // + this.TB_EVTotal.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_EVTotal.Enabled = false; + this.TB_EVTotal.Location = new System.Drawing.Point(28, 0); + this.TB_EVTotal.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.TB_EVTotal.MaxLength = 3; + this.TB_EVTotal.Name = "TB_EVTotal"; + this.TB_EVTotal.Size = new System.Drawing.Size(28, 20); + this.TB_EVTotal.TabIndex = 18; + this.TB_EVTotal.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // L_Potential + // + this.L_Potential.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.L_Potential.Location = new System.Drawing.Point(59, 0); + this.L_Potential.Margin = new System.Windows.Forms.Padding(0); + this.L_Potential.Name = "L_Potential"; + this.L_Potential.Size = new System.Drawing.Size(67, 21); + this.L_Potential.TabIndex = 42; + this.L_Potential.Text = "(potential)"; + this.L_Potential.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // FLP_HPType + // + this.FLP_HPType.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_HPType.Controls.Add(this.Label_HiddenPowerPrefix); + this.FLP_HPType.Controls.Add(this.CB_HPType); + this.FLP_HPType.Location = new System.Drawing.Point(0, 169); + this.FLP_HPType.Margin = new System.Windows.Forms.Padding(0); + this.FLP_HPType.Name = "FLP_HPType"; + this.FLP_HPType.Size = new System.Drawing.Size(272, 21); + this.FLP_HPType.TabIndex = 130; + // + // Label_HiddenPowerPrefix + // + this.Label_HiddenPowerPrefix.Location = new System.Drawing.Point(0, 0); + this.Label_HiddenPowerPrefix.Margin = new System.Windows.Forms.Padding(0); + this.Label_HiddenPowerPrefix.Name = "Label_HiddenPowerPrefix"; + this.Label_HiddenPowerPrefix.Size = new System.Drawing.Size(172, 21); + this.Label_HiddenPowerPrefix.TabIndex = 29; + this.Label_HiddenPowerPrefix.Text = "Hidden Power Type:"; + this.Label_HiddenPowerPrefix.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // CB_HPType + // + this.CB_HPType.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.CB_HPType.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_HPType.DropDownWidth = 80; + this.CB_HPType.FormattingEnabled = true; + this.CB_HPType.Location = new System.Drawing.Point(172, 0); + this.CB_HPType.Margin = new System.Windows.Forms.Padding(0); + this.CB_HPType.Name = "CB_HPType"; + this.CB_HPType.Size = new System.Drawing.Size(70, 21); + this.CB_HPType.TabIndex = 44; + this.CB_HPType.SelectedIndexChanged += new System.EventHandler(this.updateHPType); + // + // FLP_Characteristic + // + this.FLP_Characteristic.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_Characteristic.Controls.Add(this.Label_CharacteristicPrefix); + this.FLP_Characteristic.Controls.Add(this.L_Characteristic); + this.FLP_Characteristic.Location = new System.Drawing.Point(0, 190); + this.FLP_Characteristic.Margin = new System.Windows.Forms.Padding(0); + this.FLP_Characteristic.Name = "FLP_Characteristic"; + this.FLP_Characteristic.Size = new System.Drawing.Size(272, 21); + this.FLP_Characteristic.TabIndex = 131; + // + // Label_CharacteristicPrefix + // + this.Label_CharacteristicPrefix.Location = new System.Drawing.Point(0, 0); + this.Label_CharacteristicPrefix.Margin = new System.Windows.Forms.Padding(0); + this.Label_CharacteristicPrefix.Name = "Label_CharacteristicPrefix"; + this.Label_CharacteristicPrefix.Size = new System.Drawing.Size(110, 21); + this.Label_CharacteristicPrefix.TabIndex = 43; + this.Label_CharacteristicPrefix.Text = "Characteristic:"; + this.Label_CharacteristicPrefix.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // L_Characteristic + // + this.L_Characteristic.Location = new System.Drawing.Point(110, 0); + this.L_Characteristic.Margin = new System.Windows.Forms.Padding(0); + this.L_Characteristic.Name = "L_Characteristic"; + this.L_Characteristic.Size = new System.Drawing.Size(150, 21); + this.L_Characteristic.TabIndex = 40; + this.L_Characteristic.Text = "(char)"; + this.L_Characteristic.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // BTN_RandomEVs // @@ -1791,122 +2732,6 @@ public void InitializeComponent() this.BTN_RandomIVs.UseVisualStyleBackColor = true; this.BTN_RandomIVs.Click += new System.EventHandler(this.updateRandomIVs); // - // Label_HiddenPowerPrefix - // - this.Label_HiddenPowerPrefix.Location = new System.Drawing.Point(29, 179); - this.Label_HiddenPowerPrefix.Name = "Label_HiddenPowerPrefix"; - this.Label_HiddenPowerPrefix.Size = new System.Drawing.Size(133, 13); - this.Label_HiddenPowerPrefix.TabIndex = 29; - this.Label_HiddenPowerPrefix.Text = "Hidden Power Type:"; - this.Label_HiddenPowerPrefix.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // Label_Stats - // - this.Label_Stats.Location = new System.Drawing.Point(162, 6); - this.Label_Stats.Name = "Label_Stats"; - this.Label_Stats.Size = new System.Drawing.Size(40, 13); - this.Label_Stats.TabIndex = 28; - this.Label_Stats.Text = "Stats"; - this.Label_Stats.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // Label_EVs - // - this.Label_EVs.Location = new System.Drawing.Point(125, 6); - this.Label_EVs.Name = "Label_EVs"; - this.Label_EVs.Size = new System.Drawing.Size(40, 13); - this.Label_EVs.TabIndex = 27; - this.Label_EVs.Text = "EVs"; - this.Label_EVs.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // Label_IVs - // - this.Label_IVs.Location = new System.Drawing.Point(98, 6); - this.Label_IVs.Name = "Label_IVs"; - this.Label_IVs.Size = new System.Drawing.Size(30, 13); - this.Label_IVs.TabIndex = 26; - this.Label_IVs.Text = "IVs"; - this.Label_IVs.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // Label_Total - // - this.Label_Total.Location = new System.Drawing.Point(29, 154); - this.Label_Total.Name = "Label_Total"; - this.Label_Total.Size = new System.Drawing.Size(70, 13); - this.Label_Total.TabIndex = 25; - this.Label_Total.Text = "Total:"; - this.Label_Total.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // Label_SPE - // - this.Label_SPE.Location = new System.Drawing.Point(29, 131); - this.Label_SPE.Name = "Label_SPE"; - this.Label_SPE.Size = new System.Drawing.Size(70, 13); - this.Label_SPE.TabIndex = 24; - this.Label_SPE.Text = "Spe:"; - this.Label_SPE.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.Label_SPE.MouseDown += new System.Windows.Forms.MouseEventHandler(this.clickStatLabel); - // - // Label_SPD - // - this.Label_SPD.Location = new System.Drawing.Point(29, 109); - this.Label_SPD.Name = "Label_SPD"; - this.Label_SPD.Size = new System.Drawing.Size(70, 13); - this.Label_SPD.TabIndex = 23; - this.Label_SPD.Text = "SpD:"; - this.Label_SPD.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.Label_SPD.MouseDown += new System.Windows.Forms.MouseEventHandler(this.clickStatLabel); - // - // Label_SPA - // - this.Label_SPA.Location = new System.Drawing.Point(29, 87); - this.Label_SPA.Name = "Label_SPA"; - this.Label_SPA.Size = new System.Drawing.Size(70, 13); - this.Label_SPA.TabIndex = 22; - this.Label_SPA.Text = "SpA:"; - this.Label_SPA.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.Label_SPA.MouseDown += new System.Windows.Forms.MouseEventHandler(this.clickStatLabel); - // - // Label_DEF - // - this.Label_DEF.Location = new System.Drawing.Point(29, 65); - this.Label_DEF.Name = "Label_DEF"; - this.Label_DEF.Size = new System.Drawing.Size(70, 13); - this.Label_DEF.TabIndex = 21; - this.Label_DEF.Text = "Def:"; - this.Label_DEF.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.Label_DEF.MouseDown += new System.Windows.Forms.MouseEventHandler(this.clickStatLabel); - // - // Label_ATK - // - this.Label_ATK.Location = new System.Drawing.Point(29, 43); - this.Label_ATK.Name = "Label_ATK"; - this.Label_ATK.Size = new System.Drawing.Size(70, 13); - this.Label_ATK.TabIndex = 20; - this.Label_ATK.Text = "Atk:"; - this.Label_ATK.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.Label_ATK.MouseDown += new System.Windows.Forms.MouseEventHandler(this.clickStatLabel); - // - // Label_HP - // - this.Label_HP.Location = new System.Drawing.Point(29, 21); - this.Label_HP.Name = "Label_HP"; - this.Label_HP.Size = new System.Drawing.Size(70, 13); - this.Label_HP.TabIndex = 19; - this.Label_HP.Text = "HP:"; - this.Label_HP.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.Label_HP.MouseDown += new System.Windows.Forms.MouseEventHandler(this.clickStatLabel); - // - // TB_EVTotal - // - this.TB_EVTotal.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_EVTotal.Enabled = false; - this.TB_EVTotal.Location = new System.Drawing.Point(130, 151); - this.TB_EVTotal.MaxLength = 3; - this.TB_EVTotal.Name = "TB_EVTotal"; - this.TB_EVTotal.Size = new System.Drawing.Size(31, 20); - this.TB_EVTotal.TabIndex = 18; - this.TB_EVTotal.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // // Tab_Attacks // this.Tab_Attacks.AllowDrop = true; @@ -2790,7 +3615,7 @@ public void InitializeComponent() this.Menu_ShowdownExportBattleBox}); this.Menu_Showdown.Image = global::PKHeX.Properties.Resources.showdown; this.Menu_Showdown.Name = "Menu_Showdown"; - this.Menu_Showdown.Size = new System.Drawing.Size(152, 22); + this.Menu_Showdown.Size = new System.Drawing.Size(143, 22); this.Menu_Showdown.Text = "Showdown"; // // Menu_ShowdownImportPKM @@ -2837,7 +3662,7 @@ public void InitializeComponent() this.Menu_OpenCache}); this.Menu_CyberGadget.Image = global::PKHeX.Properties.Resources.other; this.Menu_CyberGadget.Name = "Menu_CyberGadget"; - this.Menu_CyberGadget.Size = new System.Drawing.Size(152, 22); + this.Menu_CyberGadget.Size = new System.Drawing.Size(143, 22); this.Menu_CyberGadget.Text = "CyberGadget"; // // Menu_OpenTemp @@ -2867,7 +3692,7 @@ public void InitializeComponent() this.Menu_BatchEditor}); this.Menu_Data.Image = global::PKHeX.Properties.Resources.data; this.Menu_Data.Name = "Menu_Data"; - this.Menu_Data.Size = new System.Drawing.Size(152, 22); + this.Menu_Data.Size = new System.Drawing.Size(143, 22); this.Menu_Data.Text = "Data"; // // Menu_LoadBoxes @@ -2933,7 +3758,7 @@ public void InitializeComponent() this.Menu_OpenSDB}); this.Menu_Other.Image = global::PKHeX.Properties.Resources.other; this.Menu_Other.Name = "Menu_Other"; - this.Menu_Other.Size = new System.Drawing.Size(152, 22); + this.Menu_Other.Size = new System.Drawing.Size(143, 22); this.Menu_Other.Text = "Other"; // // Menu_OpenSDF @@ -4674,13 +5499,89 @@ public void InitializeComponent() this.DragEnter += new System.Windows.Forms.DragEventHandler(this.tabMain_DragEnter); this.tabMain.ResumeLayout(false); this.Tab_Main.ResumeLayout(false); - this.Tab_Main.PerformLayout(); + this.FLP_Main.ResumeLayout(false); + this.FLP_PID.ResumeLayout(false); + this.FLP_PIDLeft.ResumeLayout(false); + this.FLP_PIDLeft.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.Label_IsShiny)).EndInit(); + this.FLP_PIDRight.ResumeLayout(false); + this.FLP_PIDRight.PerformLayout(); + this.FLP_Species.ResumeLayout(false); + this.FLP_Nickname.ResumeLayout(false); + this.FLP_Nickname.PerformLayout(); + this.FLP_NicknameLeft.ResumeLayout(false); + this.FLP_NicknameLeft.PerformLayout(); + this.FLP_EXPLevel.ResumeLayout(false); + this.FLP_EXPLevelRight.ResumeLayout(false); + this.FLP_EXPLevelRight.PerformLayout(); + this.FLP_Nature.ResumeLayout(false); + this.FLP_HeldItem.ResumeLayout(false); + this.FLP_FriendshipForm.ResumeLayout(false); + this.FLP_FriendshipFormLeft.ResumeLayout(false); + this.FLP_FriendshipFormRight.ResumeLayout(false); + this.FLP_FriendshipFormRight.PerformLayout(); + this.FLP_Ability.ResumeLayout(false); + this.FLP_AbilityRight.ResumeLayout(false); + this.FLP_AbilityRight.PerformLayout(); + this.FLP_Language.ResumeLayout(false); + this.FLP_EggPKRS.ResumeLayout(false); + this.FLP_EggPKRSLeft.ResumeLayout(false); + this.FLP_EggPKRSLeft.PerformLayout(); + this.FLP_EggPKRSRight.ResumeLayout(false); + this.FLP_EggPKRSRight.PerformLayout(); + this.FLP_PKRS.ResumeLayout(false); + this.FLP_PKRSRight.ResumeLayout(false); + this.FLP_Country.ResumeLayout(false); + this.FLP_SubRegion.ResumeLayout(false); + this.FLP_3DSRegion.ResumeLayout(false); + this.FLP_NSparkle.ResumeLayout(false); + this.FLP_NSparkle.PerformLayout(); this.Tab_Met.ResumeLayout(false); this.Tab_Met.PerformLayout(); this.GB_EggConditions.ResumeLayout(false); + this.FLP_Met.ResumeLayout(false); + this.FLP_OriginGame.ResumeLayout(false); + this.FLP_MetLocation.ResumeLayout(false); + this.FLP_Ball.ResumeLayout(false); + this.FLP_MetLevel.ResumeLayout(false); + this.FLP_MetLevel.PerformLayout(); + this.FLP_MetDate.ResumeLayout(false); + this.FLP_Fateful.ResumeLayout(false); + this.FLP_Fateful.PerformLayout(); + this.FLP_EncounterType.ResumeLayout(false); + this.FLP_TimeOfDay.ResumeLayout(false); this.Tab_Stats.ResumeLayout(false); - this.Tab_Stats.PerformLayout(); + this.PAN_Contest.ResumeLayout(false); + this.PAN_Contest.PerformLayout(); + this.FLP_Stats.ResumeLayout(false); + this.FLP_StatHeader.ResumeLayout(false); + this.FLP_HackedStats.ResumeLayout(false); + this.FLP_HackedStats.PerformLayout(); + this.FLP_StatsHeaderRight.ResumeLayout(false); + this.FLP_HP.ResumeLayout(false); + this.FLP_HPRight.ResumeLayout(false); + this.FLP_HPRight.PerformLayout(); + this.FLP_Atk.ResumeLayout(false); + this.FLP_AtkRight.ResumeLayout(false); + this.FLP_AtkRight.PerformLayout(); + this.FLP_Def.ResumeLayout(false); + this.FLP_DefRight.ResumeLayout(false); + this.FLP_DefRight.PerformLayout(); + this.FLP_SpA.ResumeLayout(false); + this.FLP_SpALeft.ResumeLayout(false); + this.FLP_SpARight.ResumeLayout(false); + this.FLP_SpARight.PerformLayout(); + this.FLP_SpD.ResumeLayout(false); + this.FLP_SpDRight.ResumeLayout(false); + this.FLP_SpDRight.PerformLayout(); + this.FLP_Spe.ResumeLayout(false); + this.FLP_SpeRight.ResumeLayout(false); + this.FLP_SpeRight.PerformLayout(); + this.FLP_StatsTotal.ResumeLayout(false); + this.FLP_StatsTotalRight.ResumeLayout(false); + this.FLP_StatsTotalRight.PerformLayout(); + this.FLP_HPType.ResumeLayout(false); + this.FLP_Characteristic.ResumeLayout(false); this.Tab_Attacks.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.PB_WarnMove4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.PB_WarnMove3)).EndInit(); @@ -4815,15 +5716,11 @@ public void InitializeComponent() private System.Windows.Forms.Label Label_Nature; private System.Windows.Forms.Label Label_CurLevel; private System.Windows.Forms.Button BTN_RerollPID; - private System.Windows.Forms.ComboBox CB_3DSReg; - private System.Windows.Forms.ComboBox CB_SubRegion; private System.Windows.Forms.ComboBox CB_Country; private System.Windows.Forms.ComboBox CB_PKRSDays; private System.Windows.Forms.ComboBox CB_PKRSStrain; private System.Windows.Forms.ComboBox CB_Language; private System.Windows.Forms.ComboBox CB_Ability; - private System.Windows.Forms.Label Label_3DSRegion; - private System.Windows.Forms.Label Label_SubRegion; private System.Windows.Forms.Label Label_Country; private System.Windows.Forms.Label Label_PKRSdays; private System.Windows.Forms.Label Label_PKRS; @@ -4853,13 +5750,6 @@ public void InitializeComponent() private System.Windows.Forms.ComboBox CB_RelearnMove1; private System.Windows.Forms.Label Label_CurPP; private System.Windows.Forms.Label Label_PPups; - private System.Windows.Forms.Label Label_Sheen; - private System.Windows.Forms.Label Label_Tough; - private System.Windows.Forms.Label Label_Smart; - private System.Windows.Forms.Label Label_Cute; - private System.Windows.Forms.Label Label_Beauty; - private System.Windows.Forms.Label Label_Cool; - private System.Windows.Forms.Label Label_ContestStats; private System.Windows.Forms.Button BTN_RandomEVs; private System.Windows.Forms.Button BTN_RandomIVs; private System.Windows.Forms.Label Label_HiddenPowerPrefix; @@ -4901,12 +5791,6 @@ public void InitializeComponent() private System.Windows.Forms.MaskedTextBox TB_DEFIV; private System.Windows.Forms.MaskedTextBox TB_ATKIV; private System.Windows.Forms.MaskedTextBox TB_HPIV; - private System.Windows.Forms.MaskedTextBox TB_Sheen; - private System.Windows.Forms.MaskedTextBox TB_Tough; - private System.Windows.Forms.MaskedTextBox TB_Smart; - private System.Windows.Forms.MaskedTextBox TB_Cute; - private System.Windows.Forms.MaskedTextBox TB_Beauty; - private System.Windows.Forms.MaskedTextBox TB_Cool; private System.Windows.Forms.MaskedTextBox TB_SID; private System.Windows.Forms.MaskedTextBox TB_TID; private System.Windows.Forms.MaskedTextBox TB_Level; @@ -4917,7 +5801,6 @@ public void InitializeComponent() private System.Windows.Forms.CheckBox CHK_Infected; private System.Windows.Forms.ComboBox CB_Form; private System.Windows.Forms.Label Label_Gender; - private System.Windows.Forms.CheckBox CHK_Nicknamed; private System.Windows.Forms.Button BTN_Shinytize; private System.Windows.Forms.MaskedTextBox TB_AbilityNumber; private System.Windows.Forms.MaskedTextBox TB_MetLevel; @@ -5134,6 +6017,85 @@ public void InitializeComponent() private System.Windows.Forms.Label L_MetTimeOfDay; public System.Windows.Forms.ComboBox CB_MetTimeOfDay; private System.Windows.Forms.ToolStripMenuItem Menu_MGDatabase; + private System.Windows.Forms.FlowLayoutPanel FLP_Main; + private System.Windows.Forms.FlowLayoutPanel FLP_PID; + private System.Windows.Forms.FlowLayoutPanel FLP_PIDLeft; + private System.Windows.Forms.FlowLayoutPanel FLP_PIDRight; + private System.Windows.Forms.FlowLayoutPanel FLP_Species; + private System.Windows.Forms.FlowLayoutPanel FLP_EXPLevel; + private System.Windows.Forms.FlowLayoutPanel FLP_EXPLevelRight; + private System.Windows.Forms.FlowLayoutPanel FLP_Nature; + private System.Windows.Forms.FlowLayoutPanel FLP_HeldItem; + private System.Windows.Forms.FlowLayoutPanel FLP_FriendshipForm; + private System.Windows.Forms.FlowLayoutPanel FLP_FriendshipFormLeft; + private System.Windows.Forms.FlowLayoutPanel FLP_FriendshipFormRight; + private System.Windows.Forms.FlowLayoutPanel FLP_Ability; + private System.Windows.Forms.FlowLayoutPanel FLP_Language; + private System.Windows.Forms.FlowLayoutPanel FLP_EggPKRS; + private System.Windows.Forms.FlowLayoutPanel FLP_EggPKRSRight; + private System.Windows.Forms.FlowLayoutPanel FLP_PKRS; + private System.Windows.Forms.FlowLayoutPanel FLP_Country; + private System.Windows.Forms.FlowLayoutPanel FLP_PKRSRight; + private System.Windows.Forms.FlowLayoutPanel FLP_EggPKRSLeft; + private System.Windows.Forms.FlowLayoutPanel FLP_AbilityRight; + private System.Windows.Forms.CheckBox CHK_Nicknamed; + private System.Windows.Forms.FlowLayoutPanel FLP_NicknameLeft; + private System.Windows.Forms.FlowLayoutPanel FLP_Nickname; + private System.Windows.Forms.CheckBox CHK_NSparkle; + private System.Windows.Forms.Label L_NSparkle; + private System.Windows.Forms.FlowLayoutPanel FLP_NSparkle; + private System.Windows.Forms.ComboBox CB_3DSReg; + private System.Windows.Forms.Label Label_3DSRegion; + private System.Windows.Forms.FlowLayoutPanel FLP_3DSRegion; + private System.Windows.Forms.ComboBox CB_SubRegion; + private System.Windows.Forms.Label Label_SubRegion; + private System.Windows.Forms.FlowLayoutPanel FLP_SubRegion; + private System.Windows.Forms.FlowLayoutPanel FLP_Met; + private System.Windows.Forms.FlowLayoutPanel FLP_OriginGame; + private System.Windows.Forms.FlowLayoutPanel FLP_MetLocation; + private System.Windows.Forms.FlowLayoutPanel FLP_Ball; + private System.Windows.Forms.FlowLayoutPanel FLP_MetLevel; + private System.Windows.Forms.FlowLayoutPanel FLP_MetDate; + private System.Windows.Forms.FlowLayoutPanel FLP_Fateful; + private System.Windows.Forms.FlowLayoutPanel FLP_EncounterType; + private System.Windows.Forms.FlowLayoutPanel FLP_TimeOfDay; + private System.Windows.Forms.Panel PAN_Fateful; + private System.Windows.Forms.FlowLayoutPanel FLP_Stats; + private System.Windows.Forms.FlowLayoutPanel FLP_StatHeader; + private System.Windows.Forms.FlowLayoutPanel FLP_HP; + private System.Windows.Forms.FlowLayoutPanel FLP_Atk; + private System.Windows.Forms.FlowLayoutPanel FLP_Def; + private System.Windows.Forms.FlowLayoutPanel FLP_SpA; + private System.Windows.Forms.FlowLayoutPanel FLP_SpD; + private System.Windows.Forms.FlowLayoutPanel FLP_Spe; + private System.Windows.Forms.FlowLayoutPanel FLP_HPRight; + private System.Windows.Forms.FlowLayoutPanel FLP_HPType; + private System.Windows.Forms.FlowLayoutPanel FLP_StatsTotal; + private System.Windows.Forms.FlowLayoutPanel FLP_Characteristic; + private System.Windows.Forms.FlowLayoutPanel FLP_DefRight; + private System.Windows.Forms.FlowLayoutPanel FLP_SpDRight; + private System.Windows.Forms.FlowLayoutPanel FLP_SpeRight; + private System.Windows.Forms.FlowLayoutPanel FLP_StatsTotalRight; + private System.Windows.Forms.FlowLayoutPanel FLP_HackedStats; + private System.Windows.Forms.FlowLayoutPanel FLP_AtkRight; + private System.Windows.Forms.FlowLayoutPanel FLP_SpARight; + private System.Windows.Forms.Label Label_SPC; + private System.Windows.Forms.FlowLayoutPanel FLP_SpALeft; + private System.Windows.Forms.FlowLayoutPanel FLP_StatsHeaderRight; + private System.Windows.Forms.Panel PAN_Contest; + private System.Windows.Forms.Label Label_ContestStats; + private System.Windows.Forms.Label Label_Cool; + private System.Windows.Forms.Label Label_Beauty; + private System.Windows.Forms.Label Label_Cute; + private System.Windows.Forms.Label Label_Smart; + private System.Windows.Forms.Label Label_Tough; + private System.Windows.Forms.Label Label_Sheen; + private System.Windows.Forms.MaskedTextBox TB_Cool; + private System.Windows.Forms.MaskedTextBox TB_Beauty; + private System.Windows.Forms.MaskedTextBox TB_Cute; + private System.Windows.Forms.MaskedTextBox TB_Smart; + private System.Windows.Forms.MaskedTextBox TB_Tough; + private System.Windows.Forms.MaskedTextBox TB_Sheen; } } diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index b8827ce30..d0fb9f7dd 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -865,111 +865,94 @@ private void loadSAV(SaveFile sav, string path) byte[] extraBytes = new byte[1]; Tip1.RemoveAll(); Tip2.RemoveAll(); Tip3.RemoveAll(); // TSV/PSV - CB_Country.Visible = CB_SubRegion.Visible = CB_3DSReg.Visible = - Label_Country.Visible = Label_SubRegion.Visible = Label_3DSRegion.Visible = SAV.Generation >= 6; + FLP_Country.Visible = FLP_SubRegion.Visible = FLP_3DSRegion.Visible = SAV.Generation >= 6; Label_EncryptionConstant.Visible = BTN_RerollEC.Visible = TB_EC.Visible = SAV.Generation >= 6; GB_nOT.Visible = GB_RelearnMoves.Visible = BTN_Medals.Visible = BTN_History.Visible = SAV.Generation >= 6; PB_Legal.Visible = PB_WarnMove1.Visible = PB_WarnMove2.Visible = PB_WarnMove3.Visible = PB_WarnMove4.Visible = SAV.Generation >= 6; + TB_AbilityNumber.Visible = SAV.Generation >= 6 && DEV_Ability.Enabled; PB_MarkPentagon.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; + FLP_NSparkle.Visible = L_NSparkle.Visible = CHK_NSparkle.Visible = SAV.Generation == 5; + + CB_Form.Visible = Label_Form.Visible = CHK_AsEgg.Visible = GB_EggConditions.Visible = PB_Mark5.Visible = PB_Mark6.Visible = SAV.Generation >= 4; - BTN_Ribbons.Visible = SAV.Generation >= 3; DEV_Ability.Enabled = DEV_Ability.Visible = SAV.Generation > 3 && HaX; - TB_AbilityNumber.Visible = SAV.Generation >= 6 && DEV_Ability.Enabled; CB_Ability.Visible = !DEV_Ability.Enabled && SAV.Generation >= 3; + FLP_Nature.Visible = SAV.Generation >= 3; + FLP_Ability.Visible = SAV.Generation >= 3; + FLP_Language.Visible = SAV.Generation >= 3; + GB_ExtraBytes.Visible = SAV.Generation >= 3; + GB_Markings.Visible = SAV.Generation >= 3; + BTN_Ribbons.Visible = SAV.Generation >= 3; + CB_HPType.Enabled = CB_Form.Enabled = SAV.Generation >= 3; + FLP_PKRSRight.Visible = SAV.Generation >= 3; + FLP_PKRS.Visible = SAV.Generation >= 3; + BTN_RerollPID.Visible = Label_PID.Visible = TB_PID.Visible = Label_SID.Visible = TB_SID.Visible = SAV.Generation >= 3; - GB_ExtraBytes.Visible = SAV.Generation > 2; - GB_Markings.Visible = SAV.Generation > 2; + FLP_FriendshipForm.Visible = SAV.Generation >= 2; + FLP_HeldItem.Visible = SAV.Generation >= 2; + - Label_HeldItem.Visible = CB_HeldItem.Visible = SAV.Generation > 1; - Label_Total.Visible = TB_IVTotal.Visible = TB_EVTotal.Visible = L_Potential.Visible = SAV.Generation > 2; - Label_HiddenPowerPrefix.Visible = CB_HPType.Visible = SAV.Generation > 1; - CB_HPType.Enabled = CB_Form.Enabled = SAV.Generation > 2; - Label_CharacteristicPrefix.Visible = L_Characteristic.Visible = SAV.Generation > 2; - Label_ContestStats.Visible = Label_Cool.Visible = Label_Tough.Visible = Label_Smart.Visible = - Label_Sheen.Visible = Label_Beauty.Visible = Label_Cute.Visible = TB_Cool.Visible = TB_Tough.Visible = - TB_Smart.Visible = TB_Sheen.Visible = TB_Beauty.Visible = TB_Cute.Visible = Label_Nature.Visible = - CB_Nature.Visible = Label_Language.Visible = CB_Language.Visible = Label_Ability.Visible = - BTN_RerollPID.Visible = Label_PID.Visible = TB_PID.Visible = Label_SID.Visible = TB_SID.Visible = SAV.Generation >= 3; + CHK_IsEgg.Visible = Label_Gender.Visible = SAV.Generation >= 2; - Label_Friendship.Visible = Label_HatchCounter.Visible = TB_Friendship.Visible = SAV.Generation >= 2; // Met Tab - CHK_Fateful.Visible = Label_OriginGame.Visible = Label_Ball.Visible = - CB_Ball.Visible = CB_GameOrigin.Visible = SAV.Generation > 2; - Label_MetLocation.Visible = CB_MetLocation.Visible = Label_MetLevel.Visible = TB_MetLevel.Visible = Label_OTGender.Visible = - SAV.Generation > 1; + FLP_MetDate.Visible = SAV.Generation >= 4; + FLP_Fateful.Visible = FLP_Ball.Visible = FLP_OriginGame.Visible = SAV.Generation >= 3; + FLP_MetLocation.Visible = FLP_MetLevel.Visible = SAV.Generation >= 2; + FLP_TimeOfDay.Visible = SAV.Generation == 2; - L_MetTimeOfDay.Visible = CB_MetTimeOfDay.Visible = SAV.Generation == 2; + // Stats + FLP_StatsTotal.Visible = SAV.Generation >= 3; + FLP_Characteristic.Visible = SAV.Generation >= 3; + FLP_HPType.Visible = SAV.Generation >= 2; - if (SAV.Generation == 2) - { - var met_list = getLocationList(SAV.Version, SAV.Generation, egg: false); - CB_MetLocation.DisplayMember = "Text"; - CB_MetLocation.ValueMember = "Value"; - CB_MetLocation.DataSource = new BindingSource(met_list, null); - } - - CHK_Infected.Visible = CHK_Cured.Visible = SAV.Generation >= 3; + PAN_Contest.Visible = SAV.Generation >= 3; // Second daycare slot - SlotPictureBoxes[43].Visible = SAV.Generation > 1; - - CHK_IsEgg.Visible = Label_Gender.Visible = SAV.Generation > 1; - + SlotPictureBoxes[43].Visible = SAV.Generation >= 2; if (sav.Generation == 1) { - Label_SPD.Visible = TB_SPDEV.Visible = TB_SPDIV.Visible = Stat_SPD.Visible = false; - Label_SPA.Text = "Spc:"; + FLP_SpD.Visible = false; + Label_SPA.Visible = false; + Label_SPC.Visible = true; TB_HPIV.ReadOnly = true; MaskedTextBox[] evControls = { TB_SPAEV, TB_HPEV, TB_ATKEV, TB_DEFEV, TB_SPEEV, TB_SPDEV }; foreach (var ctrl in evControls) { ctrl.Mask = "00000"; - ctrl.Size = new Size(37, 20); + ctrl.Size = Stat_HP.Size; } - Control[] statControls = {Stat_HP, Stat_ATK, Stat_DEF, Stat_SPA, Stat_SPD, Stat_SPE}; - foreach (Control ctrl in statControls) - ctrl.Location = new Point(173, ctrl.Location.Y); - Label_Stats.Location = new Point(168, Label_Stats.Location.Y); } else if (sav.Generation == 2) { - Label_SPD.Visible = TB_SPDEV.Visible = TB_SPDIV.Visible = Stat_SPD.Visible = true; - Label_SPA.Text = "SpA:"; + FLP_SpD.Visible = true; + Label_SPA.Visible = true; + Label_SPC.Visible = false; TB_SPDEV.ReadOnly = TB_SPDIV.ReadOnly = true; TB_HPIV.ReadOnly = true; MaskedTextBox[] evControls = { TB_SPAEV, TB_HPEV, TB_ATKEV, TB_DEFEV, TB_SPEEV, TB_SPDEV }; foreach (var ctrl in evControls) { ctrl.Mask = "00000"; - ctrl.Size = new Size(37, 20); + ctrl.Size = Stat_HP.Size; } - Control[] statControls = { Stat_HP, Stat_ATK, Stat_DEF, Stat_SPA, Stat_SPD, Stat_SPE }; - foreach (Control ctrl in statControls) - ctrl.Location = new Point(173, ctrl.Location.Y); - Label_Stats.Location = new Point(168, Label_Stats.Location.Y); } else { - Label_SPD.Visible = TB_SPDEV.Visible = TB_SPDIV.Visible = Stat_SPD.Visible = true; - Label_SPA.Text = "SpA:"; + FLP_SpD.Visible = true; + Label_SPA.Visible = true; + Label_SPC.Visible = false; TB_SPDEV.ReadOnly = TB_SPDIV.ReadOnly = false; TB_HPIV.ReadOnly = false; MaskedTextBox[] evControls = { TB_SPAEV, TB_HPEV, TB_ATKEV, TB_DEFEV, TB_SPEEV, TB_SPDEV }; foreach (var ctrl in evControls) { ctrl.Mask = "000"; - ctrl.Size = new Size(31, 20); + ctrl.Size = TB_ExtraByte.Size; } - Control[] statControls = { Stat_HP, Stat_ATK, Stat_DEF, Stat_SPA, Stat_SPD, Stat_SPE }; - foreach (Control ctrl in statControls) - ctrl.Location = new Point(167, ctrl.Location.Y); - Label_Stats.Location = new Point(162, Label_Stats.Location.Y); } // Recenter PKM SubEditors @@ -1397,6 +1380,9 @@ public void populateFields(PKM pk, bool focus = true) } fieldsLoaded = true; + Label_HatchCounter.Visible = CHK_IsEgg.Checked && SAV.Generation > 1; + Label_Friendship.Visible = !CHK_IsEgg.Checked && SAV.Generation > 1; + // Set the Preview Box dragout.Image = pk.Sprite; updateLegality(); @@ -2461,7 +2447,7 @@ private void validateComboBox(object sender) { cb.SelectedIndex = 0; return; } cb.BackColor = cb.SelectedValue == null ? Color.DarkSalmon : defaultControlWhite; } - private void validateComboBox(object sender, EventArgs e) + private void validateComboBox(object sender, System.ComponentModel.CancelEventArgs e) { if (!(sender is ComboBox)) return; @@ -2475,7 +2461,7 @@ private void validateComboBox2(object sender, EventArgs e) { if (!fieldsInitialized) return; - validateComboBox(sender, e); + validateComboBox(sender, null); if (fieldsLoaded) { if (sender == CB_Ability && SAV.Generation >= 6) diff --git a/PKHeX/MainWindow/Main.resx b/PKHeX/MainWindow/Main.resx index 6659fcbca..3cf020fe4 100644 --- a/PKHeX/MainWindow/Main.resx +++ b/PKHeX/MainWindow/Main.resx @@ -120,31 +120,22 @@ True - + True - + True - + True - + True - + True - - True - - - True - - - True - - + True @@ -153,217 +144,88 @@ True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - + True True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + True True - + True - + True - + True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - + True @@ -386,72 +248,189 @@ GigXDIB8F3QxIgADAwC7NFU/mWb72QAAAABJRU5ErkJggg== - + True - + True - + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + True True + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + + True + + + True + + + True + + + True + + + True + + + True + + True True - - True - True @@ -479,19 +458,10 @@ True - + True - - True - - - True - - - True - - + True @@ -500,55 +470,70 @@ True + + True + True + + True + + + True + + + True + True + + True + + + True + + + True + True + + True + + + True + + + True + True + + True + + + True + + + True + + + True + + + True + True - + True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - + True @@ -569,42 +554,6 @@ True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - True @@ -626,84 +575,6 @@ True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - True @@ -722,42 +593,6 @@ True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - True @@ -779,64 +614,226 @@ True - + True - - True - - - True - - - True - - + True True - + True - + True - + True - + True - - True - - + True True + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + True - + True - + True - + True - + True - + True - + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + True @@ -1104,15 +1101,6 @@ True - - True - - - True - - - True - True diff --git a/PKHeX/MainWindow/MainPK5.cs b/PKHeX/MainWindow/MainPK5.cs index 286871469..37764677e 100644 --- a/PKHeX/MainWindow/MainPK5.cs +++ b/PKHeX/MainWindow/MainPK5.cs @@ -136,6 +136,7 @@ private void populateFieldsPK5() TB_EXP.Text = pk5.EXP.ToString(); Label_Gender.Text = gendersymbols[pk5.Gender]; Label_Gender.ForeColor = pk5.Gender == 2 ? Label_Species.ForeColor : (pk5.Gender == 1 ? Color.Red : Color.Blue); + CHK_NSparkle.Checked = pk5.NPokémon; if (HaX) DEV_Ability.SelectedValue = pk5.Ability; @@ -240,6 +241,8 @@ private PKM preparePK5() pk5.Version = Util.getIndex(CB_GameOrigin); pk5.Language = Util.getIndex(CB_Language); + pk5.NPokémon = CHK_NSparkle.Checked; + // Toss in Party Stats Array.Resize(ref pk5.Data, pk5.SIZE_PARTY); pk5.Stat_Level = Util.ToInt32(TB_Level.Text); From 36a3757418fb750df814ed07806a73a050975fe8 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Mon, 5 Sep 2016 15:27:02 -0700 Subject: [PATCH 15/35] 2digit minute/second as to not show 20:6:2 (20:06:02) As shown in #233 first picture --- PKHeX/Saves/SaveFile.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKHeX/Saves/SaveFile.cs b/PKHeX/Saves/SaveFile.cs index 4e142c077..250d68dd1 100644 --- a/PKHeX/Saves/SaveFile.cs +++ b/PKHeX/Saves/SaveFile.cs @@ -20,7 +20,7 @@ public abstract class SaveFile public abstract string Filter { get; } public byte[] Footer { protected get; set; } = new byte[0]; // .dsv public bool Japanese { protected get; set; } - public string PlayTimeString => $"{PlayedHours}ː{PlayedMinutes}ː{PlayedSeconds}"; // not : + public string PlayTimeString => $"{PlayedHours}ː{PlayedMinutes.ToString("00")}ː{PlayedSeconds.ToString("00")}"; // not : public bool GetJapanese => Japanese; From 24126c1e96abe4976b6f04ded396a13a7c64918d Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Mon, 5 Sep 2016 15:27:22 -0700 Subject: [PATCH 16/35] Fix gen4 met location datasource providing Copy paste copy paste copy paste Closes #233 --- 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 d0fb9f7dd..99995e4c7 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -2144,18 +2144,18 @@ private IEnumerable getLocationList(GameVersion Version, int SaveForm case GameVersion.D: case GameVersion.P: if (SaveFormat == 4 || (SaveFormat >= 5 && egg)) - return metGen4.Take(4).Concat(metGen6.Skip(4).OrderByDescending(loc => loc.Value <= 111)); // Battle Park + return metGen4.Take(4).Concat(metGen4.Skip(4).OrderByDescending(loc => loc.Value <= 111)); // Battle Park break; case GameVersion.Pt: if (SaveFormat == 4 || (SaveFormat >= 5 && egg)) - return metGen4.Take(4).Concat(metGen6.Skip(4).OrderByDescending(loc => loc.Value <= 125)); // Rock Peak Ruins + return metGen4.Take(4).Concat(metGen4.Skip(4).OrderByDescending(loc => loc.Value <= 125)); // Rock Peak Ruins break; case GameVersion.HG: case GameVersion.SS: if (SaveFormat == 4 || (SaveFormat >= 5 && egg)) - return metGen4.Take(4).Concat(metGen6.Skip(4).OrderByDescending(loc => loc.Value > 125 && loc.Value < 234)); // Celadon Dept. + return metGen4.Take(4).Concat(metGen4.Skip(4).OrderByDescending(loc => loc.Value > 125 && loc.Value < 234)); // Celadon Dept. break; case GameVersion.B: From ed76235e9adfcf37fa9091ffddd71b47de8fae14 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Mon, 5 Sep 2016 15:46:38 -0700 Subject: [PATCH 17/35] Minor hax tweaks Display overrides for visual neatness why resx do you keep modifying yourself --- PKHeX/MainWindow/Main.Designer.cs | 4 +-- PKHeX/MainWindow/Main.cs | 5 +++ PKHeX/MainWindow/Main.resx | 60 +++++++++++++++---------------- 3 files changed, 37 insertions(+), 32 deletions(-) diff --git a/PKHeX/MainWindow/Main.Designer.cs b/PKHeX/MainWindow/Main.Designer.cs index 6c9e18c95..287945846 100644 --- a/PKHeX/MainWindow/Main.Designer.cs +++ b/PKHeX/MainWindow/Main.Designer.cs @@ -1157,14 +1157,14 @@ public void InitializeComponent() this.DEV_Ability.Location = new System.Drawing.Point(0, 21); this.DEV_Ability.Margin = new System.Windows.Forms.Padding(0); this.DEV_Ability.Name = "DEV_Ability"; - this.DEV_Ability.Size = new System.Drawing.Size(122, 21); + this.DEV_Ability.Size = new System.Drawing.Size(126, 21); this.DEV_Ability.TabIndex = 14; this.DEV_Ability.Visible = false; // // TB_AbilityNumber // this.TB_AbilityNumber.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_AbilityNumber.Location = new System.Drawing.Point(122, 21); + this.TB_AbilityNumber.Location = new System.Drawing.Point(126, 21); this.TB_AbilityNumber.Margin = new System.Windows.Forms.Padding(0); this.TB_AbilityNumber.Mask = "0"; this.TB_AbilityNumber.Name = "TB_AbilityNumber"; diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index 99995e4c7..eab904893 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -870,6 +870,8 @@ private void loadSAV(SaveFile sav, string path) GB_nOT.Visible = GB_RelearnMoves.Visible = BTN_Medals.Visible = BTN_History.Visible = SAV.Generation >= 6; PB_Legal.Visible = PB_WarnMove1.Visible = PB_WarnMove2.Visible = PB_WarnMove3.Visible = PB_WarnMove4.Visible = SAV.Generation >= 6; TB_AbilityNumber.Visible = SAV.Generation >= 6 && DEV_Ability.Enabled; + if (HaX && SAV.Generation >= 6) + TB_AbilityNumber.Visible = true; PB_MarkPentagon.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; @@ -1414,6 +1416,9 @@ private void setForms() CB_Form.Enabled = CB_Form.Visible = Label_Form.Visible = hasForms; if (SAV.Generation == 2) CB_Form.Enabled = false; + + if (HaX) + Label_Form.Visible = true; if (!hasForms) return; diff --git a/PKHeX/MainWindow/Main.resx b/PKHeX/MainWindow/Main.resx index 3cf020fe4..b8929a07f 100644 --- a/PKHeX/MainWindow/Main.resx +++ b/PKHeX/MainWindow/Main.resx @@ -144,6 +144,24 @@ True + + True + + + True + + + True + + + True + + + True + + + True + True @@ -326,36 +344,6 @@ True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - True @@ -428,6 +416,18 @@ True + + True + + + True + + + True + + + True + True From fb313edeac1e10d0ec92afddb08379da458ea44d Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Mon, 5 Sep 2016 15:50:09 -0700 Subject: [PATCH 18/35] Fix 1 -> 2 Conversion bug, gender issues (Closes #232) --- PKHeX/PKM/PK1.cs | 2 +- PKHeX/PKM/PK2.cs | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/PKHeX/PKM/PK1.cs b/PKHeX/PKM/PK1.cs index addf1c119..c8c3f07fa 100644 --- a/PKHeX/PKM/PK1.cs +++ b/PKHeX/PKM/PK1.cs @@ -284,7 +284,7 @@ public PK2 convertToPK2() pk2.CurrentFriendship = PersonalTable.C[Species].BaseFriendship; // Pokerus = 0 // Caught Data = 0 - pk2.Stat_Level = Stat_Level; + pk2.Stat_Level = PKX.getLevel(Species, EXP); Array.Copy(otname, 0, pk2.otname, 0, otname.Length); Array.Copy(nick, 0, pk2.nick, 0, nick.Length); diff --git a/PKHeX/PKM/PK2.cs b/PKHeX/PKM/PK2.cs index a6319b95c..d5c32897f 100644 --- a/PKHeX/PKM/PK2.cs +++ b/PKHeX/PKM/PK2.cs @@ -215,18 +215,18 @@ public override bool getGenderIsValid() if (gv == 255) return Gender == 2; if (gv == 254) - return Gender == 0; - if (gv == 0) return Gender == 1; + if (gv == 0) + return Gender == 0; switch (gv) { - case 191: - return IV_ATK >= 2 ? Gender == 0 : Gender == 1; - case 127: - return IV_ATK >= 5 ? Gender == 0 : Gender == 1; - case 63: - return IV_ATK >= 7 ? Gender == 0 : Gender == 1; case 31: + return IV_ATK >= 2 ? Gender == 0 : Gender == 1; + case 63: + return IV_ATK >= 5 ? Gender == 0 : Gender == 1; + case 127: + return IV_ATK >= 7 ? Gender == 0 : Gender == 1; + case 191: return IV_ATK >= 12 ? Gender == 0 : Gender == 1; } return false; @@ -242,18 +242,18 @@ public override int Gender if (gv == 255) return 2; if (gv == 254) - return 0; - if (gv == 0) return 1; + if (gv == 0) + return 0; switch (gv) { - case 191: - return IV_ATK >= 2 ? 0 : 1; - case 127: - return IV_ATK >= 5 ? 0 : 1; - case 63: - return IV_ATK >= 7 ? 0 : 1; case 31: + return IV_ATK >= 2 ? 0 : 1; + case 63: + return IV_ATK >= 5 ? 0 : 1; + case 127: + return IV_ATK >= 7 ? 0 : 1; + case 191: return IV_ATK >= 12 ? 0 : 1; } Console.WriteLine("Unknown Gender value: " + gv); From 421dbf31f3b6c833eb53d323b37e271593e4b9b7 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Mon, 5 Sep 2016 15:57:28 -0700 Subject: [PATCH 19/35] Fix extrabytes Visible returns false if the tab is not active -- even if it is defined as true in an earlier line, so use Enabled instead. Move the AbilityNumber visibility to the end so that the logic isn't repeated. --- PKHeX/MainWindow/Main.cs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index eab904893..2c8a74190 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -869,9 +869,6 @@ private void loadSAV(SaveFile sav, string path) Label_EncryptionConstant.Visible = BTN_RerollEC.Visible = TB_EC.Visible = SAV.Generation >= 6; GB_nOT.Visible = GB_RelearnMoves.Visible = BTN_Medals.Visible = BTN_History.Visible = SAV.Generation >= 6; PB_Legal.Visible = PB_WarnMove1.Visible = PB_WarnMove2.Visible = PB_WarnMove3.Visible = PB_WarnMove4.Visible = SAV.Generation >= 6; - TB_AbilityNumber.Visible = SAV.Generation >= 6 && DEV_Ability.Enabled; - if (HaX && SAV.Generation >= 6) - TB_AbilityNumber.Visible = true; PB_MarkPentagon.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; @@ -885,7 +882,7 @@ private void loadSAV(SaveFile sav, string path) FLP_Nature.Visible = SAV.Generation >= 3; FLP_Ability.Visible = SAV.Generation >= 3; FLP_Language.Visible = SAV.Generation >= 3; - GB_ExtraBytes.Visible = SAV.Generation >= 3; + GB_ExtraBytes.Enabled = SAV.Generation >= 3; GB_Markings.Visible = SAV.Generation >= 3; BTN_Ribbons.Visible = SAV.Generation >= 3; CB_HPType.Enabled = CB_Form.Enabled = SAV.Generation >= 3; @@ -895,10 +892,11 @@ private void loadSAV(SaveFile sav, string path) FLP_FriendshipForm.Visible = SAV.Generation >= 2; FLP_HeldItem.Visible = SAV.Generation >= 2; - - CHK_IsEgg.Visible = Label_Gender.Visible = SAV.Generation >= 2; + // HaX override, needs to be after DEV_Ability enabled assignment. + TB_AbilityNumber.Visible = SAV.Generation >= 6 && DEV_Ability.Enabled; + // Met Tab FLP_MetDate.Visible = SAV.Generation >= 4; FLP_Fateful.Visible = FLP_Ball.Visible = FLP_OriginGame.Visible = SAV.Generation >= 3; @@ -1014,7 +1012,7 @@ private void loadSAV(SaveFile sav, string path) TB_Level.Visible = !HaX; // Load Extra Byte List - if (GB_ExtraBytes.Visible) + if (GB_ExtraBytes.Enabled) { CB_ExtraBytes.Items.Clear(); foreach (byte b in extraBytes) From 39ed9c4d0dccb57d90b8a7e4140638886d30b17f Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Mon, 5 Sep 2016 17:05:27 -0700 Subject: [PATCH 20/35] Fix Drag&Drop gen1 error Dunno why it manifests itself only in gen<3, but this fixes the index out of range Reference #235 --- 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 2c8a74190..22a25e404 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -3699,7 +3699,7 @@ private void pbBoxSlot_MouseMove(object sender, MouseEventArgs e) getQuickFiller(pb, SAV.getStoredSlot(DragInfo.slotSourceOffset)); pb.BackgroundImage = null; - if (DragInfo.slotDestinationBoxNumber == DragInfo.slotSourceBoxNumber) + if (DragInfo.slotDestinationBoxNumber == DragInfo.slotSourceBoxNumber && DragInfo.slotDestinationSlotNumber > -1) SlotPictureBoxes[DragInfo.slotDestinationSlotNumber].Image = img; if (result == DragDropEffects.Copy) // viewed in tabs, apply 'view' highlight From 75fbaab26fc1aa65a196eced281502493d5fbf37 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Mon, 5 Sep 2016 19:44:15 -0700 Subject: [PATCH 21/35] Reset pkm before repopulating Clear init states too. Also updates program text (window title) to indicate if it is in HaX or not (makes it clear when people take screenshots). --- PKHeX/MainWindow/Main.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index 22a25e404..386301015 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -798,7 +798,7 @@ private void loadSAV(SaveFile sav, string path) SAV.FileName = Path.GetExtension(path) == ".bak" ? Path.GetFileName(path).Split(new[] { " [" }, StringSplitOptions.None)[0] : Path.GetFileName(path); - Text = "PKHeX - " + $"SAV{SAV.Generation}: {Path.GetFileNameWithoutExtension(Util.CleanFileName(SAV.BAKName))}"; // more descriptive + Text = $"PKH{(HaX ? "a" : "e")}X - " + $"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)); @@ -811,7 +811,7 @@ private void loadSAV(SaveFile sav, string path) { SAV.FilePath = null; SAV.FileName = "Blank Save File"; - Text = "PKHeX - " + $"SAV{SAV.Generation}: {SAV.FileName} [{SAV.OT} ({SAV.Version})]"; + Text = $"PKH{(HaX ? "a" : "e")}X - " + $"SAV{SAV.Generation}: {SAV.FileName} [{SAV.OT} ({SAV.Version})]"; GB_SAVtools.Visible = false; } @@ -997,9 +997,10 @@ private void loadSAV(SaveFile sav, string path) break; } bool init = fieldsInitialized; - fieldsInitialized = false; + fieldsInitialized = fieldsLoaded = false; + pkm = (pkm.Format != SAV.Generation || SAV.Generation < 3) ? SAV.BlankPKM : pk; populateFilteredDataSources(); - populateFields((pkm.Format != SAV.Generation || SAV.Generation < 3) ? SAV.BlankPKM : pk); + populateFields(pkm); fieldsInitialized |= init; // SAV Specific Limits From 12fc528d349d383ee38e32c2495d63b2c82aab8d Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Mon, 5 Sep 2016 20:20:56 -0700 Subject: [PATCH 22/35] Tweak HGSS Ball set PGT -> PK4 doesn't have HGSS ball data (value=0) Return the higher of the two When setting, consider the Fateful Encounter status before writing to 0x86 --- PKHeX/PKM/PK4.cs | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/PKHeX/PKM/PK4.cs b/PKHeX/PKM/PK4.cs index 6b5e97c78..e90bf2661 100644 --- a/PKHeX/PKM/PK4.cs +++ b/PKHeX/PKM/PK4.cs @@ -323,19 +323,26 @@ public override int Met_Location public override int PKRS_Strain { get { return PKRS >> 4; } set { PKRS = (byte)(PKRS & 0xF | (value << 4)); } } public override int Ball { - get { return Data[HGSS ? 0x86 : 0x83]; } + get + { + // Pokemon obtained in HGSS have the HGSS ball set (@0x86) + // However, this info is not set when receiving a wondercard! + // The PGT contains a preformatted PK4 file, which is slightly modified. + // No HGSS balls were used, and no HGSS ball info is set. + + // Sneaky way = return the higher of the two values. + return Math.Max(Data[0x86], Data[0x83]); + } set { - if (HGSS) - { - Data[0x83] = (byte)(value <= 0x10 ? value : 4); // Ball to display in DP (cap at Cherish) + // Ball to display in DPPt + Data[0x83] = (byte)(value <= 0x10 ? value : 4); // Cap at Cherish Ball + + // HGSS Exclusive Balls -- If the user wants to screw things up, let them. Any legality checking could catch hax. + if (value > 0x10 || (HGSS && !FatefulEncounter)) 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); } } From 7ef4a73fcd6819aa55fac3cfafae404ff650cb80 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Mon, 5 Sep 2016 23:13:46 -0700 Subject: [PATCH 23/35] Hide met tab for gen1 saves, fix verifiedPKM 6->1->translate->6 needs translation done for the Met tab as it being removed does not list it in the control list when translating, so just trigger it again. Other methods had to be tweaked to not reference the tabMain tabs by index (instead by control names!) Simplify the verifiedPKM method. removes unnecessary goto and fixes recent added bug :) As a side effect the color tracking variables are no longer, now using the ResetForeColor/ResetBackColor methods of the control -- duh --- PKHeX/MainWindow/Main.cs | 71 ++++++++++--------- PKHeX/Subforms/Save Editors/SAV_EventFlags.cs | 2 +- 2 files changed, 39 insertions(+), 34 deletions(-) diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index 386301015..aacfa5508 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -66,8 +66,7 @@ public Main() }; relearnPB = new[] { PB_WarnRelearn1, PB_WarnRelearn2, PB_WarnRelearn3, PB_WarnRelearn4 }; movePB = new[] { PB_WarnMove1, PB_WarnMove2, PB_WarnMove3, PB_WarnMove4 }; - defaultControlWhite = CB_Species.BackColor; - defaultControlText = Label_Species.ForeColor; + Label_Species.ResetForeColor(); // Set up Language Selection foreach (var cbItem in main_langlist) @@ -162,7 +161,6 @@ public Main() #region Important Variables public static PKM pkm = new PK6(); // Tab Pokemon Data Storage public static SaveFile SAV = new SAV6 { Game = (int)GameVersion.AS, OT = "PKHeX", TID = 12345, SID = 54321, Language = 2, Country = 49, SubRegion = 7, ConsoleRegion = 1 }; // Save File - public static Color defaultControlWhite, defaultControlText; public static string eggname = ""; public static string curlanguage = "en"; @@ -790,6 +788,8 @@ private void openSAV(byte[] input, string path) private void loadSAV(SaveFile sav, string path) { PKM pk = preparePKM(); + // clean fields + populateFields(SAV.BlankPKM); SAV = sav; if (path != null) // Actual save file @@ -956,7 +956,7 @@ private void loadSAV(SaveFile sav, string path) } // Recenter PKM SubEditors - FLP_PKMEditors.Location = new Point((tabMain.TabPages[4].Width - FLP_PKMEditors.Width) / 2, FLP_PKMEditors.Location.Y); + FLP_PKMEditors.Location = new Point((Tab_OTMisc.Width - FLP_PKMEditors.Width) / 2, FLP_PKMEditors.Location.Y); switch (SAV.Generation) { @@ -1008,6 +1008,16 @@ private void loadSAV(SaveFile sav, string path) TB_OTt2.MaxLength = SAV.OTLength; TB_Nickname.MaxLength = SAV.NickLength; + // Hide Unused Tabs + if (SAV.Generation == 1 && tabMain.TabPages.Contains(Tab_Met)) + tabMain.TabPages.Remove(Tab_Met); + else if (SAV.Generation != 1 && !tabMain.TabPages.Contains(Tab_Met)) + { + tabMain.TabPages.Insert(1, Tab_Met); + // force update -- re-added tab may be untranslated + Util.TranslateInterface(this, curlanguage); + } + // Common HaX Interface CHK_HackedStats.Enabled = CHK_HackedStats.Visible = MT_Level.Enabled = MT_Level.Visible = MT_Form.Enabled = MT_Form.Visible = HaX; TB_Level.Visible = !HaX; @@ -1065,7 +1075,7 @@ private void changeMainLanguage(object sender, EventArgs e) InitializeLanguage(); Util.TranslateInterface(this, lang_val[CB_MainLanguage.SelectedIndex]); // Translate the UI to language. // Recenter PKM SubEditors - FLP_PKMEditors.Location = new Point((tabMain.TabPages[4].Width - FLP_PKMEditors.Width)/2, FLP_PKMEditors.Location.Y); + FLP_PKMEditors.Location = new Point((Tab_OTMisc.Width - FLP_PKMEditors.Width)/2, FLP_PKMEditors.Location.Y); populateFields(pk); // put data back in form fieldsInitialized |= alreadyInit; } @@ -2261,7 +2271,7 @@ private void updateNatureModification(object sender, EventArgs e) Label[] labarray = { Label_ATK, Label_DEF, Label_SPE, Label_SPA, Label_SPD }; // Reset Label Colors foreach (Label label in labarray) - label.ForeColor = defaultControlText; + label.ResetForeColor(); // Set Colored StatLabels only if Nature isn't Neutral NatureTip.SetToolTip(CB_Nature, @@ -2449,7 +2459,10 @@ private void validateComboBox(object sender) cb.SelectionLength = 0; if (cb.Text == "") { cb.SelectedIndex = 0; return; } - cb.BackColor = cb.SelectedValue == null ? Color.DarkSalmon : defaultControlWhite; + if (cb.SelectedValue == null) + cb.BackColor = Color.DarkSalmon; + else + cb.ResetBackColor(); } private void validateComboBox(object sender, System.ComponentModel.CancelEventArgs e) { @@ -2561,7 +2574,7 @@ private void updateStats() Label[] labarray = { Label_ATK, Label_DEF, Label_SPE, Label_SPA, Label_SPD }; // Reset Label Colors foreach (Label label in labarray) - label.ForeColor = defaultControlText; + label.ResetForeColor(); // Set Colored StatLabels only if Nature isn't Neutral if (incr == decr) return; @@ -2619,38 +2632,30 @@ public bool verifiedPKM() if (ModifierKeys == (Keys.Control | Keys.Shift | Keys.Alt)) return true; // Override // Make sure the PKX Fields are filled out properly (color check) - #region ComboBoxes to verify they are set. ComboBox[] cba = { CB_Species, CB_Nature, CB_HeldItem, CB_Ability, // Main Tab CB_MetLocation, CB_EggLocation, CB_Ball, // Met Tab CB_Move1, CB_Move2, CB_Move3, CB_Move4, // Moves CB_RelearnMove1, CB_RelearnMove2, CB_RelearnMove3, CB_RelearnMove4 // Moves }; - for (int i = 0; i < cba.Length; i++) - { - int back = cba[i].BackColor.ToArgb(); - if (!cba[i].Visible || back == SystemColors.Control.ToArgb() || back == 0 || - !(back != -1 & back != defaultControlWhite.ToArgb())) continue; - if (i < 6) // Main Tab - tabMain.SelectedIndex = 0; - else if (i < 9) // Met Tab - tabMain.SelectedIndex = 1; - else // Moves - tabMain.SelectedIndex = 3; - goto invalid; - } - #endregion - // Further logic checking - if (SAV.Generation >= 3 && Convert.ToUInt32(TB_EVTotal.Text) > 510 && !CHK_HackedStats.Checked) - { tabMain.SelectedIndex = 2; goto invalid; } - // If no errors detected... - if (Util.getIndex(CB_Species) != 0) return true; - // Else - tabMain.SelectedIndex = 0; - // else... - invalid: - { SystemSounds.Exclamation.Play(); return false; } + ComboBox cb = cba.FirstOrDefault(c => c.BackColor == Color.DarkSalmon); + if (cb != null) + { + Control c = cb.Parent; + while (!(c is TabPage)) + c = c.Parent; + tabMain.SelectedTab = c as TabPage; + } + else if (SAV.Generation >= 3 && Convert.ToUInt32(TB_EVTotal.Text) > 510 && !CHK_HackedStats.Checked) + tabMain.SelectedTab = Tab_Stats; + else if (Util.getIndex(CB_Species) == 0) + tabMain.SelectedTab = Tab_Main; + else + return true; + + SystemSounds.Exclamation.Play(); + return false; } public static string[] verifyPKMtoSAV(PKM pk) { diff --git a/PKHeX/Subforms/Save Editors/SAV_EventFlags.cs b/PKHeX/Subforms/Save Editors/SAV_EventFlags.cs index 84504de88..6db4f3a40 100644 --- a/PKHeX/Subforms/Save Editors/SAV_EventFlags.cs +++ b/PKHeX/Subforms/Save Editors/SAV_EventFlags.cs @@ -218,7 +218,7 @@ private void changeCustomFlag(object sender, EventArgs e) else { c_CustomFlag.Enabled = true; - nud.BackColor = Main.defaultControlWhite; + nud.ResetBackColor(); c_CustomFlag.Checked = flags[flag]; } } From 7d4a60efdde73e57a2a286c6cecb2c873f114b48 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Tue, 6 Sep 2016 16:46:00 -0700 Subject: [PATCH 24/35] Tweak IV/EV events #237 Hides the Shiny star on gen1, and re-hides the extrabytes for gen1/2 Adds missing click event for Label_SPC, as it was recently added. Replaces the Label_SPA in gen1. --- PKHeX/MainWindow/Main.Designer.cs | 1 + PKHeX/MainWindow/Main.cs | 29 ++++++++++++++++++++--------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/PKHeX/MainWindow/Main.Designer.cs b/PKHeX/MainWindow/Main.Designer.cs index 287945846..cc4951835 100644 --- a/PKHeX/MainWindow/Main.Designer.cs +++ b/PKHeX/MainWindow/Main.Designer.cs @@ -2381,6 +2381,7 @@ public void InitializeComponent() this.Label_SPC.TabIndex = 125; this.Label_SPC.Text = "SpC:"; this.Label_SPC.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.Label_SPC.MouseDown += new System.Windows.Forms.MouseEventHandler(this.clickStatLabel); // // FLP_SpARight // diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index aacfa5508..07c4e5d89 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -882,7 +882,7 @@ private void loadSAV(SaveFile sav, string path) FLP_Nature.Visible = SAV.Generation >= 3; FLP_Ability.Visible = SAV.Generation >= 3; FLP_Language.Visible = SAV.Generation >= 3; - GB_ExtraBytes.Enabled = SAV.Generation >= 3; + GB_ExtraBytes.Visible = GB_ExtraBytes.Enabled = SAV.Generation >= 3; GB_Markings.Visible = SAV.Generation >= 3; BTN_Ribbons.Visible = SAV.Generation >= 3; CB_HPType.Enabled = CB_Form.Enabled = SAV.Generation >= 3; @@ -894,6 +894,9 @@ private void loadSAV(SaveFile sav, string path) FLP_HeldItem.Visible = SAV.Generation >= 2; CHK_IsEgg.Visible = Label_Gender.Visible = SAV.Generation >= 2; + if (SAV.Generation == 1) + Label_IsShiny.Visible = false; + // HaX override, needs to be after DEV_Ability enabled assignment. TB_AbilityNumber.Visible = SAV.Generation >= 6 && DEV_Ability.Enabled; @@ -1585,32 +1588,40 @@ private void clickStatLabel(object sender, MouseEventArgs e) if (!(ModifierKeys == Keys.Control || ModifierKeys == Keys.Alt)) return; + if (sender == Label_SPC) + sender = Label_SPA; int index = Array.IndexOf(new[] { Label_HP, Label_ATK, Label_DEF, Label_SPA, Label_SPD, Label_SPE }, sender); if (ModifierKeys == Keys.Alt) // EV { - var arrayEV = new[] {TB_HPEV, TB_ATKEV, TB_DEFEV, TB_SPAEV, TB_SPDEV, TB_SPEEV}; - arrayEV[index].Text = (e.Button == MouseButtons.Left - ? Math.Min(Math.Max(510 - Util.ToInt32(TB_EVTotal.Text) + Util.ToInt32(arrayEV[index].Text), 0), 252) - : 0).ToString(); + var mt = new[] {TB_HPEV, TB_ATKEV, TB_DEFEV, TB_SPAEV, TB_SPDEV, TB_SPEEV}[index]; + if (e.Button == MouseButtons.Left) // max + mt.Text = SAV.Generation >= 3 + ? Math.Min(Math.Max(510 - Util.ToInt32(TB_EVTotal.Text) + Util.ToInt32(mt.Text), 0), 252).ToString() + : ushort.MaxValue.ToString(); + else // min + mt.Text = 0.ToString(); } else new[] {TB_HPIV, TB_ATKIV, TB_DEFIV, TB_SPAIV, TB_SPDIV, TB_SPEIV}[index].Text = - (e.Button == MouseButtons.Left ? 31 : 0).ToString(); + (e.Button == MouseButtons.Left ? SAV.MaxIV : 0).ToString(); } private void clickIV(object sender, EventArgs e) { if (ModifierKeys == Keys.Control) - ((MaskedTextBox) sender).Text = 31.ToString(); + ((MaskedTextBox) sender).Text = SAV.MaxIV.ToString(); else if (ModifierKeys == Keys.Alt) ((MaskedTextBox) sender).Text = 0.ToString(); } private void clickEV(object sender, EventArgs e) { + MaskedTextBox mt = (MaskedTextBox)sender; if (ModifierKeys == Keys.Control) // EV - ((MaskedTextBox) sender).Text = Math.Min(Math.Max(510 - Util.ToInt32(TB_EVTotal.Text) + Util.ToInt32((sender as MaskedTextBox).Text), 0), 252).ToString(); + mt.Text = SAV.Generation >= 3 + ? Math.Min(Math.Max(510 - Util.ToInt32(TB_EVTotal.Text) + Util.ToInt32(mt.Text), 0), 252).ToString() + : ushort.MaxValue.ToString(); else if (ModifierKeys == Keys.Alt) - ((MaskedTextBox) sender).Text = 0.ToString(); + mt.Text = 0.ToString(); } private void clickOT(object sender, EventArgs e) { From 06942089fa0a01fbe57ea4e4bfef7e94516d1fb8 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Tue, 6 Sep 2016 17:01:31 -0700 Subject: [PATCH 25/35] Add Event Flag warning Closes #236 Altering Event Flags may impact other story events. Save file backups are recommended. --- .../Save Editors/SAV_EventFlags.Designer.cs | 56 ++++++++++++------- 1 file changed, 36 insertions(+), 20 deletions(-) diff --git a/PKHeX/Subforms/Save Editors/SAV_EventFlags.Designer.cs b/PKHeX/Subforms/Save Editors/SAV_EventFlags.Designer.cs index e341d52a2..338dddf6a 100644 --- a/PKHeX/Subforms/Save Editors/SAV_EventFlags.Designer.cs +++ b/PKHeX/Subforms/Save Editors/SAV_EventFlags.Designer.cs @@ -49,9 +49,10 @@ private void InitializeComponent() this.B_LoadNew = new System.Windows.Forms.Button(); this.B_LoadOld = new System.Windows.Forms.Button(); this.GB_Flags = new System.Windows.Forms.GroupBox(); + this.TLP_Flags = new System.Windows.Forms.TableLayoutPanel(); this.GB_Constants = new System.Windows.Forms.GroupBox(); this.TLP_Const = new System.Windows.Forms.TableLayoutPanel(); - this.TLP_Flags = new System.Windows.Forms.TableLayoutPanel(); + this.L_EventFlagWarn = new System.Windows.Forms.Label(); this.GB_FlagStatus.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.nud)).BeginInit(); this.GB_Researcher.SuspendLayout(); @@ -271,21 +272,38 @@ private void InitializeComponent() this.GB_Flags.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); this.GB_Flags.Controls.Add(this.TLP_Flags); - this.GB_Flags.Location = new System.Drawing.Point(12, 12); + this.GB_Flags.Location = new System.Drawing.Point(12, 24); this.GB_Flags.Name = "GB_Flags"; - this.GB_Flags.Size = new System.Drawing.Size(212, 210); + this.GB_Flags.Size = new System.Drawing.Size(212, 198); this.GB_Flags.TabIndex = 39; this.GB_Flags.TabStop = false; this.GB_Flags.Text = "Event Flags"; // + // TLP_Flags + // + this.TLP_Flags.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.TLP_Flags.AutoScroll = true; + this.TLP_Flags.ColumnCount = 2; + this.TLP_Flags.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.TLP_Flags.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.TLP_Flags.Location = new System.Drawing.Point(6, 19); + this.TLP_Flags.Name = "TLP_Flags"; + this.TLP_Flags.RowCount = 2; + this.TLP_Flags.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.TLP_Flags.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.TLP_Flags.Size = new System.Drawing.Size(200, 172); + this.TLP_Flags.TabIndex = 0; + // // GB_Constants // this.GB_Constants.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); this.GB_Constants.Controls.Add(this.TLP_Const); - this.GB_Constants.Location = new System.Drawing.Point(235, 12); + this.GB_Constants.Location = new System.Drawing.Point(235, 24); this.GB_Constants.Name = "GB_Constants"; - this.GB_Constants.Size = new System.Drawing.Size(212, 210); + this.GB_Constants.Size = new System.Drawing.Size(212, 198); this.GB_Constants.TabIndex = 40; this.GB_Constants.TabStop = false; this.GB_Constants.Text = "Event Constants"; @@ -303,31 +321,28 @@ private void InitializeComponent() this.TLP_Const.Name = "TLP_Const"; this.TLP_Const.RowCount = 1; this.TLP_Const.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.TLP_Const.Size = new System.Drawing.Size(200, 184); + this.TLP_Const.Size = new System.Drawing.Size(200, 172); this.TLP_Const.TabIndex = 0; // - // TLP_Flags + // L_EventFlagWarn // - this.TLP_Flags.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) + this.L_EventFlagWarn.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.TLP_Flags.AutoScroll = true; - this.TLP_Flags.ColumnCount = 2; - this.TLP_Flags.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.TLP_Flags.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.TLP_Flags.Location = new System.Drawing.Point(6, 19); - this.TLP_Flags.Name = "TLP_Flags"; - this.TLP_Flags.RowCount = 2; - this.TLP_Flags.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.TLP_Flags.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.TLP_Flags.Size = new System.Drawing.Size(200, 184); - this.TLP_Flags.TabIndex = 0; + this.L_EventFlagWarn.ForeColor = System.Drawing.Color.Red; + this.L_EventFlagWarn.Location = new System.Drawing.Point(12, 1); + this.L_EventFlagWarn.Name = "L_EventFlagWarn"; + this.L_EventFlagWarn.Size = new System.Drawing.Size(435, 20); + this.L_EventFlagWarn.TabIndex = 41; + this.L_EventFlagWarn.Text = "Altering Event Flags may impact other story events. Save file backups are recomme" + + "nded."; + this.L_EventFlagWarn.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // SAV_EventFlags // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(454, 351); + this.Controls.Add(this.L_EventFlagWarn); this.Controls.Add(this.GB_Constants); this.Controls.Add(this.GB_Flags); this.Controls.Add(this.GB_Researcher); @@ -378,5 +393,6 @@ private void InitializeComponent() private System.Windows.Forms.GroupBox GB_Constants; private System.Windows.Forms.TableLayoutPanel TLP_Const; private System.Windows.Forms.TableLayoutPanel TLP_Flags; + private System.Windows.Forms.Label L_EventFlagWarn; } } \ No newline at end of file From b483cd8002997f95372f8afb79bf3382b9ef0ca8 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Tue, 6 Sep 2016 17:19:30 -0700 Subject: [PATCH 26/35] Check if 'wc6' exists Thanks Destinyy! --- PKHeX/Subforms/SAV_MysteryGiftDB.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/PKHeX/Subforms/SAV_MysteryGiftDB.cs b/PKHeX/Subforms/SAV_MysteryGiftDB.cs index 0b64d2ef1..ad1a579b6 100644 --- a/PKHeX/Subforms/SAV_MysteryGiftDB.cs +++ b/PKHeX/Subforms/SAV_MysteryGiftDB.cs @@ -76,6 +76,8 @@ public SAV_MysteryGiftDB(Main f1) // Load Data RawDB = new List(); RawDB.AddRange(Legal.WC6DB); + + if (Directory.Exists(DatabasePath)) foreach (string file in Directory.GetFiles(DatabasePath, "*", SearchOption.AllDirectories)) { FileInfo fi = new FileInfo(file); From 8b608389eb5c39d89e8f2a56632cee7f610ef99f Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Tue, 6 Sep 2016 19:35:36 -0700 Subject: [PATCH 27/35] Fix box dumping/loading for Gens I/II --- PKHeX/MainWindow/Main.cs | 2 +- PKHeX/Saves/SaveFile.cs | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index 07c4e5d89..d44571465 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -3394,7 +3394,7 @@ private void dumpBoxesToDB(string path, bool individualBoxFolders) Directory.CreateDirectory(Path.Combine(path, boxfolder)); } if (!File.Exists(Path.Combine(Path.Combine(path, boxfolder), fileName))) - File.WriteAllBytes(Path.Combine(Path.Combine(path, boxfolder), fileName), pk.Data.Take(SAV.SIZE_STORED).ToArray()); + File.WriteAllBytes(Path.Combine(Path.Combine(path, boxfolder), fileName), pk.DecryptedBoxData); } } private void loadBoxesFromDB(string path) diff --git a/PKHeX/Saves/SaveFile.cs b/PKHeX/Saves/SaveFile.cs index 250d68dd1..15c3229f4 100644 --- a/PKHeX/Saves/SaveFile.cs +++ b/PKHeX/Saves/SaveFile.cs @@ -466,7 +466,14 @@ public bool setPCBin(byte[] data) PKM[] pkms = BoxData; for (int i = 0; i < pkms.Length; i++) - pkms[i].Data = decryptPKM(pkdata[i]); + { + if (Generation == 1) + pkms[i] = new PokemonList1(decryptPKM(pkdata[i]))[0]; + else if (Generation == 2) + pkms[i] = new PokemonList2(decryptPKM(pkdata[i]))[0]; + else + pkms[i].Data = decryptPKM(pkdata[i]); + } BoxData = pkms; return true; } @@ -484,7 +491,14 @@ public bool setBoxBin(byte[] data, int box) PKM[] pkms = BoxData; for (int i = 0; i < BoxSlotCount; i++) - pkms[box*BoxSlotCount + i].Data = decryptPKM(pkdata[i]); + { + if (Generation == 1) + pkms[box * BoxSlotCount + i] = new PokemonList1(decryptPKM(pkdata[i]))[0]; + else if (Generation == 2) + pkms[box * BoxSlotCount + i] = new PokemonList2(decryptPKM(pkdata[i]))[0]; + else + pkms[box * BoxSlotCount + i].Data = decryptPKM(pkdata[i]); + } BoxData = pkms; return true; } From b2860ea3de21d45015de51d2631ad82fea285ba5 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Tue, 6 Sep 2016 19:40:54 -0700 Subject: [PATCH 28/35] Simplify box bin loading --- PKHeX/Saves/SaveFile.cs | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/PKHeX/Saves/SaveFile.cs b/PKHeX/Saves/SaveFile.cs index 15c3229f4..59fcae316 100644 --- a/PKHeX/Saves/SaveFile.cs +++ b/PKHeX/Saves/SaveFile.cs @@ -466,14 +466,7 @@ public bool setPCBin(byte[] data) PKM[] pkms = BoxData; for (int i = 0; i < pkms.Length; i++) - { - if (Generation == 1) - pkms[i] = new PokemonList1(decryptPKM(pkdata[i]))[0]; - else if (Generation == 2) - pkms[i] = new PokemonList2(decryptPKM(pkdata[i]))[0]; - else - pkms[i].Data = decryptPKM(pkdata[i]); - } + pkms[i] = getPKM(decryptPKM(pkdata[i])); BoxData = pkms; return true; } @@ -491,14 +484,7 @@ public bool setBoxBin(byte[] data, int box) PKM[] pkms = BoxData; for (int i = 0; i < BoxSlotCount; i++) - { - if (Generation == 1) - pkms[box * BoxSlotCount + i] = new PokemonList1(decryptPKM(pkdata[i]))[0]; - else if (Generation == 2) - pkms[box * BoxSlotCount + i] = new PokemonList2(decryptPKM(pkdata[i]))[0]; - else - pkms[box * BoxSlotCount + i].Data = decryptPKM(pkdata[i]); - } + pkms[box*BoxSlotCount + i] = getPKM(decryptPKM(pkdata[i])); BoxData = pkms; return true; } From 822fc47dc413c2edfbd9ac2d10d5e8ef23795edc Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Tue, 6 Sep 2016 19:52:03 -0700 Subject: [PATCH 29/35] Remove invalid pk sizes export always is in list format for gen1/2, these were introduced in https://github.com/kwsch/PKHeX/commit/9b6552d3146f73c2a33f5254f0b673f8f08d9891 which was an incorrect 'fix' for getting files dumped from dumpBoxesToDB to show up in SAV_Database. This underlying issue has been resolved with the two previous commits. --- PKHeX/PKM/PKMConverter.cs | 4 ---- PKHeX/PKM/PKX.cs | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/PKHeX/PKM/PKMConverter.cs b/PKHeX/PKM/PKMConverter.cs index bd3e14b73..7ab96784a 100644 --- a/PKHeX/PKM/PKMConverter.cs +++ b/PKHeX/PKM/PKMConverter.cs @@ -33,13 +33,9 @@ public static int getPKMDataFormat(byte[] data) { case PKX.SIZE_1JLIST: case PKX.SIZE_1ULIST: - case PKX.SIZE_1PARTY: - case PKX.SIZE_1STORED: return 1; case PKX.SIZE_2ULIST: case PKX.SIZE_2JLIST: - case PKX.SIZE_2PARTY: - case PKX.SIZE_2STORED: return 2; case PKX.SIZE_3PARTY: case PKX.SIZE_3STORED: diff --git a/PKHeX/PKM/PKX.cs b/PKHeX/PKM/PKX.cs index 1c9a62d9f..73c066406 100644 --- a/PKHeX/PKM/PKX.cs +++ b/PKHeX/PKM/PKX.cs @@ -45,8 +45,8 @@ public static bool getIsPKM(long len) { return new[] { - SIZE_1JLIST, SIZE_1ULIST, SIZE_1PARTY, SIZE_1STORED, - SIZE_2ULIST, SIZE_2JLIST, SIZE_2PARTY, SIZE_2STORED, + SIZE_1JLIST, SIZE_1ULIST, + SIZE_2ULIST, SIZE_2JLIST, SIZE_3STORED, SIZE_3PARTY, SIZE_4STORED, SIZE_4PARTY, SIZE_5PARTY, From de6205ac4b24108492d3a97cfaeddcc623dc745f Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Wed, 7 Sep 2016 09:10:38 -0700 Subject: [PATCH 30/35] Fix gen1/2 visibility Closes #242 Thanks @sora10pls ! --- PKHeX/MainWindow/Main.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index d44571465..cab5d0a59 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -886,13 +886,13 @@ private void loadSAV(SaveFile sav, string path) GB_Markings.Visible = SAV.Generation >= 3; BTN_Ribbons.Visible = SAV.Generation >= 3; CB_HPType.Enabled = CB_Form.Enabled = SAV.Generation >= 3; - FLP_PKRSRight.Visible = SAV.Generation >= 3; - FLP_PKRS.Visible = SAV.Generation >= 3; BTN_RerollPID.Visible = Label_PID.Visible = TB_PID.Visible = Label_SID.Visible = TB_SID.Visible = SAV.Generation >= 3; FLP_FriendshipForm.Visible = SAV.Generation >= 2; FLP_HeldItem.Visible = SAV.Generation >= 2; CHK_IsEgg.Visible = Label_Gender.Visible = SAV.Generation >= 2; + FLP_PKRS.Visible = FLP_EggPKRSRight.Visible = SAV.Generation >= 2; + Label_OTGender.Visible = SAV.Generation >= 2; if (SAV.Generation == 1) Label_IsShiny.Visible = false; From f0d13da35a2475c89c94fce4dd9d1f34d7f85010 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Thu, 8 Sep 2016 20:20:32 -0700 Subject: [PATCH 31/35] MaxMoney capping 1-4 Closes #245 Thanks @sora10pls ! --- PKHeX/Saves/SAV1.cs | 1 + PKHeX/Saves/SAV2.cs | 1 + PKHeX/Saves/SAV3.cs | 1 + PKHeX/Saves/SAV4.cs | 1 + PKHeX/Saves/SaveFile.cs | 1 + PKHeX/Subforms/Save Editors/SAV_SimpleTrainer.cs | 3 ++- 6 files changed, 7 insertions(+), 1 deletion(-) diff --git a/PKHeX/Saves/SAV1.cs b/PKHeX/Saves/SAV1.cs index e65d73f61..a0a737add 100644 --- a/PKHeX/Saves/SAV1.cs +++ b/PKHeX/Saves/SAV1.cs @@ -167,6 +167,7 @@ public override byte[] Write(bool DSV) public override int MaxItemID => 255; public override int MaxBallID => 0; public override int MaxGameID => 99; // What do I set this to...? + public override int MaxMoney => 999999; public override int BoxCount => Japanese ? 8 : 12; public override int MaxEV => 65535; diff --git a/PKHeX/Saves/SAV2.cs b/PKHeX/Saves/SAV2.cs index 87367195c..24426483f 100644 --- a/PKHeX/Saves/SAV2.cs +++ b/PKHeX/Saves/SAV2.cs @@ -216,6 +216,7 @@ private void getSAVOffsets() public override int MaxItemID => 255; public override int MaxBallID => 0; public override int MaxGameID => 99; // What do I set this to...? + public override int MaxMoney => 999999; public override int BoxCount => Japanese ? 9 : 14; public override int MaxEV => 65535; diff --git a/PKHeX/Saves/SAV3.cs b/PKHeX/Saves/SAV3.cs index f9e041d1f..9ea4cbdec 100644 --- a/PKHeX/Saves/SAV3.cs +++ b/PKHeX/Saves/SAV3.cs @@ -172,6 +172,7 @@ public override byte[] Write(bool DSV) protected override int GiftCountMax => 1; public override int OTLength => 8; public override int NickLength => 10; + public override int MaxMoney => 999999; public override bool HasParty => true; diff --git a/PKHeX/Saves/SAV4.cs b/PKHeX/Saves/SAV4.cs index d9a215e0a..f0e415884 100644 --- a/PKHeX/Saves/SAV4.cs +++ b/PKHeX/Saves/SAV4.cs @@ -53,6 +53,7 @@ public SAV4(byte[] data = null, GameVersion versionOverride = GameVersion.Any) protected override int GiftCountMax => 11; public override int OTLength => 8; public override int NickLength => 10; + public override int MaxMoney => 999999; public override int MaxMoveID => 467; public override int MaxSpeciesID => 493; diff --git a/PKHeX/Saves/SaveFile.cs b/PKHeX/Saves/SaveFile.cs index 59fcae316..ae2ea1090 100644 --- a/PKHeX/Saves/SaveFile.cs +++ b/PKHeX/Saves/SaveFile.cs @@ -105,6 +105,7 @@ public virtual byte[] Write(bool DSV) public virtual int DaycareSeedSize { get; } = 0; public abstract int OTLength { get; } public abstract int NickLength { get; } + public virtual int MaxMoney { get; } = 9999999; // Offsets protected int Box { get; set; } = int.MinValue; diff --git a/PKHeX/Subforms/Save Editors/SAV_SimpleTrainer.cs b/PKHeX/Subforms/Save Editors/SAV_SimpleTrainer.cs index feda2adf8..bbfa1e24c 100644 --- a/PKHeX/Subforms/Save Editors/SAV_SimpleTrainer.cs +++ b/PKHeX/Subforms/Save Editors/SAV_SimpleTrainer.cs @@ -13,7 +13,8 @@ public SAV_SimpleTrainer() cba = new[] {CHK_1, CHK_2, CHK_3, CHK_4, CHK_5, CHK_6, CHK_7, CHK_8}; TB_OTName.MaxLength = SAV.OTLength; - B_MaxCash.Click += (sender, e) => MT_Money.Text = "9,999,999"; + B_MaxCash.Click += (sender, e) => MT_Money.Text = SAV.MaxMoney.ToString(); + MT_Money.Mask = "00000000000".Substring(0, SAV.MaxMoney.ToString().Length); B_MaxCoins.Click += (sender, e) => MT_Coins.Text = "9999"; CB_Gender.Items.Clear(); From eaa12f59bddce2801a454a3d91ed1062ad838ca6 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Thu, 8 Sep 2016 20:29:12 -0700 Subject: [PATCH 32/35] Disallow out-of-bounds puff values Closes #246 Might as well use the SAV property "Puffs" when loading instead of only when saving. --- PKHeX/Subforms/Save Editors/Gen6/SAV_Pokepuff.cs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/PKHeX/Subforms/Save Editors/Gen6/SAV_Pokepuff.cs b/PKHeX/Subforms/Save Editors/Gen6/SAV_Pokepuff.cs index 915668503..cfbaef4ee 100644 --- a/PKHeX/Subforms/Save Editors/Gen6/SAV_Pokepuff.cs +++ b/PKHeX/Subforms/Save Editors/Gen6/SAV_Pokepuff.cs @@ -48,11 +48,18 @@ private void Setup() dgv.Columns.Add(dgvIndex); dgv.Columns.Add(dgvPuff); - dgv.Rows.Add(100); - for (int i = 0; i < 100; i++) + var Puffs = SAV.Puffs; + dgv.Rows.Add(Puffs.Length); + for (int i = 0; i < Puffs.Length; i++) { dgv.Rows[i].Cells[0].Value = (i + 1).ToString(); - dgv.Rows[i].Cells[1].Value = pfa[SAV.Data[SAV.Puff + i]]; + int puffval = Puffs[i]; + if (puffval >= pfa.Length) + { + Util.Error($"Invalid Puff Index: {i}", $"Expected < ${pfa.Length}"); + puffval = 0; + } + dgv.Rows[i].Cells[1].Value = pfa[puffval]; } MT_CNT.Text = SAV.PuffCount.ToString(); } From 92448f478df1986f19eb3623fa73d2f851a77734 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Fri, 9 Sep 2016 08:40:57 -0700 Subject: [PATCH 33/35] Fix box0 sort/delete Closes #248 Thanks @exegg --- PKHeX/MainWindow/Main.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index cab5d0a59..a59e45cf3 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -2860,7 +2860,7 @@ private void clickBoxSort(object sender, EventArgs e) return; SAV.resetBoxes(); - CB_BoxSelect.SelectedIndex = 0; + setPKXBoxes(); Util.Alert("Boxes cleared!"); } else if (ModifierKeys == Keys.Alt) @@ -2878,7 +2878,7 @@ private void clickBoxSort(object sender, EventArgs e) return; SAV.sortBoxes(); - CB_BoxSelect.SelectedIndex = 0; + setPKXBoxes(); Util.Alert("Boxes sorted!"); } else if (ModifierKeys == Keys.Control) From ca6a0da9dbacd9fcfaf36e809ab3abfecf4f916a Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Fri, 9 Sep 2016 19:13:48 -0700 Subject: [PATCH 34/35] ShowdownSet Improve error handling Because people can't follow directions and try to type it out manually -> incorrect input --- PKHeX/PKM/ShowdownSet.cs | 43 ++++++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/PKHeX/PKM/ShowdownSet.cs b/PKHeX/PKM/ShowdownSet.cs index 22538281f..d15e96b18 100644 --- a/PKHeX/PKM/ShowdownSet.cs +++ b/PKHeX/PKM/ShowdownSet.cs @@ -31,7 +31,7 @@ public class ShowdownSet public int[] EVs; public int[] IVs; public int[] Moves; - public List InvalidLines = new List(); + public readonly List InvalidLines = new List(); // Parsing Utility public ShowdownSet(string input = null) @@ -120,7 +120,10 @@ public ShowdownSet(string input = null) { string type = moveString.Remove(0, 13).Replace("[", "").Replace("]", ""); // Trim out excess data int hpVal = Array.IndexOf(hptypes, type); // Get HP Type - if (hpVal >= 0) IVs = PKX.setHPIVs(hpVal, IVs); // Get IVs + if (hpVal >= 0) + IVs = PKX.setHPIVs(hpVal, IVs); // Get IVs + else + InvalidLines.Add($"Invalid Hidden Power Type: {type}"); } moveString = "Hidden Power"; } @@ -142,17 +145,41 @@ public ShowdownSet(string input = null) case "EVs": { // Get EV list String - string[] evlist = brokenline[1].Replace("SAtk", "SpA").Replace("SDef", "SpD").Replace("Spd", "Spe").Split(new[] { " / ", " " }, StringSplitOptions.None); - for (int i = 0; i < evlist.Length / 2; i++) - EVs[Array.IndexOf(StatNames, evlist[1 + i * 2])] = (byte)Util.ToInt32(evlist[0 + 2 * i]); + string[] evlist = brokenline[1] + // Because people think they can type sets out... + .Replace("SAtk", "SpA").Replace("Sp Atk", "SpA") + .Replace("SDef", "SpD").Replace("Sp Def", "SpD") + .Replace("Spd", "Spe").Replace("Speed", "Spe").Split(new[] { " / ", " " }, StringSplitOptions.None); + for (int i = 0; i < evlist.Length/2; i++) + { + ushort EV; + ushort.TryParse(evlist[i * 2 + 0], out EV); + int index = Array.IndexOf(StatNames, evlist[i*2 + 1]); + if (index > -1) + EVs[index] = EV; + else + InvalidLines.Add($"Unknown EV Type input: {evlist[i*2]}"); + } break; } case "IVs": { // Get IV list String - string[] ivlist = brokenline[1].Split(new[] { " / ", " " }, StringSplitOptions.None); - for (int i = 0; i < ivlist.Length / 2; i++) - IVs[Array.IndexOf(StatNames, ivlist[1 + i * 2])] = (byte)Util.ToInt32(ivlist[0 + 2 * i]); + string[] ivlist = brokenline[1] + // Because people think they can type sets out... + .Replace("SAtk", "SpA").Replace("Sp Atk", "SpA") + .Replace("SDef", "SpD").Replace("Sp Def", "SpD") + .Replace("Spd", "Spe").Replace("Speed", "Spe").Split(new[] { " / ", " " }, StringSplitOptions.None); + for (int i = 0; i < ivlist.Length/2; i++) + { + byte IV; + byte.TryParse(ivlist[i*2 + 0], out IV); + int index = Array.IndexOf(StatNames, ivlist[i*2 + 1]); + if (index > -1) + IVs[index] = IV; + else + InvalidLines.Add($"Unknown EV Type input: {ivlist[i * 2]}"); + } break; } default: From cfb8d71f8414062f7860287c230690819855a696 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Fri, 9 Sep 2016 23:59:13 -0700 Subject: [PATCH 35/35] Fix ribbon name Exception was thrown in ribbon editor, easy to replicate by giving all ribbons to a pk4 (gen4 save file). Property name now matches pk5/pk6. --- PKHeX/PKM/PK4.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKHeX/PKM/PK4.cs b/PKHeX/PKM/PK4.cs index e90bf2661..a9d669876 100644 --- a/PKHeX/PKM/PK4.cs +++ b/PKHeX/PKM/PK4.cs @@ -81,7 +81,7 @@ public PK4(byte[] decryptedData = null, string ident = null) public bool RibbonRecord { get { return (RIB2 & (1 << 2)) == 1 << 2; } set { RIB2 = (byte)(RIB2 & ~(1 << 2) | (value ? 1 << 2 : 0)); } } public bool RibbonEvent { get { return (RIB2 & (1 << 3)) == 1 << 3; } set { RIB2 = (byte)(RIB2 & ~(1 << 3) | (value ? 1 << 3 : 0)); } } public bool RibbonLegend { get { return (RIB2 & (1 << 4)) == 1 << 4; } set { RIB2 = (byte)(RIB2 & ~(1 << 4) | (value ? 1 << 4 : 0)); } } - public bool RibbonWorldChampion { get { return (RIB2 & (1 << 5)) == 1 << 5; } set { RIB2 = (byte)(RIB2 & ~(1 << 5) | (value ? 1 << 5 : 0)); } } + public bool RibbonChampionWorld { get { return (RIB2 & (1 << 5)) == 1 << 5; } set { RIB2 = (byte)(RIB2 & ~(1 << 5) | (value ? 1 << 5 : 0)); } } public bool RibbonBirthday { get { return (RIB2 & (1 << 6)) == 1 << 6; } set { RIB2 = (byte)(RIB2 & ~(1 << 6) | (value ? 1 << 6 : 0)); } } public bool RibbonSpecial { get { return (RIB2 & (1 << 7)) == 1 << 7; } set { RIB2 = (byte)(RIB2 & ~(1 << 7) | (value ? 1 << 7 : 0)); } } public bool RibbonSouvenir { get { return (RIB3 & (1 << 0)) == 1 << 0; } set { RIB3 = (byte)(RIB3 & ~(1 << 0) | (value ? 1 << 0 : 0)); } }