diff --git a/pk3DS/Subforms/Gen6/ItemEditor6.Designer.cs b/pk3DS/Subforms/Gen6/ItemEditor6.Designer.cs index 7d8add8..09bfaea 100644 --- a/pk3DS/Subforms/Gen6/ItemEditor6.Designer.cs +++ b/pk3DS/Subforms/Gen6/ItemEditor6.Designer.cs @@ -127,7 +127,7 @@ private void InitializeComponent() // L_Sell // this.L_Sell.AutoSize = true; - this.L_Sell.Location = new System.Drawing.Point(103, 59); + this.L_Sell.Location = new System.Drawing.Point(103, 61); this.L_Sell.Name = "L_Sell"; this.L_Sell.Size = new System.Drawing.Size(54, 13); this.L_Sell.TabIndex = 44; @@ -136,7 +136,7 @@ private void InitializeComponent() // MT_Sell // this.MT_Sell.Enabled = false; - this.MT_Sell.Location = new System.Drawing.Point(163, 56); + this.MT_Sell.Location = new System.Drawing.Point(163, 58); this.MT_Sell.Mask = "00000"; this.MT_Sell.Name = "MT_Sell"; this.MT_Sell.Size = new System.Drawing.Size(37, 20); @@ -152,7 +152,7 @@ private void InitializeComponent() this.L_Index.TabIndex = 46; this.L_Index.Text = "Index: "; // - // Item + // ItemEditor6 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; @@ -171,7 +171,7 @@ private void InitializeComponent() this.MaximizeBox = false; this.MaximumSize = new System.Drawing.Size(355, 420); this.MinimumSize = new System.Drawing.Size(355, 220); - this.Name = "Item"; + this.Name = "ItemEditor6"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Item Editor"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.formClosing); diff --git a/pk3DS/Subforms/Gen6/LevelUpEditor6.Designer.cs b/pk3DS/Subforms/Gen6/LevelUpEditor6.Designer.cs index f23a455..f2c0cc0 100644 --- a/pk3DS/Subforms/Gen6/LevelUpEditor6.Designer.cs +++ b/pk3DS/Subforms/Gen6/LevelUpEditor6.Designer.cs @@ -34,6 +34,8 @@ private void InitializeComponent() this.B_RandAll = new System.Windows.Forms.Button(); this.B_Dump = new System.Windows.Forms.Button(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.CHK_NoFixedDamage = new System.Windows.Forms.CheckBox(); + this.CHK_4MovesLvl1 = new System.Windows.Forms.CheckBox(); this.L_Moves = new System.Windows.Forms.Label(); this.NUD_Moves = new System.Windows.Forms.NumericUpDown(); this.CHK_Expand = new System.Windows.Forms.CheckBox(); @@ -46,8 +48,6 @@ private void InitializeComponent() this.CHK_STAB = new System.Windows.Forms.CheckBox(); this.CHK_HMs = new System.Windows.Forms.CheckBox(); this.PB_MonSprite = new System.Windows.Forms.PictureBox(); - this.CHK_4MovesLvl1 = new System.Windows.Forms.CheckBox(); - this.CHK_NoFixedDamage = new System.Windows.Forms.CheckBox(); ((System.ComponentModel.ISupportInitialize)(this.dgv)).BeginInit(); this.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.NUD_Moves)).BeginInit(); @@ -134,6 +134,28 @@ private void InitializeComponent() this.groupBox1.TabStop = false; this.groupBox1.Text = "Options"; // + // CHK_NoFixedDamage + // + this.CHK_NoFixedDamage.AutoSize = true; + this.CHK_NoFixedDamage.Checked = true; + this.CHK_NoFixedDamage.CheckState = System.Windows.Forms.CheckState.Checked; + this.CHK_NoFixedDamage.Location = new System.Drawing.Point(5, 271); + this.CHK_NoFixedDamage.Name = "CHK_NoFixedDamage"; + this.CHK_NoFixedDamage.Size = new System.Drawing.Size(68, 43); + this.CHK_NoFixedDamage.TabIndex = 14; + this.CHK_NoFixedDamage.Text = "No Fixed\nDamage\nMoves\n(Dragon Rage\n+ Sonic Boom)"; + this.CHK_NoFixedDamage.UseVisualStyleBackColor = true; + // + // CHK_4MovesLvl1 + // + this.CHK_4MovesLvl1.AutoSize = true; + this.CHK_4MovesLvl1.Location = new System.Drawing.Point(5, 159); + this.CHK_4MovesLvl1.Name = "CHK_4MovesLvl1"; + this.CHK_4MovesLvl1.Size = new System.Drawing.Size(70, 30); + this.CHK_4MovesLvl1.TabIndex = 11; + this.CHK_4MovesLvl1.Text = "Start with\n4 Moves"; + this.CHK_4MovesLvl1.UseVisualStyleBackColor = true; + // // L_Moves // this.L_Moves.AutoSize = true; @@ -276,28 +298,6 @@ private void InitializeComponent() this.PB_MonSprite.TabIndex = 90; this.PB_MonSprite.TabStop = false; // - // CHK_4MovesLvl1 - // - this.CHK_4MovesLvl1.AutoSize = true; - this.CHK_4MovesLvl1.Location = new System.Drawing.Point(5, 154); - this.CHK_4MovesLvl1.Name = "CHK_4MovesLvl1"; - this.CHK_4MovesLvl1.Size = new System.Drawing.Size(67, 30); - this.CHK_4MovesLvl1.TabIndex = 11; - this.CHK_4MovesLvl1.Text = "4 Moves\r\n@ Lvl1"; - this.CHK_4MovesLvl1.UseVisualStyleBackColor = true; - // - // CHK_NoFixedDamage - // - this.CHK_NoFixedDamage.AutoSize = true; - this.CHK_NoFixedDamage.Checked = true; - this.CHK_NoFixedDamage.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_NoFixedDamage.Location = new System.Drawing.Point(5, 266); - this.CHK_NoFixedDamage.Name = "CHK_NoFixedDamage"; - this.CHK_NoFixedDamage.Size = new System.Drawing.Size(90, 56); - this.CHK_NoFixedDamage.TabIndex = 14; - this.CHK_NoFixedDamage.Text = "No Fixed\r\nDamage\r\nDragon Rage\r\nSonicboom"; - this.CHK_NoFixedDamage.UseVisualStyleBackColor = true; - // // LevelUpEditor6 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/pk3DS/Subforms/Gen6/PersonalEditor6.Designer.cs b/pk3DS/Subforms/Gen6/PersonalEditor6.Designer.cs index f8541d6..2215f1a 100644 --- a/pk3DS/Subforms/Gen6/PersonalEditor6.Designer.cs +++ b/pk3DS/Subforms/Gen6/PersonalEditor6.Designer.cs @@ -1106,9 +1106,9 @@ private void InitializeComponent() this.L_FinalXP.AutoSize = true; this.L_FinalXP.Location = new System.Drawing.Point(6, 71); this.L_FinalXP.Name = "L_FinalXP"; - this.L_FinalXP.Size = new System.Drawing.Size(57, 13); + this.L_FinalXP.Size = new System.Drawing.Size(63, 13); this.L_FinalXP.TabIndex = 6; - this.L_FinalXP.Text = "FinalXP(%)"; + this.L_FinalXP.Text = "Final XP (%)"; // // NUD_EXP // @@ -1182,7 +1182,7 @@ private void InitializeComponent() // L_Same // this.L_Same.AutoSize = true; - this.L_Same.Location = new System.Drawing.Point(226, 100); + this.L_Same.Location = new System.Drawing.Point(216, 101); this.L_Same.Name = "L_Same"; this.L_Same.Size = new System.Drawing.Size(48, 13); this.L_Same.TabIndex = 23; @@ -1190,7 +1190,7 @@ private void InitializeComponent() // // NUD_Egg // - this.NUD_Egg.Location = new System.Drawing.Point(277, 98); + this.NUD_Egg.Location = new System.Drawing.Point(267, 99); this.NUD_Egg.Name = "NUD_Egg"; this.NUD_Egg.Size = new System.Drawing.Size(46, 20); this.NUD_Egg.TabIndex = 22; @@ -1228,7 +1228,7 @@ private void InitializeComponent() this.CHK_ORASTutors.AutoSize = true; this.CHK_ORASTutors.Checked = true; this.CHK_ORASTutors.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_ORASTutors.Location = new System.Drawing.Point(229, 49); + this.CHK_ORASTutors.Location = new System.Drawing.Point(219, 50); this.CHK_ORASTutors.Name = "CHK_ORASTutors"; this.CHK_ORASTutors.Size = new System.Drawing.Size(120, 17); this.CHK_ORASTutors.TabIndex = 9; @@ -1240,7 +1240,7 @@ private void InitializeComponent() this.CHK_Tutors.AutoSize = true; this.CHK_Tutors.Checked = true; this.CHK_Tutors.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_Tutors.Location = new System.Drawing.Point(229, 34); + this.CHK_Tutors.Location = new System.Drawing.Point(219, 34); this.CHK_Tutors.Name = "CHK_Tutors"; this.CHK_Tutors.Size = new System.Drawing.Size(94, 17); this.CHK_Tutors.TabIndex = 8; @@ -1357,7 +1357,7 @@ private void InitializeComponent() this.CHK_HM.AutoSize = true; this.CHK_HM.Checked = true; this.CHK_HM.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_HM.Location = new System.Drawing.Point(277, 19); + this.CHK_HM.Location = new System.Drawing.Point(267, 19); this.CHK_HM.Name = "CHK_HM"; this.CHK_HM.Size = new System.Drawing.Size(43, 17); this.CHK_HM.TabIndex = 7; @@ -1378,7 +1378,7 @@ private void InitializeComponent() this.CHK_TM.AutoSize = true; this.CHK_TM.Checked = true; this.CHK_TM.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_TM.Location = new System.Drawing.Point(229, 19); + this.CHK_TM.Location = new System.Drawing.Point(219, 19); this.CHK_TM.Name = "CHK_TM"; this.CHK_TM.Size = new System.Drawing.Size(42, 17); this.CHK_TM.TabIndex = 0; @@ -1415,7 +1415,7 @@ private void InitializeComponent() this.CHK_EggGroup.AutoSize = true; this.CHK_EggGroup.Checked = true; this.CHK_EggGroup.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_EggGroup.Location = new System.Drawing.Point(229, 80); + this.CHK_EggGroup.Location = new System.Drawing.Point(219, 81); this.CHK_EggGroup.Name = "CHK_EggGroup"; this.CHK_EggGroup.Size = new System.Drawing.Size(77, 17); this.CHK_EggGroup.TabIndex = 13; @@ -1427,7 +1427,7 @@ private void InitializeComponent() this.CHK_CatchRate.AutoSize = true; this.CHK_CatchRate.Checked = true; this.CHK_CatchRate.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_CatchRate.Location = new System.Drawing.Point(229, 65); + this.CHK_CatchRate.Location = new System.Drawing.Point(219, 66); this.CHK_CatchRate.Name = "CHK_CatchRate"; this.CHK_CatchRate.Size = new System.Drawing.Size(80, 17); this.CHK_CatchRate.TabIndex = 11; diff --git a/pk3DS/Subforms/Gen6/RSWE.cs b/pk3DS/Subforms/Gen6/RSWE.cs index 1d2330f..40c6ec4 100644 --- a/pk3DS/Subforms/Gen6/RSWE.cs +++ b/pk3DS/Subforms/Gen6/RSWE.cs @@ -185,8 +185,8 @@ public RSWE() "Kyurem-White - 1", "Kyurem-Black - 2", "", - "Keldeo-Usual - 0", - "Keldeo-Resolution - 1", + "Keldeo-Ordinary - 0", + "Keldeo-Resolute - 1", "", "Meloetta-Aria - 0", "Meloetta-Pirouette - 1", @@ -207,7 +207,7 @@ public RSWE() "Floette-Yellow - 1", "Floette-Orange - 2", "Floette-Blue - 3", - "Floette-Wite - 4", + "Floette-White - 4", "Floette-Eternal - 5", "", "Florges-Red - 0", @@ -216,19 +216,19 @@ public RSWE() "Florges-Blue - 3", "Florges-White - 4", "", - "Furfrou- Natural - 0", - "Furfrou- Heart - 1", - "Furfrou- Star - 2", - "Furfrou- Diamond - 3", - "Furfrou- Deputante - 4", - "Furfrou- Matron - 5", - "Furfrou- Dandy - 6", - "Furfrou- La Reine- 7", - "Furfrou- Kabuki - 8", - "Furfrou- Pharaoh - 9", + "Furfrou-Natural - 0", + "Furfrou-Heart - 1", + "Furfrou-Star - 2", + "Furfrou-Diamond - 3", + "Furfrou-Deputante - 4", + "Furfrou-Matron - 5", + "Furfrou-Dandy - 6", + "Furfrou-La Reine- 7", + "Furfrou-Kabuki - 8", + "Furfrou-Pharaoh - 9", "", - "Aegislash- Shield - 0", - "Aegislash- Blade - 0", + "Aegislash-Shield - 0", + "Aegislash-Blade - 0", "", "Vivillon-Icy Snow - 0", "Vivillon-Polar - 1", @@ -251,12 +251,17 @@ public RSWE() "Vivillon-Fancy - 18", "Vivillon-Poké Ball - 19", "", - "Pumpkaboo/Gourgeist-Small - 0", - "Pumpkaboo/Gourgeist-Average - 1", - "Pumpkaboo/Gourgeist-Large - 2", - "Pumpkaboo/Gourgeist-Super - 3", + "Pumpkaboo-Small - 0", + "Pumpkaboo-Average - 1", + "Pumpkaboo-Large - 2", + "Pumpkaboo-Super - 3", "", - "Hoopa-Normal - 0", + "Gourgeist-Small - 0", + "Gourgeist-Average - 1", + "Gourgeist-Large - 2", + "Gourgeist-Super - 3", + "", + "Hoopa-Confined - 0", "Hoopa-Unbound - 1", "", "Megas-Normal - 0", diff --git a/pk3DS/Subforms/Gen6/TMHMEditor6.Designer.cs b/pk3DS/Subforms/Gen6/TMHMEditor6.Designer.cs index 02f3c1d..a5b7d33 100644 --- a/pk3DS/Subforms/Gen6/TMHMEditor6.Designer.cs +++ b/pk3DS/Subforms/Gen6/TMHMEditor6.Designer.cs @@ -33,6 +33,7 @@ private void InitializeComponent() this.dgvHM = new System.Windows.Forms.DataGridView(); this.L_HM = new System.Windows.Forms.Label(); this.B_RTM = new System.Windows.Forms.Button(); + this.CHK_RandomizeHM = new System.Windows.Forms.CheckBox(); ((System.ComponentModel.ISupportInitialize)(this.dgvTM)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvHM)).BeginInit(); this.SuspendLayout(); @@ -71,7 +72,7 @@ private void InitializeComponent() this.dgvHM.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvHM.Location = new System.Drawing.Point(256, 25); this.dgvHM.Name = "dgvHM"; - this.dgvHM.Size = new System.Drawing.Size(240, 300); + this.dgvHM.Size = new System.Drawing.Size(240, 277); this.dgvHM.TabIndex = 3; // // L_HM @@ -93,11 +94,22 @@ private void InitializeComponent() this.B_RTM.UseVisualStyleBackColor = true; this.B_RTM.Click += new System.EventHandler(this.B_RandomTM_Click); // - // TMHM + // CHK_RandomizeHM + // + this.CHK_RandomizeHM.AutoSize = true; + this.CHK_RandomizeHM.Location = new System.Drawing.Point(256, 308); + this.CHK_RandomizeHM.Name = "CHK_RandomizeHM"; + this.CHK_RandomizeHM.Size = new System.Drawing.Size(104, 17); + this.CHK_RandomizeHM.TabIndex = 280; + this.CHK_RandomizeHM.Text = "Randomize HMs"; + this.CHK_RandomizeHM.UseVisualStyleBackColor = true; + // + // TMHMEditor6 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(504, 332); + this.Controls.Add(this.CHK_RandomizeHM); this.Controls.Add(this.B_RTM); this.Controls.Add(this.L_HM); this.Controls.Add(this.dgvHM); @@ -124,5 +136,6 @@ private void InitializeComponent() private System.Windows.Forms.DataGridView dgvHM; private System.Windows.Forms.Label L_HM; private System.Windows.Forms.Button B_RTM; + private System.Windows.Forms.CheckBox CHK_RandomizeHM; } } \ No newline at end of file diff --git a/pk3DS/Subforms/Gen6/TMHMEditor6.cs b/pk3DS/Subforms/Gen6/TMHMEditor6.cs index df88cbe..1bd98f4 100644 --- a/pk3DS/Subforms/Gen6/TMHMEditor6.cs +++ b/pk3DS/Subforms/Gen6/TMHMEditor6.cs @@ -157,6 +157,8 @@ private void formClosing(object sender, FormClosingEventArgs e) private void B_RandomTM_Click(object sender, EventArgs e) { if (WinFormsUtil.Prompt(MessageBoxButtons.YesNo, "Randomize TMs?", "Move compatibility will be the same as the base TMs.") != DialogResult.Yes) return; + if(CHK_RandomizeHM.Checked) + if (WinFormsUtil.Prompt(MessageBoxButtons.YesNo, "Randomizing HMs can halt story progression!", "Continue anyway?") != DialogResult.Yes) return; int[] randomMoves = Enumerable.Range(1, movelist.Length - 1).Select(i => i).ToArray(); Util.Shuffle(randomMoves); @@ -172,6 +174,15 @@ private void B_RandomTM_Click(object sender, EventArgs e) dgvTM.Rows[i].Cells[1].Value = movelist[randomMoves[ctr++]]; } + + if (CHK_RandomizeHM.Checked) + { + for (int i = 0; i < dgvHM.Rows.Count; i++) + { + dgvTM.Rows[i].Cells[1].Value = movelist[randomMoves[ctr++]]; + dgvHM.Rows[i].Cells[1].Value = movelist[randomMoves[ctr++]]; + } + } WinFormsUtil.Alert("Randomized!"); } diff --git a/pk3DS/Subforms/Gen6/XYWE.cs b/pk3DS/Subforms/Gen6/XYWE.cs index b8e6356..8ab384a 100644 --- a/pk3DS/Subforms/Gen6/XYWE.cs +++ b/pk3DS/Subforms/Gen6/XYWE.cs @@ -76,7 +76,6 @@ public XYWE() NUP_HordeBForme1, NUP_HordeBForme2, NUP_HordeBForme3, NUP_HordeBForme4, NUP_HordeBForme5, NUP_HordeCForme1, NUP_HordeCForme2, NUP_HordeCForme3, NUP_HordeCForme4, NUP_HordeCForme5, }; - formlist = new[] { "Unown-A - 0", "Unown-B - 1", "Unown-C - 2", @@ -194,8 +193,8 @@ public XYWE() "Kyurem-White - 1", "Kyurem-Black - 2", "", - "Keldeo-Usual - 0", - "Keldeo-Resolution - 1", + "Keldeo-Ordinary - 0", + "Keldeo-Resolute - 1", "", "Meloetta-Aria - 0", "Meloetta-Pirouette - 1", @@ -216,7 +215,7 @@ public XYWE() "Floette-Yellow - 1", "Floette-Orange - 2", "Floette-Blue - 3", - "Floette-Wite - 4", + "Floette-White - 4", "Floette-Eternal - 5", "", "Florges-Red - 0", @@ -225,19 +224,19 @@ public XYWE() "Florges-Blue - 3", "Florges-White - 4", "", - "Furfrou- Natural - 0", - "Furfrou- Heart - 1", - "Furfrou- Star - 2", - "Furfrou- Diamond - 3", - "Furfrou- Deputante - 4", - "Furfrou- Matron - 5", - "Furfrou- Dandy - 6", - "Furfrou- La Reine- 7", - "Furfrou- Kabuki - 8", - "Furfrou- Pharaoh - 9", + "Furfrou-Natural - 0", + "Furfrou-Heart - 1", + "Furfrou-Star - 2", + "Furfrou-Diamond - 3", + "Furfrou-Deputante - 4", + "Furfrou-Matron - 5", + "Furfrou-Dandy - 6", + "Furfrou-La Reine- 7", + "Furfrou-Kabuki - 8", + "Furfrou-Pharaoh - 9", "", - "Aegislash- Shield - 0", - "Aegislash- Blade - 0", + "Aegislash-Shield - 0", + "Aegislash-Blade - 0", "", "Vivillon-Icy Snow - 0", "Vivillon-Polar - 1", @@ -260,10 +259,15 @@ public XYWE() "Vivillon-Fancy - 18", "Vivillon-Poké Ball - 19", "", - "Pumpkaboo/Gourgeist-Small - 0", - "Pumpkaboo/Gourgeist-Average - 1", - "Pumpkaboo/Gourgeist-Large - 2", - "Pumpkaboo/Gourgeist-Super - 3", + "Pumpkaboo-Small - 0", + "Pumpkaboo-Average - 1", + "Pumpkaboo-Large - 2", + "Pumpkaboo-Super - 3", + "", + "Gourgeist-Small - 0", + "Gourgeist-Average - 1", + "Gourgeist-Large - 2", + "Gourgeist-Super - 3", "", "Megas-Normal - 0", "Megas-Mega (X) - 1", diff --git a/pk3DS/Subforms/Gen7/ItemEditor7.Designer.cs b/pk3DS/Subforms/Gen7/ItemEditor7.Designer.cs index 431f6e2..5bfaf23 100644 --- a/pk3DS/Subforms/Gen7/ItemEditor7.Designer.cs +++ b/pk3DS/Subforms/Gen7/ItemEditor7.Designer.cs @@ -127,7 +127,7 @@ private void InitializeComponent() // L_Sell // this.L_Sell.AutoSize = true; - this.L_Sell.Location = new System.Drawing.Point(103, 59); + this.L_Sell.Location = new System.Drawing.Point(103, 61); this.L_Sell.Name = "L_Sell"; this.L_Sell.Size = new System.Drawing.Size(54, 13); this.L_Sell.TabIndex = 44; @@ -136,7 +136,7 @@ private void InitializeComponent() // MT_Sell // this.MT_Sell.Enabled = false; - this.MT_Sell.Location = new System.Drawing.Point(163, 56); + this.MT_Sell.Location = new System.Drawing.Point(163, 58); this.MT_Sell.Mask = "00000"; this.MT_Sell.Name = "MT_Sell"; this.MT_Sell.Size = new System.Drawing.Size(37, 20); @@ -152,7 +152,7 @@ private void InitializeComponent() this.L_Index.TabIndex = 46; this.L_Index.Text = "Index: "; // - // Item + // ItemEditor7 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; @@ -171,7 +171,7 @@ private void InitializeComponent() this.MaximizeBox = false; this.MaximumSize = new System.Drawing.Size(355, 420); this.MinimumSize = new System.Drawing.Size(355, 220); - this.Name = "Item"; + this.Name = "ItemEditor7"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Item Editor"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.formClosing); diff --git a/pk3DS/Subforms/Gen7/LevelUpEditor7.Designer.cs b/pk3DS/Subforms/Gen7/LevelUpEditor7.Designer.cs index 3b4b3c3..9c876c5 100644 --- a/pk3DS/Subforms/Gen7/LevelUpEditor7.Designer.cs +++ b/pk3DS/Subforms/Gen7/LevelUpEditor7.Designer.cs @@ -34,6 +34,8 @@ private void InitializeComponent() this.B_RandAll = new System.Windows.Forms.Button(); this.B_Dump = new System.Windows.Forms.Button(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.CHK_NoFixedDamage = new System.Windows.Forms.CheckBox(); + this.CHK_4MovesLvl1 = new System.Windows.Forms.CheckBox(); this.L_Moves = new System.Windows.Forms.Label(); this.NUD_Moves = new System.Windows.Forms.NumericUpDown(); this.CHK_Expand = new System.Windows.Forms.CheckBox(); @@ -46,8 +48,6 @@ private void InitializeComponent() this.CHK_STAB = new System.Windows.Forms.CheckBox(); this.CHK_HMs = new System.Windows.Forms.CheckBox(); this.PB_MonSprite = new System.Windows.Forms.PictureBox(); - this.CHK_4MovesLvl1 = new System.Windows.Forms.CheckBox(); - this.CHK_NoFixedDamage = new System.Windows.Forms.CheckBox(); ((System.ComponentModel.ISupportInitialize)(this.dgv)).BeginInit(); this.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.NUD_Moves)).BeginInit(); @@ -134,6 +134,28 @@ private void InitializeComponent() this.groupBox1.TabStop = false; this.groupBox1.Text = "Options"; // + // CHK_NoFixedDamage + // + this.CHK_NoFixedDamage.AutoSize = true; + this.CHK_NoFixedDamage.Checked = true; + this.CHK_NoFixedDamage.CheckState = System.Windows.Forms.CheckState.Checked; + this.CHK_NoFixedDamage.Location = new System.Drawing.Point(5, 271); + this.CHK_NoFixedDamage.Name = "CHK_NoFixedDamage"; + this.CHK_NoFixedDamage.Size = new System.Drawing.Size(90, 56); + this.CHK_NoFixedDamage.TabIndex = 13; + this.CHK_NoFixedDamage.Text = "No Fixed\nDamage\nMoves\n(Dragon Rage\n+ Sonic Boom)"; + this.CHK_NoFixedDamage.UseVisualStyleBackColor = true; + // + // CHK_4MovesLvl1 + // + this.CHK_4MovesLvl1.AutoSize = true; + this.CHK_4MovesLvl1.Location = new System.Drawing.Point(5, 159); + this.CHK_4MovesLvl1.Name = "CHK_4MovesLvl1"; + this.CHK_4MovesLvl1.Size = new System.Drawing.Size(70, 30); + this.CHK_4MovesLvl1.TabIndex = 12; + this.CHK_4MovesLvl1.Text = "Start with\n4 Moves"; + this.CHK_4MovesLvl1.UseVisualStyleBackColor = true; + // // L_Moves // this.L_Moves.AutoSize = true; @@ -276,28 +298,6 @@ private void InitializeComponent() this.PB_MonSprite.TabIndex = 90; this.PB_MonSprite.TabStop = false; // - // CHK_4MovesLvl1 - // - this.CHK_4MovesLvl1.AutoSize = true; - this.CHK_4MovesLvl1.Location = new System.Drawing.Point(5, 154); - this.CHK_4MovesLvl1.Name = "CHK_4MovesLvl1"; - this.CHK_4MovesLvl1.Size = new System.Drawing.Size(67, 30); - this.CHK_4MovesLvl1.TabIndex = 12; - this.CHK_4MovesLvl1.Text = "4 Moves\r\n@ Lvl1"; - this.CHK_4MovesLvl1.UseVisualStyleBackColor = true; - // - // CHK_NoFixedDamage - // - this.CHK_NoFixedDamage.AutoSize = true; - this.CHK_NoFixedDamage.Checked = true; - this.CHK_NoFixedDamage.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_NoFixedDamage.Location = new System.Drawing.Point(5, 266); - this.CHK_NoFixedDamage.Name = "CHK_NoFixedDamage"; - this.CHK_NoFixedDamage.Size = new System.Drawing.Size(90, 56); - this.CHK_NoFixedDamage.TabIndex = 13; - this.CHK_NoFixedDamage.Text = "No Fixed\r\nDamage\r\nDragon Rage\r\nSonicboom"; - this.CHK_NoFixedDamage.UseVisualStyleBackColor = true; - // // LevelUpEditor7 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/pk3DS/Subforms/Gen7/PersonalEditor7.Designer.cs b/pk3DS/Subforms/Gen7/PersonalEditor7.Designer.cs index 1c59787..260757d 100644 --- a/pk3DS/Subforms/Gen7/PersonalEditor7.Designer.cs +++ b/pk3DS/Subforms/Gen7/PersonalEditor7.Designer.cs @@ -1223,9 +1223,9 @@ private void InitializeComponent() this.L_FinalXP.AutoSize = true; this.L_FinalXP.Location = new System.Drawing.Point(6, 71); this.L_FinalXP.Name = "L_FinalXP"; - this.L_FinalXP.Size = new System.Drawing.Size(57, 13); + this.L_FinalXP.Size = new System.Drawing.Size(63, 13); this.L_FinalXP.TabIndex = 6; - this.L_FinalXP.Text = "FinalXP(%)"; + this.L_FinalXP.Text = "Final XP (%)"; // // NUD_EXP // @@ -1298,7 +1298,7 @@ private void InitializeComponent() // L_Same // this.L_Same.AutoSize = true; - this.L_Same.Location = new System.Drawing.Point(226, 86); + this.L_Same.Location = new System.Drawing.Point(216, 86); this.L_Same.Name = "L_Same"; this.L_Same.Size = new System.Drawing.Size(48, 13); this.L_Same.TabIndex = 23; @@ -1306,7 +1306,7 @@ private void InitializeComponent() // // NUD_Egg // - this.NUD_Egg.Location = new System.Drawing.Point(277, 84); + this.NUD_Egg.Location = new System.Drawing.Point(267, 84); this.NUD_Egg.Name = "NUD_Egg"; this.NUD_Egg.Size = new System.Drawing.Size(46, 20); this.NUD_Egg.TabIndex = 22; @@ -1344,7 +1344,7 @@ private void InitializeComponent() this.CHK_Tutors.AutoSize = true; this.CHK_Tutors.Checked = true; this.CHK_Tutors.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_Tutors.Location = new System.Drawing.Point(229, 34); + this.CHK_Tutors.Location = new System.Drawing.Point(219, 34); this.CHK_Tutors.Name = "CHK_Tutors"; this.CHK_Tutors.Size = new System.Drawing.Size(94, 17); this.CHK_Tutors.TabIndex = 8; @@ -1461,7 +1461,7 @@ private void InitializeComponent() this.CHK_HM.AutoSize = true; this.CHK_HM.Checked = true; this.CHK_HM.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_HM.Location = new System.Drawing.Point(277, 19); + this.CHK_HM.Location = new System.Drawing.Point(267, 19); this.CHK_HM.Name = "CHK_HM"; this.CHK_HM.Size = new System.Drawing.Size(43, 17); this.CHK_HM.TabIndex = 7; @@ -1482,7 +1482,7 @@ private void InitializeComponent() this.CHK_TM.AutoSize = true; this.CHK_TM.Checked = true; this.CHK_TM.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_TM.Location = new System.Drawing.Point(229, 19); + this.CHK_TM.Location = new System.Drawing.Point(219, 19); this.CHK_TM.Name = "CHK_TM"; this.CHK_TM.Size = new System.Drawing.Size(42, 17); this.CHK_TM.TabIndex = 0; @@ -1519,7 +1519,7 @@ private void InitializeComponent() this.CHK_EggGroup.AutoSize = true; this.CHK_EggGroup.Checked = true; this.CHK_EggGroup.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_EggGroup.Location = new System.Drawing.Point(229, 66); + this.CHK_EggGroup.Location = new System.Drawing.Point(219, 66); this.CHK_EggGroup.Name = "CHK_EggGroup"; this.CHK_EggGroup.Size = new System.Drawing.Size(77, 17); this.CHK_EggGroup.TabIndex = 13; @@ -1531,7 +1531,7 @@ private void InitializeComponent() this.CHK_CatchRate.AutoSize = true; this.CHK_CatchRate.Checked = true; this.CHK_CatchRate.CheckState = System.Windows.Forms.CheckState.Checked; - this.CHK_CatchRate.Location = new System.Drawing.Point(229, 50); + this.CHK_CatchRate.Location = new System.Drawing.Point(219, 50); this.CHK_CatchRate.Name = "CHK_CatchRate"; this.CHK_CatchRate.Size = new System.Drawing.Size(80, 17); this.CHK_CatchRate.TabIndex = 11;