From 6a34a96af14d4ec28d7a7c21034fd0bdf16faa9e Mon Sep 17 00:00:00 2001 From: Kurt Date: Tue, 20 Nov 2018 18:25:20 -0800 Subject: [PATCH] Misc fixes Form opens, displays data --- pkNX.Structures/Evolution/EvolutionSet7.cs | 2 +- .../Controls/EvolutionRow.Designer.cs | 76 ++++--- pkNX.WinForms/Controls/EvolutionRow.cs | 9 +- pkNX.WinForms/Main.cs | 2 +- pkNX.WinForms/Subforms/PokeDataUI.Designer.cs | 197 +++++++++--------- pkNX.WinForms/Subforms/PokeDataUI.cs | 34 ++- 6 files changed, 168 insertions(+), 152 deletions(-) diff --git a/pkNX.Structures/Evolution/EvolutionSet7.cs b/pkNX.Structures/Evolution/EvolutionSet7.cs index 940d86c4..55e9a311 100644 --- a/pkNX.Structures/Evolution/EvolutionSet7.cs +++ b/pkNX.Structures/Evolution/EvolutionSet7.cs @@ -13,7 +13,7 @@ public EvolutionSet7(byte[] data) { if (data.Length != SIZE) return; - PossibleEvolutions = data.GetArray(GetEvo, SIZE); + PossibleEvolutions = data.GetArray(GetEvo, ENTRY_SIZE); } private static EvolutionMethod GetEvo(byte[] data, int offset) diff --git a/pkNX.WinForms/Controls/EvolutionRow.Designer.cs b/pkNX.WinForms/Controls/EvolutionRow.Designer.cs index db5cfffa..faeacb0c 100644 --- a/pkNX.WinForms/Controls/EvolutionRow.Designer.cs +++ b/pkNX.WinForms/Controls/EvolutionRow.Designer.cs @@ -33,16 +33,15 @@ private void InitializeComponent() this.PB_Preview = new System.Windows.Forms.PictureBox(); this.CB_Arg = new System.Windows.Forms.ComboBox(); this.CB_Species = new System.Windows.Forms.ComboBox(); - this.L_Method = new System.Windows.Forms.Label(); this.CB_Method = new System.Windows.Forms.ComboBox(); ((System.ComponentModel.ISupportInitialize)(this.NUD_Level)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_Form)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.PB_Preview)).BeginInit(); this.SuspendLayout(); - // + // // NUD_Level - // - this.NUD_Level.Location = new System.Drawing.Point(556, 13); + // + this.NUD_Level.Location = new System.Drawing.Point(372, 13); this.NUD_Level.Maximum = new decimal(new int[] { 127, 0, @@ -54,12 +53,17 @@ private void InitializeComponent() 0, -2147483648}); this.NUD_Level.Name = "NUD_Level"; - this.NUD_Level.Size = new System.Drawing.Size(45, 20); + this.NUD_Level.Size = new System.Drawing.Size(38, 20); this.NUD_Level.TabIndex = 72; - // + this.NUD_Level.Value = new decimal(new int[] { + 100, + 0, + 0, + 0}); + // // NUD_Form - // - this.NUD_Form.Location = new System.Drawing.Point(505, 13); + // + this.NUD_Form.Location = new System.Drawing.Point(332, 13); this.NUD_Form.Maximum = new decimal(new int[] { 127, 0, @@ -71,59 +75,55 @@ private void InitializeComponent() 0, -2147483648}); this.NUD_Form.Name = "NUD_Form"; - this.NUD_Form.Size = new System.Drawing.Size(45, 20); + this.NUD_Form.Size = new System.Drawing.Size(38, 20); this.NUD_Form.TabIndex = 71; - // + this.NUD_Form.Value = new decimal(new int[] { + 100, + 0, + 0, + 0}); + // // PB_Preview - // - this.PB_Preview.Location = new System.Drawing.Point(69, 5); + // + this.PB_Preview.Location = new System.Drawing.Point(0, 5); this.PB_Preview.Name = "PB_Preview"; this.PB_Preview.Size = new System.Drawing.Size(40, 30); this.PB_Preview.TabIndex = 70; this.PB_Preview.TabStop = false; - // + // // CB_Arg - // + // this.CB_Arg.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.CB_Arg.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_Arg.FormattingEnabled = true; - this.CB_Arg.Location = new System.Drawing.Point(378, 12); + this.CB_Arg.Location = new System.Drawing.Point(248, 12); this.CB_Arg.Name = "CB_Arg"; - this.CB_Arg.Size = new System.Drawing.Size(121, 21); + this.CB_Arg.Size = new System.Drawing.Size(82, 21); this.CB_Arg.TabIndex = 69; - // + // // CB_Species - // + // this.CB_Species.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.CB_Species.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_Species.FormattingEnabled = true; - this.CB_Species.Location = new System.Drawing.Point(271, 12); + this.CB_Species.Location = new System.Drawing.Point(160, 12); this.CB_Species.Name = "CB_Species"; - this.CB_Species.Size = new System.Drawing.Size(101, 21); + this.CB_Species.Size = new System.Drawing.Size(87, 21); this.CB_Species.TabIndex = 68; - // - // L_Method - // - this.L_Method.Location = new System.Drawing.Point(3, 11); - this.L_Method.Name = "L_Method"; - this.L_Method.Size = new System.Drawing.Size(60, 20); - this.L_Method.TabIndex = 67; - this.L_Method.Text = "Method 1:"; - this.L_Method.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // + // // CB_Method - // + // this.CB_Method.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.CB_Method.DropDownWidth = 200; + this.CB_Method.DropDownWidth = 250; this.CB_Method.FormattingEnabled = true; - this.CB_Method.Location = new System.Drawing.Point(115, 12); + this.CB_Method.Location = new System.Drawing.Point(41, 12); this.CB_Method.MaxDropDownItems = 10; this.CB_Method.Name = "CB_Method"; - this.CB_Method.Size = new System.Drawing.Size(150, 21); + this.CB_Method.Size = new System.Drawing.Size(118, 21); this.CB_Method.TabIndex = 66; - // + // // EvolutionRow - // + // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.NUD_Level); @@ -131,10 +131,9 @@ private void InitializeComponent() this.Controls.Add(this.PB_Preview); this.Controls.Add(this.CB_Arg); this.Controls.Add(this.CB_Species); - this.Controls.Add(this.L_Method); this.Controls.Add(this.CB_Method); this.Name = "EvolutionRow"; - this.Size = new System.Drawing.Size(611, 40); + this.Size = new System.Drawing.Size(414, 40); ((System.ComponentModel.ISupportInitialize)(this.NUD_Level)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_Form)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.PB_Preview)).EndInit(); @@ -149,7 +148,6 @@ private void InitializeComponent() private System.Windows.Forms.PictureBox PB_Preview; private System.Windows.Forms.ComboBox CB_Arg; private System.Windows.Forms.ComboBox CB_Species; - private System.Windows.Forms.Label L_Method; private System.Windows.Forms.ComboBox CB_Method; } } diff --git a/pkNX.WinForms/Controls/EvolutionRow.cs b/pkNX.WinForms/Controls/EvolutionRow.cs index 2706dbed..fe27f42d 100644 --- a/pkNX.WinForms/Controls/EvolutionRow.cs +++ b/pkNX.WinForms/Controls/EvolutionRow.cs @@ -18,6 +18,7 @@ public EvolutionRow() CB_Species.SelectedIndexChanged += (_, __) => ChangeSpecies(CB_Species.SelectedIndex, (int)NUD_Form.Value); NUD_Form.ValueChanged += (_, __) => ChangeSpecies(CB_Species.SelectedIndex, (int)NUD_Form.Value); + CB_Arg.Items.AddRange(None); CB_Method.SelectedIndexChanged += (s, e) => { var index = (EvolutionType)CB_Method.SelectedIndex; @@ -33,14 +34,14 @@ public EvolutionRow() CB_Arg.Visible = true; oldMethod = type; - CB_Method.Items.Clear(); + CB_Arg.Items.Clear(); var vals = GetArgs(type); - CB_Method.Items.AddRange(vals); + CB_Arg.Items.AddRange(vals); CB_Arg.SelectedIndex = 0; }; } - private void ChangeSpecies(int spec, int form) => PB_Preview.Image = SpriteBuilder.GetSprite(spec, form, 0, 0, false, false, 7); + private void ChangeSpecies(int spec, int form) => PB_Preview.Image = SpriteBuilder.GetSprite(spec, form, 0, 0, false, false); private EvolutionMethod current; private EvolutionTypeArgumentType oldMethod; @@ -70,7 +71,7 @@ public void SaveEvolution() public static string[] species; public static string[] types; - private static readonly string[] EvoMethods = Enum.GetNames(typeof(EvolutionMethod)); + private static readonly string[] EvoMethods = Enum.GetNames(typeof(EvolutionType)); private static readonly string[] Levels = Enumerable.Range(0, 100 + 1).Select(z => z.ToString()).ToArray(); private static readonly string[] Stats = Enumerable.Range(0, 255 + 1).Select(z => z.ToString()).ToArray(); private static readonly string[] None = { "" }; diff --git a/pkNX.WinForms/Main.cs b/pkNX.WinForms/Main.cs index 727338fd..b2826ed9 100644 --- a/pkNX.WinForms/Main.cs +++ b/pkNX.WinForms/Main.cs @@ -126,7 +126,7 @@ private void OpenFolder(string path) private void LoadROM(EditorBase editor) { Editor = editor; - var ctrl = Editor.GetControls(80, 20); + var ctrl = Editor.GetControls(100, 30); FLP_Controls.Controls.Clear(); foreach (var c in ctrl) FLP_Controls.Controls.Add(c); diff --git a/pkNX.WinForms/Subforms/PokeDataUI.Designer.cs b/pkNX.WinForms/Subforms/PokeDataUI.Designer.cs index 8cc70157..a4bb2c8f 100644 --- a/pkNX.WinForms/Subforms/PokeDataUI.Designer.cs +++ b/pkNX.WinForms/Subforms/PokeDataUI.Designer.cs @@ -117,10 +117,10 @@ private void InitializeComponent() this.L_LevelUp = new System.Windows.Forms.Label(); this.dgv = new System.Windows.Forms.DataGridView(); this.Tab_Evo = new System.Windows.Forms.TabPage(); + this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); this.Tab_Extra = new System.Windows.Forms.TabPage(); this.CB_Species = new System.Windows.Forms.ComboBox(); this.PB_MonSprite = new System.Windows.Forms.PictureBox(); - this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); this.tabControl1.SuspendLayout(); this.Tab_Personal.SuspendLayout(); this.Tab_Learn.SuspendLayout(); @@ -132,12 +132,13 @@ private void InitializeComponent() // B_Save // this.B_Save.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.B_Save.Location = new System.Drawing.Point(451, -1); + this.B_Save.Location = new System.Drawing.Point(460, -1); this.B_Save.Name = "B_Save"; this.B_Save.Size = new System.Drawing.Size(75, 23); this.B_Save.TabIndex = 0; this.B_Save.Text = "Save"; this.B_Save.UseVisualStyleBackColor = true; + this.B_Save.Click += new System.EventHandler(this.B_Save_Click); // // tabControl1 // @@ -149,7 +150,7 @@ private void InitializeComponent() this.tabControl1.Location = new System.Drawing.Point(0, 0); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(525, 450); + this.tabControl1.Size = new System.Drawing.Size(534, 541); this.tabControl1.TabIndex = 1; // // Tab_Personal @@ -237,7 +238,7 @@ private void InitializeComponent() this.Tab_Personal.Location = new System.Drawing.Point(4, 22); this.Tab_Personal.Name = "Tab_Personal"; this.Tab_Personal.Padding = new System.Windows.Forms.Padding(3); - this.Tab_Personal.Size = new System.Drawing.Size(517, 424); + this.Tab_Personal.Size = new System.Drawing.Size(526, 515); this.Tab_Personal.TabIndex = 0; this.Tab_Personal.Text = "Personal"; this.Tab_Personal.UseVisualStyleBackColor = true; @@ -245,7 +246,7 @@ private void InitializeComponent() // L_GoID // this.L_GoID.AutoSize = true; - this.L_GoID.Location = new System.Drawing.Point(187, 351); + this.L_GoID.Location = new System.Drawing.Point(122, 425); this.L_GoID.Name = "L_GoID"; this.L_GoID.Size = new System.Drawing.Size(35, 13); this.L_GoID.TabIndex = 501; @@ -254,7 +255,7 @@ private void InitializeComponent() // MT_GoID // this.MT_GoID.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.MT_GoID.Location = new System.Drawing.Point(228, 349); + this.MT_GoID.Location = new System.Drawing.Point(163, 423); this.MT_GoID.Mask = "000"; this.MT_GoID.Name = "MT_GoID"; this.MT_GoID.Size = new System.Drawing.Size(31, 20); @@ -263,7 +264,7 @@ private void InitializeComponent() // // TB_RawColor // - this.TB_RawColor.Location = new System.Drawing.Point(229, 210); + this.TB_RawColor.Location = new System.Drawing.Point(421, 255); this.TB_RawColor.Name = "TB_RawColor"; this.TB_RawColor.ReadOnly = true; this.TB_RawColor.Size = new System.Drawing.Size(30, 20); @@ -274,7 +275,7 @@ private void InitializeComponent() // L_HiddenAbility // this.L_HiddenAbility.AutoSize = true; - this.L_HiddenAbility.Location = new System.Drawing.Point(413, 127); + this.L_HiddenAbility.Location = new System.Drawing.Point(419, 138); this.L_HiddenAbility.Name = "L_HiddenAbility"; this.L_HiddenAbility.Size = new System.Drawing.Size(21, 13); this.L_HiddenAbility.TabIndex = 499; @@ -283,7 +284,7 @@ private void InitializeComponent() // L_WeightKG // this.L_WeightKG.AutoSize = true; - this.L_WeightKG.Location = new System.Drawing.Point(416, 327); + this.L_WeightKG.Location = new System.Drawing.Point(418, 376); this.L_WeightKG.Name = "L_WeightKG"; this.L_WeightKG.Size = new System.Drawing.Size(19, 13); this.L_WeightKG.TabIndex = 495; @@ -292,7 +293,7 @@ private void InitializeComponent() // L_Ability2 // this.L_Ability2.AutoSize = true; - this.L_Ability2.Location = new System.Drawing.Point(414, 105); + this.L_Ability2.Location = new System.Drawing.Point(420, 116); this.L_Ability2.Name = "L_Ability2"; this.L_Ability2.Size = new System.Drawing.Size(19, 13); this.L_Ability2.TabIndex = 497; @@ -301,7 +302,7 @@ private void InitializeComponent() // L_HeightM // this.L_HeightM.AutoSize = true; - this.L_HeightM.Location = new System.Drawing.Point(416, 306); + this.L_HeightM.Location = new System.Drawing.Point(418, 355); this.L_HeightM.Name = "L_HeightM"; this.L_HeightM.Size = new System.Drawing.Size(15, 13); this.L_HeightM.TabIndex = 494; @@ -310,7 +311,7 @@ private void InitializeComponent() // L_Ability1 // this.L_Ability1.AutoSize = true; - this.L_Ability1.Location = new System.Drawing.Point(414, 83); + this.L_Ability1.Location = new System.Drawing.Point(420, 94); this.L_Ability1.Name = "L_Ability1"; this.L_Ability1.Size = new System.Drawing.Size(19, 13); this.L_Ability1.TabIndex = 496; @@ -319,7 +320,7 @@ private void InitializeComponent() // TB_Weight // this.TB_Weight.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_Weight.Location = new System.Drawing.Point(384, 323); + this.TB_Weight.Location = new System.Drawing.Point(386, 372); this.TB_Weight.Mask = "000.0"; this.TB_Weight.Name = "TB_Weight"; this.TB_Weight.Size = new System.Drawing.Size(32, 20); @@ -329,7 +330,7 @@ private void InitializeComponent() // TB_Height // this.TB_Height.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_Height.Location = new System.Drawing.Point(384, 302); + this.TB_Height.Location = new System.Drawing.Point(386, 351); this.TB_Height.Mask = "00.0"; this.TB_Height.Name = "TB_Height"; this.TB_Height.Size = new System.Drawing.Size(32, 20); @@ -339,7 +340,7 @@ private void InitializeComponent() // L_Weight // this.L_Weight.AutoSize = true; - this.L_Weight.Location = new System.Drawing.Point(340, 326); + this.L_Weight.Location = new System.Drawing.Point(342, 375); this.L_Weight.Name = "L_Weight"; this.L_Weight.Size = new System.Drawing.Size(44, 13); this.L_Weight.TabIndex = 491; @@ -349,7 +350,7 @@ private void InitializeComponent() // L_Height // this.L_Height.AutoSize = true; - this.L_Height.Location = new System.Drawing.Point(343, 305); + this.L_Height.Location = new System.Drawing.Point(345, 354); this.L_Height.Name = "L_Height"; this.L_Height.Size = new System.Drawing.Size(41, 13); this.L_Height.TabIndex = 490; @@ -359,7 +360,7 @@ private void InitializeComponent() // CB_ZMove // this.CB_ZMove.FormattingEnabled = true; - this.CB_ZMove.Location = new System.Drawing.Point(177, 322); + this.CB_ZMove.Location = new System.Drawing.Point(297, 463); this.CB_ZMove.Name = "CB_ZMove"; this.CB_ZMove.Size = new System.Drawing.Size(121, 21); this.CB_ZMove.TabIndex = 488; @@ -367,7 +368,7 @@ private void InitializeComponent() // CB_ZBaseMove // this.CB_ZBaseMove.FormattingEnabled = true; - this.CB_ZBaseMove.Location = new System.Drawing.Point(177, 300); + this.CB_ZBaseMove.Location = new System.Drawing.Point(297, 441); this.CB_ZBaseMove.Name = "CB_ZBaseMove"; this.CB_ZBaseMove.Size = new System.Drawing.Size(121, 21); this.CB_ZBaseMove.TabIndex = 485; @@ -375,7 +376,7 @@ private void InitializeComponent() // CB_ZItem // this.CB_ZItem.FormattingEnabled = true; - this.CB_ZItem.Location = new System.Drawing.Point(177, 278); + this.CB_ZItem.Location = new System.Drawing.Point(297, 419); this.CB_ZItem.Name = "CB_ZItem"; this.CB_ZItem.Size = new System.Drawing.Size(121, 21); this.CB_ZItem.TabIndex = 484; @@ -383,7 +384,7 @@ private void InitializeComponent() // TB_CallRate // this.TB_CallRate.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_CallRate.Location = new System.Drawing.Point(77, 282); + this.TB_CallRate.Location = new System.Drawing.Point(163, 334); this.TB_CallRate.Mask = "000"; this.TB_CallRate.Name = "TB_CallRate"; this.TB_CallRate.Size = new System.Drawing.Size(31, 20); @@ -393,7 +394,7 @@ private void InitializeComponent() // L_CallRate // this.L_CallRate.AutoSize = true; - this.L_CallRate.Location = new System.Drawing.Point(23, 286); + this.L_CallRate.Location = new System.Drawing.Point(109, 338); this.L_CallRate.Name = "L_CallRate"; this.L_CallRate.Size = new System.Drawing.Size(53, 13); this.L_CallRate.TabIndex = 482; @@ -403,7 +404,8 @@ private void InitializeComponent() // CHK_Variant // this.CHK_Variant.AutoSize = true; - this.CHK_Variant.Location = new System.Drawing.Point(185, 260); + this.CHK_Variant.CheckAlign = System.Drawing.ContentAlignment.MiddleRight; + this.CHK_Variant.Location = new System.Drawing.Point(91, 452); this.CHK_Variant.Name = "CHK_Variant"; this.CHK_Variant.Size = new System.Drawing.Size(104, 17); this.CHK_Variant.TabIndex = 481; @@ -412,7 +414,7 @@ private void InitializeComponent() // // TB_BST // - this.TB_BST.Location = new System.Drawing.Point(387, 28); + this.TB_BST.Location = new System.Drawing.Point(387, 20); this.TB_BST.Name = "TB_BST"; this.TB_BST.ReadOnly = true; this.TB_BST.Size = new System.Drawing.Size(31, 20); @@ -423,7 +425,7 @@ private void InitializeComponent() // L_BST // this.L_BST.AutoSize = true; - this.L_BST.Location = new System.Drawing.Point(355, 31); + this.L_BST.Location = new System.Drawing.Point(355, 23); this.L_BST.Name = "L_BST"; this.L_BST.Size = new System.Drawing.Size(31, 13); this.L_BST.TabIndex = 479; @@ -433,7 +435,7 @@ private void InitializeComponent() // TB_CatchRate // this.TB_CatchRate.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_CatchRate.Location = new System.Drawing.Point(387, 52); + this.TB_CatchRate.Location = new System.Drawing.Point(387, 44); this.TB_CatchRate.Mask = "000"; this.TB_CatchRate.Name = "TB_CatchRate"; this.TB_CatchRate.Size = new System.Drawing.Size(31, 20); @@ -442,7 +444,7 @@ private void InitializeComponent() // // TB_Stage // - this.TB_Stage.Location = new System.Drawing.Point(384, 239); + this.TB_Stage.Location = new System.Drawing.Point(386, 288); this.TB_Stage.Name = "TB_Stage"; this.TB_Stage.ReadOnly = true; this.TB_Stage.Size = new System.Drawing.Size(32, 20); @@ -452,7 +454,7 @@ private void InitializeComponent() // L_Stage // this.L_Stage.AutoSize = true; - this.L_Stage.Location = new System.Drawing.Point(299, 241); + this.L_Stage.Location = new System.Drawing.Point(301, 290); this.L_Stage.Name = "L_Stage"; this.L_Stage.Size = new System.Drawing.Size(85, 13); this.L_Stage.TabIndex = 476; @@ -461,7 +463,7 @@ private void InitializeComponent() // // TB_FormeCount // - this.TB_FormeCount.Location = new System.Drawing.Point(384, 281); + this.TB_FormeCount.Location = new System.Drawing.Point(386, 330); this.TB_FormeCount.Name = "TB_FormeCount"; this.TB_FormeCount.ReadOnly = true; this.TB_FormeCount.Size = new System.Drawing.Size(32, 20); @@ -471,7 +473,7 @@ private void InitializeComponent() // L_FormesCount // this.L_FormesCount.AutoSize = true; - this.L_FormesCount.Location = new System.Drawing.Point(309, 284); + this.L_FormesCount.Location = new System.Drawing.Point(311, 333); this.L_FormesCount.Name = "L_FormesCount"; this.L_FormesCount.Size = new System.Drawing.Size(75, 13); this.L_FormesCount.TabIndex = 474; @@ -480,7 +482,7 @@ private void InitializeComponent() // // TB_FormeSprite // - this.TB_FormeSprite.Location = new System.Drawing.Point(384, 260); + this.TB_FormeSprite.Location = new System.Drawing.Point(386, 309); this.TB_FormeSprite.Name = "TB_FormeSprite"; this.TB_FormeSprite.ReadOnly = true; this.TB_FormeSprite.Size = new System.Drawing.Size(32, 20); @@ -490,7 +492,7 @@ private void InitializeComponent() // L_FormeSprite // this.L_FormeSprite.AutoSize = true; - this.L_FormeSprite.Location = new System.Drawing.Point(315, 263); + this.L_FormeSprite.Location = new System.Drawing.Point(317, 312); this.L_FormeSprite.Name = "L_FormeSprite"; this.L_FormeSprite.Size = new System.Drawing.Size(69, 13); this.L_FormeSprite.TabIndex = 472; @@ -500,7 +502,7 @@ private void InitializeComponent() // L_CatchRate // this.L_CatchRate.AutoSize = true; - this.L_CatchRate.Location = new System.Drawing.Point(322, 55); + this.L_CatchRate.Location = new System.Drawing.Point(322, 47); this.L_CatchRate.Name = "L_CatchRate"; this.L_CatchRate.Size = new System.Drawing.Size(64, 13); this.L_CatchRate.TabIndex = 471; @@ -511,7 +513,7 @@ private void InitializeComponent() this.CB_Color.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.CB_Color.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_Color.FormattingEnabled = true; - this.CB_Color.Location = new System.Drawing.Point(295, 210); + this.CB_Color.Location = new System.Drawing.Point(297, 255); this.CB_Color.Name = "CB_Color"; this.CB_Color.Size = new System.Drawing.Size(121, 21); this.CB_Color.TabIndex = 470; @@ -521,7 +523,7 @@ private void InitializeComponent() this.CB_EXPGroup.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.CB_EXPGroup.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_EXPGroup.FormattingEnabled = true; - this.CB_EXPGroup.Location = new System.Drawing.Point(80, 211); + this.CB_EXPGroup.Location = new System.Drawing.Point(82, 256); this.CB_EXPGroup.Name = "CB_EXPGroup"; this.CB_EXPGroup.Size = new System.Drawing.Size(112, 21); this.CB_EXPGroup.TabIndex = 469; @@ -529,7 +531,7 @@ private void InitializeComponent() // L_Color // this.L_Color.AutoSize = true; - this.L_Color.Location = new System.Drawing.Point(261, 212); + this.L_Color.Location = new System.Drawing.Point(263, 257); this.L_Color.Name = "L_Color"; this.L_Color.Size = new System.Drawing.Size(34, 13); this.L_Color.TabIndex = 468; @@ -538,7 +540,7 @@ private void InitializeComponent() // L_EXPGrowth // this.L_EXPGrowth.AutoSize = true; - this.L_EXPGrowth.Location = new System.Drawing.Point(16, 214); + this.L_EXPGrowth.Location = new System.Drawing.Point(18, 259); this.L_EXPGrowth.Name = "L_EXPGrowth"; this.L_EXPGrowth.Size = new System.Drawing.Size(63, 13); this.L_EXPGrowth.TabIndex = 467; @@ -549,7 +551,7 @@ private void InitializeComponent() this.CB_Ability3.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.CB_Ability3.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_Ability3.FormattingEnabled = true; - this.CB_Ability3.Location = new System.Drawing.Point(272, 124); + this.CB_Ability3.Location = new System.Drawing.Point(278, 135); this.CB_Ability3.Name = "CB_Ability3"; this.CB_Ability3.Size = new System.Drawing.Size(140, 21); this.CB_Ability3.TabIndex = 466; @@ -559,7 +561,7 @@ private void InitializeComponent() this.CB_Ability2.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.CB_Ability2.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_Ability2.FormattingEnabled = true; - this.CB_Ability2.Location = new System.Drawing.Point(272, 102); + this.CB_Ability2.Location = new System.Drawing.Point(278, 113); this.CB_Ability2.Name = "CB_Ability2"; this.CB_Ability2.Size = new System.Drawing.Size(140, 21); this.CB_Ability2.TabIndex = 465; @@ -569,7 +571,7 @@ private void InitializeComponent() this.CB_Ability1.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.CB_Ability1.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_Ability1.FormattingEnabled = true; - this.CB_Ability1.Location = new System.Drawing.Point(272, 80); + this.CB_Ability1.Location = new System.Drawing.Point(278, 91); this.CB_Ability1.Name = "CB_Ability1"; this.CB_Ability1.Size = new System.Drawing.Size(140, 21); this.CB_Ability1.TabIndex = 464; @@ -579,7 +581,7 @@ private void InitializeComponent() this.CB_EggGroup2.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.CB_EggGroup2.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_EggGroup2.FormattingEnabled = true; - this.CB_EggGroup2.Location = new System.Drawing.Point(295, 181); + this.CB_EggGroup2.Location = new System.Drawing.Point(297, 206); this.CB_EggGroup2.Name = "CB_EggGroup2"; this.CB_EggGroup2.Size = new System.Drawing.Size(121, 21); this.CB_EggGroup2.TabIndex = 463; @@ -589,7 +591,7 @@ private void InitializeComponent() this.CB_EggGroup1.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.CB_EggGroup1.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_EggGroup1.FormattingEnabled = true; - this.CB_EggGroup1.Location = new System.Drawing.Point(295, 159); + this.CB_EggGroup1.Location = new System.Drawing.Point(297, 184); this.CB_EggGroup1.Name = "CB_EggGroup1"; this.CB_EggGroup1.Size = new System.Drawing.Size(121, 21); this.CB_EggGroup1.TabIndex = 462; @@ -597,7 +599,7 @@ private void InitializeComponent() // L_EggGroup // this.L_EggGroup.AutoSize = true; - this.L_EggGroup.Location = new System.Drawing.Point(230, 162); + this.L_EggGroup.Location = new System.Drawing.Point(232, 187); this.L_EggGroup.Name = "L_EggGroup"; this.L_EggGroup.Size = new System.Drawing.Size(66, 13); this.L_EggGroup.TabIndex = 461; @@ -606,7 +608,7 @@ private void InitializeComponent() // L_Ability // this.L_Ability.AutoSize = true; - this.L_Ability.Location = new System.Drawing.Point(226, 84); + this.L_Ability.Location = new System.Drawing.Point(232, 95); this.L_Ability.Name = "L_Ability"; this.L_Ability.Size = new System.Drawing.Size(45, 13); this.L_Ability.TabIndex = 460; @@ -615,7 +617,7 @@ private void InitializeComponent() // TB_BaseExp // this.TB_BaseExp.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_BaseExp.Location = new System.Drawing.Point(77, 303); + this.TB_BaseExp.Location = new System.Drawing.Point(163, 355); this.TB_BaseExp.Mask = "000"; this.TB_BaseExp.Name = "TB_BaseExp"; this.TB_BaseExp.Size = new System.Drawing.Size(31, 20); @@ -625,7 +627,7 @@ private void InitializeComponent() // L_BaseEXP // this.L_BaseEXP.AutoSize = true; - this.L_BaseEXP.Location = new System.Drawing.Point(18, 307); + this.L_BaseEXP.Location = new System.Drawing.Point(104, 359); this.L_BaseEXP.Name = "L_BaseEXP"; this.L_BaseEXP.Size = new System.Drawing.Size(58, 13); this.L_BaseEXP.TabIndex = 458; @@ -635,7 +637,7 @@ private void InitializeComponent() // TB_HatchCycles // this.TB_HatchCycles.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_HatchCycles.Location = new System.Drawing.Point(77, 324); + this.TB_HatchCycles.Location = new System.Drawing.Point(163, 376); this.TB_HatchCycles.Mask = "000"; this.TB_HatchCycles.Name = "TB_HatchCycles"; this.TB_HatchCycles.Size = new System.Drawing.Size(31, 20); @@ -645,7 +647,7 @@ private void InitializeComponent() // L_HatchCycles // this.L_HatchCycles.AutoSize = true; - this.L_HatchCycles.Location = new System.Drawing.Point(3, 327); + this.L_HatchCycles.Location = new System.Drawing.Point(89, 379); this.L_HatchCycles.Name = "L_HatchCycles"; this.L_HatchCycles.Size = new System.Drawing.Size(73, 13); this.L_HatchCycles.TabIndex = 456; @@ -655,7 +657,7 @@ private void InitializeComponent() // TB_Friendship // this.TB_Friendship.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_Friendship.Location = new System.Drawing.Point(77, 261); + this.TB_Friendship.Location = new System.Drawing.Point(163, 313); this.TB_Friendship.Mask = "000"; this.TB_Friendship.Name = "TB_Friendship"; this.TB_Friendship.Size = new System.Drawing.Size(31, 20); @@ -665,7 +667,7 @@ private void InitializeComponent() // TB_Gender // this.TB_Gender.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_Gender.Location = new System.Drawing.Point(77, 240); + this.TB_Gender.Location = new System.Drawing.Point(163, 292); this.TB_Gender.Mask = "000"; this.TB_Gender.Name = "TB_Gender"; this.TB_Gender.Size = new System.Drawing.Size(31, 20); @@ -675,7 +677,7 @@ private void InitializeComponent() // L_Friendship // this.L_Friendship.AutoSize = true; - this.L_Friendship.Location = new System.Drawing.Point(18, 265); + this.L_Friendship.Location = new System.Drawing.Point(104, 317); this.L_Friendship.Name = "L_Friendship"; this.L_Friendship.Size = new System.Drawing.Size(58, 13); this.L_Friendship.TabIndex = 453; @@ -685,7 +687,7 @@ private void InitializeComponent() // L_Gender // this.L_Gender.AutoSize = true; - this.L_Gender.Location = new System.Drawing.Point(31, 243); + this.L_Gender.Location = new System.Drawing.Point(117, 295); this.L_Gender.Name = "L_Gender"; this.L_Gender.Size = new System.Drawing.Size(45, 13); this.L_Gender.TabIndex = 452; @@ -695,7 +697,7 @@ private void InitializeComponent() // L_Item1 // this.L_Item1.AutoSize = true; - this.L_Item1.Location = new System.Drawing.Point(195, 127); + this.L_Item1.Location = new System.Drawing.Point(197, 137); this.L_Item1.Name = "L_Item1"; this.L_Item1.Size = new System.Drawing.Size(21, 13); this.L_Item1.TabIndex = 451; @@ -704,7 +706,7 @@ private void InitializeComponent() // L_Item5 // this.L_Item5.AutoSize = true; - this.L_Item5.Location = new System.Drawing.Point(195, 105); + this.L_Item5.Location = new System.Drawing.Point(197, 115); this.L_Item5.Name = "L_Item5"; this.L_Item5.Size = new System.Drawing.Size(21, 13); this.L_Item5.TabIndex = 450; @@ -713,7 +715,7 @@ private void InitializeComponent() // L_Item50 // this.L_Item50.AutoSize = true; - this.L_Item50.Location = new System.Drawing.Point(195, 84); + this.L_Item50.Location = new System.Drawing.Point(197, 94); this.L_Item50.Name = "L_Item50"; this.L_Item50.Size = new System.Drawing.Size(27, 13); this.L_Item50.TabIndex = 449; @@ -724,7 +726,7 @@ private void InitializeComponent() this.CB_HeldItem3.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.CB_HeldItem3.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_HeldItem3.FormattingEnabled = true; - this.CB_HeldItem3.Location = new System.Drawing.Point(52, 124); + this.CB_HeldItem3.Location = new System.Drawing.Point(54, 134); this.CB_HeldItem3.Name = "CB_HeldItem3"; this.CB_HeldItem3.Size = new System.Drawing.Size(140, 21); this.CB_HeldItem3.TabIndex = 448; @@ -734,7 +736,7 @@ private void InitializeComponent() this.CB_HeldItem2.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.CB_HeldItem2.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_HeldItem2.FormattingEnabled = true; - this.CB_HeldItem2.Location = new System.Drawing.Point(52, 102); + this.CB_HeldItem2.Location = new System.Drawing.Point(54, 112); this.CB_HeldItem2.Name = "CB_HeldItem2"; this.CB_HeldItem2.Size = new System.Drawing.Size(140, 21); this.CB_HeldItem2.TabIndex = 447; @@ -744,7 +746,7 @@ private void InitializeComponent() this.CB_HeldItem1.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.CB_HeldItem1.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_HeldItem1.FormattingEnabled = true; - this.CB_HeldItem1.Location = new System.Drawing.Point(52, 80); + this.CB_HeldItem1.Location = new System.Drawing.Point(54, 90); this.CB_HeldItem1.Name = "CB_HeldItem1"; this.CB_HeldItem1.Size = new System.Drawing.Size(140, 21); this.CB_HeldItem1.TabIndex = 446; @@ -752,7 +754,7 @@ private void InitializeComponent() // L_HeldItem // this.L_HeldItem.AutoSize = true; - this.L_HeldItem.Location = new System.Drawing.Point(16, 83); + this.L_HeldItem.Location = new System.Drawing.Point(18, 93); this.L_HeldItem.Name = "L_HeldItem"; this.L_HeldItem.Size = new System.Drawing.Size(35, 13); this.L_HeldItem.TabIndex = 445; @@ -763,7 +765,7 @@ private void InitializeComponent() this.CB_Type2.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.CB_Type2.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_Type2.FormattingEnabled = true; - this.CB_Type2.Location = new System.Drawing.Point(63, 181); + this.CB_Type2.Location = new System.Drawing.Point(65, 206); this.CB_Type2.Name = "CB_Type2"; this.CB_Type2.Size = new System.Drawing.Size(129, 21); this.CB_Type2.TabIndex = 444; @@ -773,7 +775,7 @@ private void InitializeComponent() this.CB_Type1.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.CB_Type1.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_Type1.FormattingEnabled = true; - this.CB_Type1.Location = new System.Drawing.Point(63, 159); + this.CB_Type1.Location = new System.Drawing.Point(65, 184); this.CB_Type1.Name = "CB_Type1"; this.CB_Type1.Size = new System.Drawing.Size(129, 21); this.CB_Type1.TabIndex = 443; @@ -781,7 +783,7 @@ private void InitializeComponent() // L_Type // this.L_Type.AutoSize = true; - this.L_Type.Location = new System.Drawing.Point(16, 162); + this.L_Type.Location = new System.Drawing.Point(18, 187); this.L_Type.Name = "L_Type"; this.L_Type.Size = new System.Drawing.Size(47, 13); this.L_Type.TabIndex = 442; @@ -790,7 +792,7 @@ private void InitializeComponent() // TB_SPEEVs // this.TB_SPEEVs.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_SPEEVs.Location = new System.Drawing.Point(273, 52); + this.TB_SPEEVs.Location = new System.Drawing.Point(273, 44); this.TB_SPEEVs.Mask = "0"; this.TB_SPEEVs.Name = "TB_SPEEVs"; this.TB_SPEEVs.Size = new System.Drawing.Size(31, 20); @@ -800,7 +802,7 @@ private void InitializeComponent() // TB_SPDEVs // this.TB_SPDEVs.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_SPDEVs.Location = new System.Drawing.Point(234, 52); + this.TB_SPDEVs.Location = new System.Drawing.Point(234, 44); this.TB_SPDEVs.Mask = "0"; this.TB_SPDEVs.Name = "TB_SPDEVs"; this.TB_SPDEVs.Size = new System.Drawing.Size(31, 20); @@ -810,7 +812,7 @@ private void InitializeComponent() // TB_SPAEVs // this.TB_SPAEVs.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_SPAEVs.Location = new System.Drawing.Point(195, 52); + this.TB_SPAEVs.Location = new System.Drawing.Point(195, 44); this.TB_SPAEVs.Mask = "0"; this.TB_SPAEVs.Name = "TB_SPAEVs"; this.TB_SPAEVs.Size = new System.Drawing.Size(31, 20); @@ -820,7 +822,7 @@ private void InitializeComponent() // TB_DEFEVs // this.TB_DEFEVs.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_DEFEVs.Location = new System.Drawing.Point(157, 52); + this.TB_DEFEVs.Location = new System.Drawing.Point(157, 44); this.TB_DEFEVs.Mask = "0"; this.TB_DEFEVs.Name = "TB_DEFEVs"; this.TB_DEFEVs.Size = new System.Drawing.Size(31, 20); @@ -830,7 +832,7 @@ private void InitializeComponent() // TB_ATKEVs // this.TB_ATKEVs.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_ATKEVs.Location = new System.Drawing.Point(119, 52); + this.TB_ATKEVs.Location = new System.Drawing.Point(119, 44); this.TB_ATKEVs.Mask = "0"; this.TB_ATKEVs.Name = "TB_ATKEVs"; this.TB_ATKEVs.Size = new System.Drawing.Size(31, 20); @@ -840,7 +842,7 @@ private void InitializeComponent() // TB_HPEVs // this.TB_HPEVs.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_HPEVs.Location = new System.Drawing.Point(80, 52); + this.TB_HPEVs.Location = new System.Drawing.Point(80, 44); this.TB_HPEVs.Mask = "0"; this.TB_HPEVs.Name = "TB_HPEVs"; this.TB_HPEVs.Size = new System.Drawing.Size(31, 20); @@ -850,7 +852,7 @@ private void InitializeComponent() // TB_BaseSPE // this.TB_BaseSPE.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_BaseSPE.Location = new System.Drawing.Point(273, 28); + this.TB_BaseSPE.Location = new System.Drawing.Point(273, 20); this.TB_BaseSPE.Mask = "000"; this.TB_BaseSPE.Name = "TB_BaseSPE"; this.TB_BaseSPE.Size = new System.Drawing.Size(31, 20); @@ -860,7 +862,7 @@ private void InitializeComponent() // TB_BaseSPD // this.TB_BaseSPD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_BaseSPD.Location = new System.Drawing.Point(234, 28); + this.TB_BaseSPD.Location = new System.Drawing.Point(234, 20); this.TB_BaseSPD.Mask = "000"; this.TB_BaseSPD.Name = "TB_BaseSPD"; this.TB_BaseSPD.Size = new System.Drawing.Size(31, 20); @@ -870,7 +872,7 @@ private void InitializeComponent() // TB_BaseSPA // this.TB_BaseSPA.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_BaseSPA.Location = new System.Drawing.Point(195, 28); + this.TB_BaseSPA.Location = new System.Drawing.Point(195, 20); this.TB_BaseSPA.Mask = "000"; this.TB_BaseSPA.Name = "TB_BaseSPA"; this.TB_BaseSPA.Size = new System.Drawing.Size(31, 20); @@ -880,7 +882,7 @@ private void InitializeComponent() // TB_BaseDEF // this.TB_BaseDEF.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_BaseDEF.Location = new System.Drawing.Point(157, 28); + this.TB_BaseDEF.Location = new System.Drawing.Point(157, 20); this.TB_BaseDEF.Mask = "000"; this.TB_BaseDEF.Name = "TB_BaseDEF"; this.TB_BaseDEF.Size = new System.Drawing.Size(31, 20); @@ -890,7 +892,7 @@ private void InitializeComponent() // TB_BaseATK // this.TB_BaseATK.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_BaseATK.Location = new System.Drawing.Point(119, 28); + this.TB_BaseATK.Location = new System.Drawing.Point(119, 20); this.TB_BaseATK.Mask = "000"; this.TB_BaseATK.Name = "TB_BaseATK"; this.TB_BaseATK.Size = new System.Drawing.Size(31, 20); @@ -900,7 +902,7 @@ private void InitializeComponent() // TB_BaseHP // this.TB_BaseHP.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_BaseHP.Location = new System.Drawing.Point(80, 28); + this.TB_BaseHP.Location = new System.Drawing.Point(80, 20); this.TB_BaseHP.Mask = "000"; this.TB_BaseHP.Name = "TB_BaseHP"; this.TB_BaseHP.Size = new System.Drawing.Size(31, 20); @@ -909,7 +911,7 @@ private void InitializeComponent() // // Label_HP // - this.Label_HP.Location = new System.Drawing.Point(77, 12); + this.Label_HP.Location = new System.Drawing.Point(77, 4); this.Label_HP.Name = "Label_HP"; this.Label_HP.Size = new System.Drawing.Size(31, 13); this.Label_HP.TabIndex = 424; @@ -918,7 +920,7 @@ private void InitializeComponent() // // Label_ATK // - this.Label_ATK.Location = new System.Drawing.Point(119, 12); + this.Label_ATK.Location = new System.Drawing.Point(119, 4); this.Label_ATK.Name = "Label_ATK"; this.Label_ATK.Size = new System.Drawing.Size(31, 13); this.Label_ATK.TabIndex = 425; @@ -927,7 +929,7 @@ private void InitializeComponent() // // Label_DEF // - this.Label_DEF.Location = new System.Drawing.Point(157, 12); + this.Label_DEF.Location = new System.Drawing.Point(157, 4); this.Label_DEF.Name = "Label_DEF"; this.Label_DEF.Size = new System.Drawing.Size(31, 13); this.Label_DEF.TabIndex = 426; @@ -936,7 +938,7 @@ private void InitializeComponent() // // Label_SPA // - this.Label_SPA.Location = new System.Drawing.Point(195, 12); + this.Label_SPA.Location = new System.Drawing.Point(195, 4); this.Label_SPA.Name = "Label_SPA"; this.Label_SPA.Size = new System.Drawing.Size(31, 13); this.Label_SPA.TabIndex = 427; @@ -945,7 +947,7 @@ private void InitializeComponent() // // Label_SPD // - this.Label_SPD.Location = new System.Drawing.Point(234, 12); + this.Label_SPD.Location = new System.Drawing.Point(234, 4); this.Label_SPD.Name = "Label_SPD"; this.Label_SPD.Size = new System.Drawing.Size(31, 13); this.Label_SPD.TabIndex = 428; @@ -954,7 +956,7 @@ private void InitializeComponent() // // Label_SPE // - this.Label_SPE.Location = new System.Drawing.Point(271, 12); + this.Label_SPE.Location = new System.Drawing.Point(271, 4); this.Label_SPE.Name = "Label_SPE"; this.Label_SPE.Size = new System.Drawing.Size(31, 13); this.Label_SPE.TabIndex = 429; @@ -964,7 +966,7 @@ private void InitializeComponent() // L_EVYield // this.L_EVYield.AutoSize = true; - this.L_EVYield.Location = new System.Drawing.Point(16, 55); + this.L_EVYield.Location = new System.Drawing.Point(16, 47); this.L_EVYield.Name = "L_EVYield"; this.L_EVYield.Size = new System.Drawing.Size(50, 13); this.L_EVYield.TabIndex = 423; @@ -973,7 +975,7 @@ private void InitializeComponent() // L_BaseStats // this.L_BaseStats.AutoSize = true; - this.L_BaseStats.Location = new System.Drawing.Point(16, 31); + this.L_BaseStats.Location = new System.Drawing.Point(16, 23); this.L_BaseStats.Name = "L_BaseStats"; this.L_BaseStats.Size = new System.Drawing.Size(61, 13); this.L_BaseStats.TabIndex = 422; @@ -982,7 +984,7 @@ private void InitializeComponent() // L_ZMove // this.L_ZMove.AutoSize = true; - this.L_ZMove.Location = new System.Drawing.Point(130, 325); + this.L_ZMove.Location = new System.Drawing.Point(250, 466); this.L_ZMove.Name = "L_ZMove"; this.L_ZMove.Size = new System.Drawing.Size(47, 13); this.L_ZMove.TabIndex = 489; @@ -991,7 +993,7 @@ private void InitializeComponent() // L_BaseMove // this.L_BaseMove.AutoSize = true; - this.L_BaseMove.Location = new System.Drawing.Point(113, 304); + this.L_BaseMove.Location = new System.Drawing.Point(233, 445); this.L_BaseMove.Name = "L_BaseMove"; this.L_BaseMove.Size = new System.Drawing.Size(64, 13); this.L_BaseMove.TabIndex = 487; @@ -1000,7 +1002,7 @@ private void InitializeComponent() // L_ZCrystal // this.L_ZCrystal.AutoSize = true; - this.L_ZCrystal.Location = new System.Drawing.Point(126, 282); + this.L_ZCrystal.Location = new System.Drawing.Point(246, 423); this.L_ZCrystal.Name = "L_ZCrystal"; this.L_ZCrystal.Size = new System.Drawing.Size(51, 13); this.L_ZCrystal.TabIndex = 486; @@ -1015,7 +1017,7 @@ private void InitializeComponent() this.Tab_Learn.Location = new System.Drawing.Point(4, 22); this.Tab_Learn.Name = "Tab_Learn"; this.Tab_Learn.Padding = new System.Windows.Forms.Padding(3); - this.Tab_Learn.Size = new System.Drawing.Size(517, 424); + this.Tab_Learn.Size = new System.Drawing.Size(526, 515); this.Tab_Learn.TabIndex = 1; this.Tab_Learn.Text = "Learnset"; this.Tab_Learn.UseVisualStyleBackColor = true; @@ -1065,17 +1067,25 @@ private void InitializeComponent() this.Tab_Evo.Controls.Add(this.flowLayoutPanel1); this.Tab_Evo.Location = new System.Drawing.Point(4, 22); this.Tab_Evo.Name = "Tab_Evo"; - this.Tab_Evo.Size = new System.Drawing.Size(517, 424); + this.Tab_Evo.Size = new System.Drawing.Size(526, 515); this.Tab_Evo.TabIndex = 2; this.Tab_Evo.Text = "Evolve"; this.Tab_Evo.UseVisualStyleBackColor = true; // + // flowLayoutPanel1 + // + this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 0); + this.flowLayoutPanel1.Name = "flowLayoutPanel1"; + this.flowLayoutPanel1.Size = new System.Drawing.Size(526, 515); + this.flowLayoutPanel1.TabIndex = 0; + // // Tab_Extra // this.Tab_Extra.Location = new System.Drawing.Point(4, 22); this.Tab_Extra.Name = "Tab_Extra"; this.Tab_Extra.Padding = new System.Windows.Forms.Padding(3); - this.Tab_Extra.Size = new System.Drawing.Size(517, 424); + this.Tab_Extra.Size = new System.Drawing.Size(526, 515); this.Tab_Extra.TabIndex = 3; this.Tab_Extra.Text = "Enhancements"; this.Tab_Extra.UseVisualStyleBackColor = true; @@ -1092,25 +1102,18 @@ private void InitializeComponent() // PB_MonSprite // this.PB_MonSprite.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.PB_MonSprite.Location = new System.Drawing.Point(437, 26); + this.PB_MonSprite.BackColor = System.Drawing.Color.Transparent; + this.PB_MonSprite.Location = new System.Drawing.Point(446, 26); this.PB_MonSprite.Name = "PB_MonSprite"; this.PB_MonSprite.Size = new System.Drawing.Size(80, 60); this.PB_MonSprite.TabIndex = 91; this.PB_MonSprite.TabStop = false; // - // flowLayoutPanel1 - // - this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 0); - this.flowLayoutPanel1.Name = "flowLayoutPanel1"; - this.flowLayoutPanel1.Size = new System.Drawing.Size(517, 424); - this.flowLayoutPanel1.TabIndex = 0; - // // PokeDataUI // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(525, 450); + this.ClientSize = new System.Drawing.Size(534, 541); this.Controls.Add(this.PB_MonSprite); this.Controls.Add(this.CB_Species); this.Controls.Add(this.B_Save); diff --git a/pkNX.WinForms/Subforms/PokeDataUI.cs b/pkNX.WinForms/Subforms/PokeDataUI.cs index a2a78b21..108fef3d 100644 --- a/pkNX.WinForms/Subforms/PokeDataUI.cs +++ b/pkNX.WinForms/Subforms/PokeDataUI.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; +using System.Drawing; using System.Linq; using System.Windows.Forms; using pkNX.Game; @@ -75,12 +76,12 @@ public void InitPersonal() var TMs = GetTMList(); if (TMs.Length == 0) // No ExeFS to grab TMs from. { - for (int i = 0; i < TMs.Length; i++) + for (int i = 0; i < 100; i++) CLB_TM.Items.Add($"TM{i+1:00}"); } else // Use TM moves. { - for (int i = 0; i < 100; i++) + for (int i = 0; i < TMs.Length; i++) CLB_TM.Items.Add($"TM{i+1:00} {movelist[TMs[i]]}"); } @@ -185,19 +186,24 @@ private static int[] GetTMList() public void UpdateIndex(object sender, EventArgs e) { - SaveCurrent(); + if (cPersonal != null) + SaveCurrent(); LoadIndex(CB_Species.SelectedIndex); } private void LoadIndex(int index) { int spec = baseForms[index]; + if (spec == 0) + spec = index; var form = formVal[index]; LoadPersonal(Editor.Personal[index]); LoadLearnset(Editor.Learn[index]); LoadEvolutions(Editor.Evolve[index]); LoadMegas(Editor.Mega[index], spec); - PB_MonSprite.Image = SpriteBuilder.GetSprite(spec, form, 0, 0, false, false); + var img = SpriteBuilder.GetSprite(spec, form, 0, 0, false, false); + img = ImageUtil.ScaleImage((Bitmap)img, 2); + PB_MonSprite.Image = img; } private void SaveCurrent() @@ -337,11 +343,13 @@ public void SavePersonal() public void LoadLearnset(Learnset pkm) { cLearnset = pkm; - while (pkm.Count < dgv.Rows.Count) - dgv.Rows.RemoveAt(dgv.Rows.Count - 1); - int diff = pkm.Count - dgv.Rows.Count; - if (diff != 0) - dgv.Rows.Add(diff); + dgv.Rows.Clear(); + if (pkm.Count == 0) + { + dgv.CancelEdit(); + return; + } + dgv.Rows.Add(pkm.Count); // Fill Entries for (int i = 0; i < pkm.Count; i++) @@ -395,7 +403,7 @@ public void LoadMegas(MegaEvolutionSet[] m, int spec) { cMega = m; Debug.Assert(Megas.Length == m.Length); - for (int i = 0; i < EvoRows.Length; i++) + for (int i = 0; i < Megas.Length; i++) { var entry = Megas[i]; entry.LoadEvolution(m[i], spec); @@ -409,5 +417,11 @@ public void SaveMegas() foreach (var row in Megas) row.SaveEvolution(); } + + private void B_Save_Click(object sender, EventArgs e) + { + Modified = true; + Close(); + } } }