diff --git a/pk3DS/Subforms/Gen6/MoveEditor6.Designer.cs b/pk3DS/Subforms/Gen6/MoveEditor6.Designer.cs index 0c87748..918148a 100644 --- a/pk3DS/Subforms/Gen6/MoveEditor6.Designer.cs +++ b/pk3DS/Subforms/Gen6/MoveEditor6.Designer.cs @@ -84,16 +84,13 @@ private void InitializeComponent() this.L_Quality = new System.Windows.Forms.Label(); this.L_0xB = new System.Windows.Forms.Label(); this.NUD_0xB = new System.Windows.Forms.NumericUpDown(); - this.NUD_0x20 = new System.Windows.Forms.NumericUpDown(); - this.NUD_0x21 = new System.Windows.Forms.NumericUpDown(); - this.L_0x20 = new System.Windows.Forms.Label(); - this.L_0x21 = new System.Windows.Forms.Label(); this.B_RandAll = new System.Windows.Forms.Button(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.CHK_Category = new System.Windows.Forms.CheckBox(); this.CHK_Type = new System.Windows.Forms.CheckBox(); this.B_Metronome = new System.Windows.Forms.Button(); this.B_Table = new System.Windows.Forms.Button(); + this.CLB_Flags = new System.Windows.Forms.CheckedListBox(); ((System.ComponentModel.ISupportInitialize)(this.NUD_HitMax)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_HitMin)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_Priority)).BeginInit(); @@ -116,13 +113,11 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.NUD_Effect)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_Accuracy)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_0xB)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.NUD_0x20)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.NUD_0x21)).BeginInit(); this.groupBox1.SuspendLayout(); this.SuspendLayout(); - // + // // L_Type - // + // this.L_Type.AutoSize = true; this.L_Type.Location = new System.Drawing.Point(32, 38); this.L_Type.Name = "L_Type"; @@ -130,9 +125,9 @@ private void InitializeComponent() this.L_Type.TabIndex = 0; this.L_Type.Text = "Type:"; this.L_Type.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // + // // CB_Move - // + // this.CB_Move.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.CB_Move.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_Move.DropDownWidth = 120; @@ -142,9 +137,9 @@ private void InitializeComponent() this.CB_Move.Size = new System.Drawing.Size(130, 21); this.CB_Move.TabIndex = 1; this.CB_Move.SelectedIndexChanged += new System.EventHandler(this.ChangeEntry); - // + // // L_Move - // + // this.L_Move.AutoSize = true; this.L_Move.Location = new System.Drawing.Point(33, 13); this.L_Move.Name = "L_Move"; @@ -152,27 +147,27 @@ private void InitializeComponent() this.L_Move.TabIndex = 2; this.L_Move.Text = "Move:"; this.L_Move.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // + // // CB_Type - // + // this.CB_Type.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CB_Type.FormattingEnabled = true; this.CB_Type.Location = new System.Drawing.Point(71, 35); this.CB_Type.Name = "CB_Type"; this.CB_Type.Size = new System.Drawing.Size(99, 21); this.CB_Type.TabIndex = 3; - // + // // CB_Category - // + // this.CB_Category.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CB_Category.FormattingEnabled = true; this.CB_Category.Location = new System.Drawing.Point(71, 58); this.CB_Category.Name = "CB_Category"; this.CB_Category.Size = new System.Drawing.Size(99, 21); this.CB_Category.TabIndex = 4; - // + // // L_Category - // + // this.L_Category.AutoSize = true; this.L_Category.Location = new System.Drawing.Point(18, 61); this.L_Category.Name = "L_Category"; @@ -180,9 +175,9 @@ private void InitializeComponent() this.L_Category.TabIndex = 5; this.L_Category.Text = "Category:"; this.L_Category.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // + // // L_BP - // + // this.L_BP.AutoSize = true; this.L_BP.Location = new System.Drawing.Point(26, 132); this.L_BP.Name = "L_BP"; @@ -190,9 +185,9 @@ private void InitializeComponent() this.L_BP.TabIndex = 7; this.L_BP.Text = "Power:"; this.L_BP.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // + // // L_PP - // + // this.L_PP.AutoSize = true; this.L_PP.Location = new System.Drawing.Point(15, 174); this.L_PP.Name = "L_PP"; @@ -200,9 +195,9 @@ private void InitializeComponent() this.L_PP.TabIndex = 8; this.L_PP.Text = "Base PP:"; this.L_PP.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // + // // L_Min - // + // this.L_Min.AutoSize = true; this.L_Min.Location = new System.Drawing.Point(236, 132); this.L_Min.Name = "L_Min"; @@ -210,9 +205,9 @@ private void InitializeComponent() this.L_Min.TabIndex = 10; this.L_Min.Text = "Min Hits:"; this.L_Min.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // + // // L_Max - // + // this.L_Max.AutoSize = true; this.L_Max.Location = new System.Drawing.Point(233, 153); this.L_Max.Name = "L_Max"; @@ -220,18 +215,18 @@ private void InitializeComponent() this.L_Max.TabIndex = 12; this.L_Max.Text = "Max Hits:"; this.L_Max.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // + // // L_Priority - // + // this.L_Priority.AutoSize = true; this.L_Priority.Location = new System.Drawing.Point(25, 195); this.L_Priority.Name = "L_Priority"; this.L_Priority.Size = new System.Drawing.Size(41, 13); this.L_Priority.TabIndex = 17; this.L_Priority.Text = "Priority:"; - // + // // NUD_HitMax - // + // this.NUD_HitMax.Location = new System.Drawing.Point(290, 151); this.NUD_HitMax.Maximum = new decimal(new int[] { 6, @@ -241,9 +236,9 @@ private void InitializeComponent() this.NUD_HitMax.Name = "NUD_HitMax"; this.NUD_HitMax.Size = new System.Drawing.Size(30, 20); this.NUD_HitMax.TabIndex = 18; - // + // // NUD_HitMin - // + // this.NUD_HitMin.Location = new System.Drawing.Point(290, 130); this.NUD_HitMin.Maximum = new decimal(new int[] { 6, @@ -253,9 +248,9 @@ private void InitializeComponent() this.NUD_HitMin.Name = "NUD_HitMin"; this.NUD_HitMin.Size = new System.Drawing.Size(30, 20); this.NUD_HitMin.TabIndex = 19; - // + // // NUD_Priority - // + // this.NUD_Priority.Location = new System.Drawing.Point(72, 193); this.NUD_Priority.Maximum = new decimal(new int[] { 8, @@ -270,9 +265,9 @@ private void InitializeComponent() this.NUD_Priority.Name = "NUD_Priority"; this.NUD_Priority.Size = new System.Drawing.Size(35, 20); this.NUD_Priority.TabIndex = 20; - // + // // NUD_PP - // + // this.NUD_PP.Location = new System.Drawing.Point(72, 172); this.NUD_PP.Maximum = new decimal(new int[] { 40, @@ -282,9 +277,9 @@ private void InitializeComponent() this.NUD_PP.Name = "NUD_PP"; this.NUD_PP.Size = new System.Drawing.Size(35, 20); this.NUD_PP.TabIndex = 21; - // + // // NUD_Power - // + // this.NUD_Power.Location = new System.Drawing.Point(72, 130); this.NUD_Power.Maximum = new decimal(new int[] { 255, @@ -294,9 +289,9 @@ private void InitializeComponent() this.NUD_Power.Name = "NUD_Power"; this.NUD_Power.Size = new System.Drawing.Size(45, 20); this.NUD_Power.TabIndex = 22; - // + // // NUD_TurnMin - // + // this.NUD_TurnMin.Location = new System.Drawing.Point(290, 172); this.NUD_TurnMin.Maximum = new decimal(new int[] { 15, @@ -306,9 +301,9 @@ private void InitializeComponent() this.NUD_TurnMin.Name = "NUD_TurnMin"; this.NUD_TurnMin.Size = new System.Drawing.Size(30, 20); this.NUD_TurnMin.TabIndex = 26; - // + // // L_TrapMin - // + // this.L_TrapMin.AutoSize = true; this.L_TrapMin.Location = new System.Drawing.Point(227, 174); this.L_TrapMin.Name = "L_TrapMin"; @@ -316,9 +311,9 @@ private void InitializeComponent() this.L_TrapMin.TabIndex = 23; this.L_TrapMin.Text = "Min Turns:"; this.L_TrapMin.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // + // // NUD_TurnMax - // + // this.NUD_TurnMax.Location = new System.Drawing.Point(290, 193); this.NUD_TurnMax.Maximum = new decimal(new int[] { 15, @@ -328,9 +323,9 @@ private void InitializeComponent() this.NUD_TurnMax.Name = "NUD_TurnMax"; this.NUD_TurnMax.Size = new System.Drawing.Size(30, 20); this.NUD_TurnMax.TabIndex = 25; - // + // // L_TrapMax - // + // this.L_TrapMax.AutoSize = true; this.L_TrapMax.Location = new System.Drawing.Point(224, 195); this.L_TrapMax.Name = "L_TrapMax"; @@ -338,9 +333,9 @@ private void InitializeComponent() this.L_TrapMax.TabIndex = 24; this.L_TrapMax.Text = "Max Turns:"; this.L_TrapMax.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // + // // NUD_Recoil - // + // this.NUD_Recoil.Location = new System.Drawing.Point(184, 172); this.NUD_Recoil.Minimum = new decimal(new int[] { 100, @@ -350,9 +345,9 @@ private void InitializeComponent() this.NUD_Recoil.Name = "NUD_Recoil"; this.NUD_Recoil.Size = new System.Drawing.Size(40, 20); this.NUD_Recoil.TabIndex = 34; - // + // // L_Recoil - // + // this.L_Recoil.AutoSize = true; this.L_Recoil.Location = new System.Drawing.Point(114, 174); this.L_Recoil.Name = "L_Recoil"; @@ -360,9 +355,9 @@ private void InitializeComponent() this.L_Recoil.TabIndex = 31; this.L_Recoil.Text = "Rec/Abs %:"; this.L_Recoil.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // + // // NUD_Heal - // + // this.NUD_Heal.Location = new System.Drawing.Point(184, 151); this.NUD_Heal.Maximum = new decimal(new int[] { 255, @@ -372,9 +367,9 @@ private void InitializeComponent() this.NUD_Heal.Name = "NUD_Heal"; this.NUD_Heal.Size = new System.Drawing.Size(40, 20); this.NUD_Heal.TabIndex = 33; - // + // // L_Heal - // + // this.L_Heal.AutoSize = true; this.L_Heal.Location = new System.Drawing.Point(135, 153); this.L_Heal.Name = "L_Heal"; @@ -382,9 +377,9 @@ private void InitializeComponent() this.L_Heal.TabIndex = 32; this.L_Heal.Text = "Heal %:"; this.L_Heal.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // + // // NUD_CritStage - // + // this.NUD_CritStage.Location = new System.Drawing.Point(184, 193); this.NUD_CritStage.Maximum = new decimal(new int[] { 6, @@ -394,9 +389,9 @@ private void InitializeComponent() this.NUD_CritStage.Name = "NUD_CritStage"; this.NUD_CritStage.Size = new System.Drawing.Size(30, 20); this.NUD_CritStage.TabIndex = 30; - // + // // L_CritStage - // + // this.L_CritStage.AutoSize = true; this.L_CritStage.Location = new System.Drawing.Point(122, 195); this.L_CritStage.Name = "L_CritStage"; @@ -404,9 +399,9 @@ private void InitializeComponent() this.L_CritStage.TabIndex = 27; this.L_CritStage.Text = "Crit Stage:"; this.L_CritStage.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // + // // NUD_Flinch - // + // this.NUD_Flinch.Location = new System.Drawing.Point(184, 130); this.NUD_Flinch.Maximum = new decimal(new int[] { 101, @@ -416,9 +411,9 @@ private void InitializeComponent() this.NUD_Flinch.Name = "NUD_Flinch"; this.NUD_Flinch.Size = new System.Drawing.Size(40, 20); this.NUD_Flinch.TabIndex = 29; - // + // // L_Flinch - // + // this.L_Flinch.AutoSize = true; this.L_Flinch.Location = new System.Drawing.Point(129, 132); this.L_Flinch.Name = "L_Flinch"; @@ -426,9 +421,9 @@ private void InitializeComponent() this.L_Flinch.TabIndex = 28; this.L_Flinch.Text = "Flinch %:"; this.L_Flinch.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // + // // GB_Stat - // + // this.GB_Stat.Controls.Add(this.NUD_StatP3); this.GB_Stat.Controls.Add(this.NUD_StatP2); this.GB_Stat.Controls.Add(this.NUD_StatP1); @@ -447,9 +442,9 @@ private void InitializeComponent() this.GB_Stat.TabIndex = 35; this.GB_Stat.TabStop = false; this.GB_Stat.Text = "Stat Stage Changes"; - // + // // NUD_StatP3 - // + // this.NUD_StatP3.Location = new System.Drawing.Point(165, 68); this.NUD_StatP3.Maximum = new decimal(new int[] { 101, @@ -459,9 +454,9 @@ private void InitializeComponent() this.NUD_StatP3.Name = "NUD_StatP3"; this.NUD_StatP3.Size = new System.Drawing.Size(40, 20); this.NUD_StatP3.TabIndex = 44; - // + // // NUD_StatP2 - // + // this.NUD_StatP2.Location = new System.Drawing.Point(165, 46); this.NUD_StatP2.Maximum = new decimal(new int[] { 101, @@ -471,9 +466,9 @@ private void InitializeComponent() this.NUD_StatP2.Name = "NUD_StatP2"; this.NUD_StatP2.Size = new System.Drawing.Size(40, 20); this.NUD_StatP2.TabIndex = 43; - // + // // NUD_StatP1 - // + // this.NUD_StatP1.Location = new System.Drawing.Point(165, 24); this.NUD_StatP1.Maximum = new decimal(new int[] { 101, @@ -483,9 +478,9 @@ private void InitializeComponent() this.NUD_StatP1.Name = "NUD_StatP1"; this.NUD_StatP1.Size = new System.Drawing.Size(40, 20); this.NUD_StatP1.TabIndex = 42; - // + // // NUD_Stat2 - // + // this.NUD_Stat2.Location = new System.Drawing.Point(127, 46); this.NUD_Stat2.Maximum = new decimal(new int[] { 5, @@ -500,9 +495,9 @@ private void InitializeComponent() this.NUD_Stat2.Name = "NUD_Stat2"; this.NUD_Stat2.Size = new System.Drawing.Size(35, 20); this.NUD_Stat2.TabIndex = 41; - // + // // NUD_Stat3 - // + // this.NUD_Stat3.Location = new System.Drawing.Point(127, 68); this.NUD_Stat3.Maximum = new decimal(new int[] { 5, @@ -517,9 +512,9 @@ private void InitializeComponent() this.NUD_Stat3.Name = "NUD_Stat3"; this.NUD_Stat3.Size = new System.Drawing.Size(35, 20); this.NUD_Stat3.TabIndex = 40; - // + // // NUD_Stat1 - // + // this.NUD_Stat1.Location = new System.Drawing.Point(127, 24); this.NUD_Stat1.Maximum = new decimal(new int[] { 5, @@ -534,63 +529,63 @@ private void InitializeComponent() this.NUD_Stat1.Name = "NUD_Stat1"; this.NUD_Stat1.Size = new System.Drawing.Size(35, 20); this.NUD_Stat1.TabIndex = 39; - // + // // CB_Stat3 - // + // this.CB_Stat3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CB_Stat3.FormattingEnabled = true; this.CB_Stat3.Location = new System.Drawing.Point(27, 67); this.CB_Stat3.Name = "CB_Stat3"; this.CB_Stat3.Size = new System.Drawing.Size(99, 21); this.CB_Stat3.TabIndex = 38; - // + // // CB_Stat2 - // + // this.CB_Stat2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CB_Stat2.FormattingEnabled = true; this.CB_Stat2.Location = new System.Drawing.Point(27, 45); this.CB_Stat2.Name = "CB_Stat2"; this.CB_Stat2.Size = new System.Drawing.Size(99, 21); this.CB_Stat2.TabIndex = 37; - // + // // CB_Stat1 - // + // this.CB_Stat1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CB_Stat1.FormattingEnabled = true; this.CB_Stat1.Location = new System.Drawing.Point(27, 23); this.CB_Stat1.Name = "CB_Stat1"; this.CB_Stat1.Size = new System.Drawing.Size(99, 21); this.CB_Stat1.TabIndex = 36; - // + // // L_Stage3 - // + // this.L_Stage3.AutoSize = true; this.L_Stage3.Location = new System.Drawing.Point(5, 70); this.L_Stage3.Name = "L_Stage3"; this.L_Stage3.Size = new System.Drawing.Size(16, 13); this.L_Stage3.TabIndex = 2; this.L_Stage3.Text = "3:"; - // + // // L_Stage2 - // + // this.L_Stage2.AutoSize = true; this.L_Stage2.Location = new System.Drawing.Point(5, 48); this.L_Stage2.Name = "L_Stage2"; this.L_Stage2.Size = new System.Drawing.Size(16, 13); this.L_Stage2.TabIndex = 1; this.L_Stage2.Text = "2:"; - // + // // L_Stage1 - // + // this.L_Stage1.AutoSize = true; this.L_Stage1.Location = new System.Drawing.Point(5, 26); this.L_Stage1.Name = "L_Stage1"; this.L_Stage1.Size = new System.Drawing.Size(16, 13); this.L_Stage1.TabIndex = 0; this.L_Stage1.Text = "1:"; - // + // // L_Targeting - // + // this.L_Targeting.AutoSize = true; this.L_Targeting.Location = new System.Drawing.Point(173, 38); this.L_Targeting.Name = "L_Targeting"; @@ -598,9 +593,9 @@ private void InitializeComponent() this.L_Targeting.TabIndex = 36; this.L_Targeting.Text = "Targeting:"; this.L_Targeting.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // + // // L_Influcts - // + // this.L_Influcts.AutoSize = true; this.L_Influcts.Location = new System.Drawing.Point(188, 60); this.L_Influcts.Name = "L_Influcts"; @@ -608,10 +603,10 @@ private void InitializeComponent() this.L_Influcts.TabIndex = 37; this.L_Influcts.Text = "Inflicts:"; this.L_Influcts.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // + // // RTB - // - this.RTB.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + // + this.RTB.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); this.RTB.Location = new System.Drawing.Point(12, 324); this.RTB.Name = "RTB"; @@ -619,9 +614,9 @@ private void InitializeComponent() this.RTB.Size = new System.Drawing.Size(316, 51); this.RTB.TabIndex = 38; this.RTB.Text = ""; - // + // // CB_Targeting - // + // this.CB_Targeting.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CB_Targeting.DropDownWidth = 150; this.CB_Targeting.FormattingEnabled = true; @@ -629,9 +624,9 @@ private void InitializeComponent() this.CB_Targeting.Name = "CB_Targeting"; this.CB_Targeting.Size = new System.Drawing.Size(99, 21); this.CB_Targeting.TabIndex = 39; - // + // // CB_Inflict - // + // this.CB_Inflict.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CB_Inflict.DropDownWidth = 150; this.CB_Inflict.FormattingEnabled = true; @@ -639,9 +634,9 @@ private void InitializeComponent() this.CB_Inflict.Name = "CB_Inflict"; this.CB_Inflict.Size = new System.Drawing.Size(99, 21); this.CB_Inflict.TabIndex = 40; - // + // // L_Inflict - // + // this.L_Inflict.AutoSize = true; this.L_Inflict.Location = new System.Drawing.Point(238, 81); this.L_Inflict.Name = "L_Inflict"; @@ -649,9 +644,9 @@ private void InitializeComponent() this.L_Inflict.TabIndex = 41; this.L_Inflict.Text = "Inflict %:"; this.L_Inflict.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // + // // NUD_Inflict - // + // this.NUD_Inflict.Location = new System.Drawing.Point(287, 78); this.NUD_Inflict.Maximum = new decimal(new int[] { 101, @@ -661,9 +656,9 @@ private void InitializeComponent() this.NUD_Inflict.Name = "NUD_Inflict"; this.NUD_Inflict.Size = new System.Drawing.Size(40, 20); this.NUD_Inflict.TabIndex = 42; - // + // // NUD_Effect - // + // this.NUD_Effect.Location = new System.Drawing.Point(150, 103); this.NUD_Effect.Maximum = new decimal(new int[] { 65535, @@ -673,9 +668,9 @@ private void InitializeComponent() this.NUD_Effect.Name = "NUD_Effect"; this.NUD_Effect.Size = new System.Drawing.Size(50, 20); this.NUD_Effect.TabIndex = 44; - // + // // L_Effect - // + // this.L_Effect.AutoSize = true; this.L_Effect.Location = new System.Drawing.Point(106, 106); this.L_Effect.Name = "L_Effect"; @@ -683,9 +678,9 @@ private void InitializeComponent() this.L_Effect.TabIndex = 45; this.L_Effect.Text = "Effect:"; this.L_Effect.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // + // // NUD_Accuracy - // + // this.NUD_Accuracy.Location = new System.Drawing.Point(72, 151); this.NUD_Accuracy.Maximum = new decimal(new int[] { 101, @@ -695,9 +690,9 @@ private void InitializeComponent() this.NUD_Accuracy.Name = "NUD_Accuracy"; this.NUD_Accuracy.Size = new System.Drawing.Size(40, 20); this.NUD_Accuracy.TabIndex = 47; - // + // // L_Accuracy - // + // this.L_Accuracy.AutoSize = true; this.L_Accuracy.Location = new System.Drawing.Point(17, 153); this.L_Accuracy.Name = "L_Accuracy"; @@ -705,9 +700,9 @@ private void InitializeComponent() this.L_Accuracy.TabIndex = 46; this.L_Accuracy.Text = "Accur %:"; this.L_Accuracy.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // + // // CB_Quality - // + // this.CB_Quality.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CB_Quality.DropDownWidth = 170; this.CB_Quality.FormattingEnabled = true; @@ -715,9 +710,9 @@ private void InitializeComponent() this.CB_Quality.Name = "CB_Quality"; this.CB_Quality.Size = new System.Drawing.Size(129, 21); this.CB_Quality.TabIndex = 48; - // + // // L_Quality - // + // this.L_Quality.AutoSize = true; this.L_Quality.Location = new System.Drawing.Point(20, 84); this.L_Quality.Name = "L_Quality"; @@ -725,9 +720,9 @@ private void InitializeComponent() this.L_Quality.TabIndex = 49; this.L_Quality.Text = "Qualities:"; this.L_Quality.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // + // // L_0xB - // + // this.L_0xB.AutoSize = true; this.L_0xB.Location = new System.Drawing.Point(256, 101); this.L_0xB.Name = "L_0xB"; @@ -735,9 +730,9 @@ private void InitializeComponent() this.L_0xB.TabIndex = 50; this.L_0xB.Text = "0xB:"; this.L_0xB.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // + // // NUD_0xB - // + // this.NUD_0xB.Location = new System.Drawing.Point(287, 99); this.NUD_0xB.Maximum = new decimal(new int[] { 255, @@ -747,53 +742,9 @@ private void InitializeComponent() this.NUD_0xB.Name = "NUD_0xB"; this.NUD_0xB.Size = new System.Drawing.Size(40, 20); this.NUD_0xB.TabIndex = 51; - // - // NUD_0x20 - // - this.NUD_0x20.Location = new System.Drawing.Point(282, 239); - this.NUD_0x20.Maximum = new decimal(new int[] { - 255, - 0, - 0, - 0}); - this.NUD_0x20.Name = "NUD_0x20"; - this.NUD_0x20.Size = new System.Drawing.Size(40, 20); - this.NUD_0x20.TabIndex = 52; - // - // NUD_0x21 - // - this.NUD_0x21.Location = new System.Drawing.Point(282, 261); - this.NUD_0x21.Maximum = new decimal(new int[] { - 255, - 0, - 0, - 0}); - this.NUD_0x21.Name = "NUD_0x21"; - this.NUD_0x21.Size = new System.Drawing.Size(40, 20); - this.NUD_0x21.TabIndex = 53; - // - // L_0x20 - // - this.L_0x20.AutoSize = true; - this.L_0x20.Location = new System.Drawing.Point(232, 242); - this.L_0x20.Name = "L_0x20"; - this.L_0x20.Size = new System.Drawing.Size(44, 13); - this.L_0x20.TabIndex = 59; - this.L_0x20.Text = "Flags 1:"; - this.L_0x20.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // L_0x21 - // - this.L_0x21.AutoSize = true; - this.L_0x21.Location = new System.Drawing.Point(233, 264); - this.L_0x21.Name = "L_0x21"; - this.L_0x21.Size = new System.Drawing.Size(44, 13); - this.L_0x21.TabIndex = 62; - this.L_0x21.Text = "Flags 2:"; - this.L_0x21.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // + // // B_RandAll - // + // this.B_RandAll.Location = new System.Drawing.Point(333, 10); this.B_RandAll.Name = "B_RandAll"; this.B_RandAll.Size = new System.Drawing.Size(98, 23); @@ -801,9 +752,9 @@ private void InitializeComponent() this.B_RandAll.Text = "Randomize!"; this.B_RandAll.UseVisualStyleBackColor = true; this.B_RandAll.Click += new System.EventHandler(this.B_RandAll_Click); - // + // // groupBox1 - // + // this.groupBox1.Controls.Add(this.CHK_Category); this.groupBox1.Controls.Add(this.CHK_Type); this.groupBox1.Location = new System.Drawing.Point(333, 60); @@ -812,9 +763,9 @@ private void InitializeComponent() this.groupBox1.TabIndex = 64; this.groupBox1.TabStop = false; this.groupBox1.Text = "Options"; - // + // // CHK_Category - // + // this.CHK_Category.AutoSize = true; this.CHK_Category.Location = new System.Drawing.Point(6, 34); this.CHK_Category.Name = "CHK_Category"; @@ -822,9 +773,9 @@ private void InitializeComponent() this.CHK_Category.TabIndex = 1; this.CHK_Category.Text = "Category"; this.CHK_Category.UseVisualStyleBackColor = true; - // + // // CHK_Type - // + // this.CHK_Type.AutoSize = true; this.CHK_Type.Location = new System.Drawing.Point(6, 19); this.CHK_Type.Name = "CHK_Type"; @@ -832,9 +783,9 @@ private void InitializeComponent() this.CHK_Type.TabIndex = 0; this.CHK_Type.Text = "Type"; this.CHK_Type.UseVisualStyleBackColor = true; - // + // // B_Metronome - // + // this.B_Metronome.Location = new System.Drawing.Point(333, 33); this.B_Metronome.Name = "B_Metronome"; this.B_Metronome.Size = new System.Drawing.Size(98, 23); @@ -842,9 +793,9 @@ private void InitializeComponent() this.B_Metronome.Text = "Metronome Mode"; this.B_Metronome.UseVisualStyleBackColor = true; this.B_Metronome.Click += new System.EventHandler(this.B_Metronome_Click); - // + // // B_Table - // + // this.B_Table.Location = new System.Drawing.Point(356, 117); this.B_Table.Name = "B_Table"; this.B_Table.Size = new System.Drawing.Size(75, 23); @@ -852,20 +803,25 @@ private void InitializeComponent() this.B_Table.Text = "Export Table"; this.B_Table.UseVisualStyleBackColor = true; this.B_Table.Click += new System.EventHandler(this.B_Table_Click); - // + // + // CLB_Flags + // + this.CLB_Flags.FormattingEnabled = true; + this.CLB_Flags.Location = new System.Drawing.Point(328, 146); + this.CLB_Flags.Name = "CLB_Flags"; + this.CLB_Flags.Size = new System.Drawing.Size(103, 229); + this.CLB_Flags.TabIndex = 70; + // // MoveEditor6 - // + // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(439, 381); + this.Controls.Add(this.CLB_Flags); this.Controls.Add(this.B_Table); this.Controls.Add(this.B_Metronome); this.Controls.Add(this.groupBox1); this.Controls.Add(this.B_RandAll); - this.Controls.Add(this.L_0x21); - this.Controls.Add(this.L_0x20); - this.Controls.Add(this.NUD_0x21); - this.Controls.Add(this.NUD_0x20); this.Controls.Add(this.NUD_0xB); this.Controls.Add(this.L_0xB); this.Controls.Add(this.CB_Quality); @@ -940,8 +896,6 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.NUD_Effect)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_Accuracy)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_0xB)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.NUD_0x20)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.NUD_0x21)).EndInit(); this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); this.ResumeLayout(false); @@ -1007,15 +961,12 @@ private void InitializeComponent() private System.Windows.Forms.NumericUpDown NUD_StatP1; private System.Windows.Forms.Label L_0xB; private System.Windows.Forms.NumericUpDown NUD_0xB; - private System.Windows.Forms.NumericUpDown NUD_0x20; - private System.Windows.Forms.NumericUpDown NUD_0x21; - private System.Windows.Forms.Label L_0x20; - private System.Windows.Forms.Label L_0x21; private System.Windows.Forms.Button B_RandAll; private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.CheckBox CHK_Category; private System.Windows.Forms.CheckBox CHK_Type; private System.Windows.Forms.Button B_Metronome; private System.Windows.Forms.Button B_Table; + private System.Windows.Forms.CheckedListBox CLB_Flags; } } \ No newline at end of file diff --git a/pk3DS/Subforms/Gen6/MoveEditor6.cs b/pk3DS/Subforms/Gen6/MoveEditor6.cs index 67f694e..9ea1d7c 100644 --- a/pk3DS/Subforms/Gen6/MoveEditor6.cs +++ b/pk3DS/Subforms/Gen6/MoveEditor6.cs @@ -58,6 +58,7 @@ private void Setup() foreach (string s in TargetingTypes) CB_Targeting.Items.Add(s); foreach (string s in MoveQualities) CB_Quality.Items.Add(s); foreach (string s in InflictionTypes) CB_Inflict.Items.Add(s); + foreach (var s in Enum.GetNames(typeof(MoveFlag6)).Skip(1)) CLB_Flags.Items.Add(s); CB_Inflict.Items.Add("Special"); CB_Move.Items.RemoveAt(0); @@ -112,15 +113,10 @@ private void GetEntry() NUD_StatP2.Value = data[0x1C]; NUD_StatP3.Value = data[0x1D]; - // Unknown (Bitflag Related for stuff like Contact and Extra Move Effects) - NUD_0x20.Value = data[0x20]; // 0x20 - NUD_0x21.Value = data[0x21]; // 0x21 - // end, the other bytes aren't used. - - //NUD_0x1E.Value = data[0x1E]; // 0x1E - //NUD_0x1F.Value = data[0x1F]; // 0x1F - //NUD_0x22.Value = data[0x22]; // 0x22 - //NUD_0x23.Value = data[0x23]; // 0x23 + var move = new Move6(data); + var flags = (uint)move.Flags; + for (int i = 0; i < CLB_Flags.Items.Count; i++) + CLB_Flags.SetItemChecked(i, ((flags >> i) & 1) == 1); } } @@ -159,9 +155,10 @@ private void SetEntry() data[0x1C] = (byte)NUD_StatP2.Value; data[0x1D] = (byte)NUD_StatP3.Value; - data[0x20] = (byte)NUD_0x20.Value; - data[0x21] = (byte)NUD_0x21.Value; - // end, the other bytes aren't used. + uint flagval = 0; + for (int i = 0; i < CLB_Flags.Items.Count; i++) + flagval |= CLB_Flags.GetItemChecked(i) ? 1u << i : 0; + BitConverter.GetBytes(flagval).CopyTo(data, 0x1E); } files[entry] = data; } diff --git a/pk3DS/Subforms/Gen7/MoveEditor7.Designer.cs b/pk3DS/Subforms/Gen7/MoveEditor7.Designer.cs index 310f237..c8d7ff2 100644 --- a/pk3DS/Subforms/Gen7/MoveEditor7.Designer.cs +++ b/pk3DS/Subforms/Gen7/MoveEditor7.Designer.cs @@ -84,16 +84,21 @@ private void InitializeComponent() this.L_Quality = new System.Windows.Forms.Label(); this.L_0xB = new System.Windows.Forms.Label(); this.NUD_0xB = new System.Windows.Forms.NumericUpDown(); - this.NUD_0x20 = new System.Windows.Forms.NumericUpDown(); - this.NUD_0x21 = new System.Windows.Forms.NumericUpDown(); - this.L_0x20 = new System.Windows.Forms.Label(); - this.L_0x21 = new System.Windows.Forms.Label(); this.B_RandAll = new System.Windows.Forms.Button(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.CHK_Category = new System.Windows.Forms.CheckBox(); this.CHK_Type = new System.Windows.Forms.CheckBox(); this.B_Metronome = new System.Windows.Forms.Button(); this.B_Table = new System.Windows.Forms.Button(); + this.CLB_Flags = new System.Windows.Forms.CheckedListBox(); + this.NUD_ZPower = new System.Windows.Forms.NumericUpDown(); + this.NUD_ZPercent = new System.Windows.Forms.NumericUpDown(); + this.NUD_ZUnk = new System.Windows.Forms.NumericUpDown(); + this.CB_ZMove = new System.Windows.Forms.ComboBox(); + this.L_ZMove = new System.Windows.Forms.Label(); + this.NUD_ZEffect = new System.Windows.Forms.NumericUpDown(); + this.L_ZPower = new System.Windows.Forms.Label(); + this.L_ZEffect = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.NUD_HitMax)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_HitMin)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_Priority)).BeginInit(); @@ -116,9 +121,11 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.NUD_Effect)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_Accuracy)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_0xB)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.NUD_0x20)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.NUD_0x21)).BeginInit(); this.groupBox1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_ZPower)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_ZPercent)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_ZUnk)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_ZEffect)).BeginInit(); this.SuspendLayout(); // // L_Type @@ -748,50 +755,6 @@ private void InitializeComponent() this.NUD_0xB.Size = new System.Drawing.Size(40, 20); this.NUD_0xB.TabIndex = 51; // - // NUD_0x20 - // - this.NUD_0x20.Location = new System.Drawing.Point(282, 239); - this.NUD_0x20.Maximum = new decimal(new int[] { - 255, - 0, - 0, - 0}); - this.NUD_0x20.Name = "NUD_0x20"; - this.NUD_0x20.Size = new System.Drawing.Size(40, 20); - this.NUD_0x20.TabIndex = 52; - // - // NUD_0x21 - // - this.NUD_0x21.Location = new System.Drawing.Point(282, 261); - this.NUD_0x21.Maximum = new decimal(new int[] { - 255, - 0, - 0, - 0}); - this.NUD_0x21.Name = "NUD_0x21"; - this.NUD_0x21.Size = new System.Drawing.Size(40, 20); - this.NUD_0x21.TabIndex = 53; - // - // L_0x20 - // - this.L_0x20.AutoSize = true; - this.L_0x20.Location = new System.Drawing.Point(232, 242); - this.L_0x20.Name = "L_0x20"; - this.L_0x20.Size = new System.Drawing.Size(44, 13); - this.L_0x20.TabIndex = 59; - this.L_0x20.Text = "Flags 1:"; - this.L_0x20.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // L_0x21 - // - this.L_0x21.AutoSize = true; - this.L_0x21.Location = new System.Drawing.Point(233, 264); - this.L_0x21.Name = "L_0x21"; - this.L_0x21.Size = new System.Drawing.Size(44, 13); - this.L_0x21.TabIndex = 62; - this.L_0x21.Text = "Flags 2:"; - this.L_0x21.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // // B_RandAll // this.B_RandAll.Location = new System.Drawing.Point(333, 10); @@ -853,19 +816,118 @@ private void InitializeComponent() this.B_Table.UseVisualStyleBackColor = true; this.B_Table.Click += new System.EventHandler(this.B_Table_Click); // + // CLB_Flags + // + this.CLB_Flags.FormattingEnabled = true; + this.CLB_Flags.Location = new System.Drawing.Point(328, 146); + this.CLB_Flags.Name = "CLB_Flags"; + this.CLB_Flags.Size = new System.Drawing.Size(103, 229); + this.CLB_Flags.TabIndex = 71; + // + // NUD_ZPower + // + this.NUD_ZPower.Location = new System.Drawing.Point(282, 260); + this.NUD_ZPower.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.NUD_ZPower.Name = "NUD_ZPower"; + this.NUD_ZPower.Size = new System.Drawing.Size(40, 20); + this.NUD_ZPower.TabIndex = 72; + // + // NUD_ZPercent + // + this.NUD_ZPercent.Location = new System.Drawing.Point(239, 302); + this.NUD_ZPercent.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.NUD_ZPercent.Name = "NUD_ZPercent"; + this.NUD_ZPercent.Size = new System.Drawing.Size(40, 20); + this.NUD_ZPercent.TabIndex = 73; + // + // NUD_ZUnk + // + this.NUD_ZUnk.Location = new System.Drawing.Point(282, 302); + this.NUD_ZUnk.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.NUD_ZUnk.Name = "NUD_ZUnk"; + this.NUD_ZUnk.Size = new System.Drawing.Size(40, 20); + this.NUD_ZUnk.TabIndex = 74; + // + // CB_ZMove + // + this.CB_ZMove.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; + this.CB_ZMove.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_ZMove.DropDownWidth = 150; + this.CB_ZMove.FormattingEnabled = true; + this.CB_ZMove.Location = new System.Drawing.Point(227, 235); + this.CB_ZMove.Name = "CB_ZMove"; + this.CB_ZMove.Size = new System.Drawing.Size(95, 21); + this.CB_ZMove.TabIndex = 75; + // + // L_ZMove + // + this.L_ZMove.AutoSize = true; + this.L_ZMove.Location = new System.Drawing.Point(229, 219); + this.L_ZMove.Name = "L_ZMove"; + this.L_ZMove.Size = new System.Drawing.Size(44, 13); + this.L_ZMove.TabIndex = 76; + this.L_ZMove.Text = "Z Move"; + // + // NUD_ZEffect + // + this.NUD_ZEffect.Location = new System.Drawing.Point(282, 281); + this.NUD_ZEffect.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.NUD_ZEffect.Name = "NUD_ZEffect"; + this.NUD_ZEffect.Size = new System.Drawing.Size(40, 20); + this.NUD_ZEffect.TabIndex = 77; + // + // L_ZPower + // + this.L_ZPower.AutoSize = true; + this.L_ZPower.Location = new System.Drawing.Point(229, 262); + this.L_ZPower.Name = "L_ZPower"; + this.L_ZPower.Size = new System.Drawing.Size(37, 13); + this.L_ZPower.TabIndex = 78; + this.L_ZPower.Text = "Power"; + // + // L_ZEffect + // + this.L_ZEffect.AutoSize = true; + this.L_ZEffect.Location = new System.Drawing.Point(229, 283); + this.L_ZEffect.Name = "L_ZEffect"; + this.L_ZEffect.Size = new System.Drawing.Size(35, 13); + this.L_ZEffect.TabIndex = 79; + this.L_ZEffect.Text = "Effect"; + // // MoveEditor7 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(439, 381); + this.Controls.Add(this.L_ZEffect); + this.Controls.Add(this.L_ZPower); + this.Controls.Add(this.NUD_ZEffect); + this.Controls.Add(this.L_ZMove); + this.Controls.Add(this.CB_ZMove); + this.Controls.Add(this.NUD_ZUnk); + this.Controls.Add(this.NUD_ZPercent); + this.Controls.Add(this.NUD_ZPower); + this.Controls.Add(this.CLB_Flags); this.Controls.Add(this.B_Table); this.Controls.Add(this.B_Metronome); this.Controls.Add(this.groupBox1); this.Controls.Add(this.B_RandAll); - this.Controls.Add(this.L_0x21); - this.Controls.Add(this.L_0x20); - this.Controls.Add(this.NUD_0x21); - this.Controls.Add(this.NUD_0x20); this.Controls.Add(this.NUD_0xB); this.Controls.Add(this.L_0xB); this.Controls.Add(this.CB_Quality); @@ -940,10 +1002,12 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.NUD_Effect)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_Accuracy)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_0xB)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.NUD_0x20)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.NUD_0x21)).EndInit(); this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_ZPower)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_ZPercent)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_ZUnk)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_ZEffect)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -1007,15 +1071,20 @@ private void InitializeComponent() private System.Windows.Forms.NumericUpDown NUD_StatP1; private System.Windows.Forms.Label L_0xB; private System.Windows.Forms.NumericUpDown NUD_0xB; - private System.Windows.Forms.NumericUpDown NUD_0x20; - private System.Windows.Forms.NumericUpDown NUD_0x21; - private System.Windows.Forms.Label L_0x20; - private System.Windows.Forms.Label L_0x21; private System.Windows.Forms.Button B_RandAll; private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.CheckBox CHK_Category; private System.Windows.Forms.CheckBox CHK_Type; private System.Windows.Forms.Button B_Metronome; private System.Windows.Forms.Button B_Table; + private System.Windows.Forms.CheckedListBox CLB_Flags; + private System.Windows.Forms.NumericUpDown NUD_ZPower; + private System.Windows.Forms.NumericUpDown NUD_ZPercent; + private System.Windows.Forms.NumericUpDown NUD_ZUnk; + private System.Windows.Forms.ComboBox CB_ZMove; + private System.Windows.Forms.Label L_ZMove; + private System.Windows.Forms.NumericUpDown NUD_ZEffect; + private System.Windows.Forms.Label L_ZPower; + private System.Windows.Forms.Label L_ZEffect; } } \ No newline at end of file diff --git a/pk3DS/Subforms/Gen7/MoveEditor7.cs b/pk3DS/Subforms/Gen7/MoveEditor7.cs index 25352ba..d3dac48 100644 --- a/pk3DS/Subforms/Gen7/MoveEditor7.cs +++ b/pk3DS/Subforms/Gen7/MoveEditor7.cs @@ -58,6 +58,8 @@ private void Setup() foreach (string s in TargetingTypes) CB_Targeting.Items.Add(s); foreach (string s in MoveQualities) CB_Quality.Items.Add(s); foreach (string s in InflictionTypes) CB_Inflict.Items.Add(s); + foreach (string s in movelist) CB_ZMove.Items.Add(s); + foreach (var s in Enum.GetNames(typeof(MoveFlag7)).Skip(1)) CLB_Flags.Items.Add(s); CB_Inflict.Items.Add("Special"); CB_Move.Items.RemoveAt(0); @@ -112,15 +114,16 @@ private void GetEntry() NUD_StatP2.Value = data[0x1C]; NUD_StatP3.Value = data[0x1D]; - // Unknown (Bitflag Related for stuff like Contact and Extra Move Effects) - NUD_0x20.Value = data[0x20]; // 0x20 - NUD_0x21.Value = data[0x21]; // 0x21 - // end, the other bytes aren't used. + var move = new Move7(data); + CB_ZMove.SelectedIndex = move.ZMove; + NUD_ZPower.Value = move.ZPower; + NUD_ZEffect.Value = move.ZEffect; + NUD_ZPercent.Value = move.ZPercent; + NUD_ZUnk.Value = move.Z3; - //NUD_0x1E.Value = data[0x1E]; // 0x1E - //NUD_0x1F.Value = data[0x1F]; // 0x1F - //NUD_0x22.Value = data[0x22]; // 0x22 - //NUD_0x23.Value = data[0x23]; // 0x23 + var flags = (uint)move.Flags; + for (int i = 0; i < CLB_Flags.Items.Count; i++) + CLB_Flags.SetItemChecked(i, ((flags >> i) & 1) == 1); } } @@ -159,9 +162,19 @@ private void setEntry() data[0x1C] = (byte)NUD_StatP2.Value; data[0x1D] = (byte)NUD_StatP3.Value; - data[0x20] = (byte)NUD_0x20.Value; - data[0x21] = (byte)NUD_0x21.Value; - // end, the other bytes aren't used. + var move = new Move7(data) + { + ZMove = CB_ZMove.SelectedIndex, + ZPower = (int) NUD_ZPower.Value, + ZEffect = (int) NUD_ZEffect.Value, + ZPercent = (int) NUD_ZPercent.Value, + Z3 = (int) NUD_ZUnk.Value + }; + + uint flagval = 0; + for (int i = 0; i < CLB_Flags.Items.Count; i++) + flagval |= CLB_Flags.GetItemChecked(i) ? 1u << i : 0; + move.Flags = (MoveFlag7) flagval; } files[entry] = data; }