From 3ab1f85a315c441b62eafefc63e3aabeb52a5ba8 Mon Sep 17 00:00:00 2001 From: sora10pls Date: Sun, 10 Sep 2017 14:13:33 -0400 Subject: [PATCH] Misc changes --- pk3DS/Main.Designer.cs | 50 +++---- pk3DS/Subforms/Gen6/EggMoveEditor6.cs | 2 +- pk3DS/Subforms/Gen6/EvolutionEditor6.cs | 2 +- pk3DS/Subforms/Gen6/LevelUpEditor6.cs | 2 +- .../Subforms/Gen6/PersonalEditor6.Designer.cs | 124 ++++++++-------- pk3DS/Subforms/Gen6/PersonalEditor6.cs | 6 +- pk3DS/Subforms/Gen7/EggMoveEditor7.cs | 2 +- pk3DS/Subforms/Gen7/EvolutionEditor7.cs | 2 +- pk3DS/Subforms/Gen7/LevelUpEditor7.cs | 2 +- .../Subforms/Gen7/PersonalEditor7.Designer.cs | 135 ++++++++---------- pk3DS/Subforms/Gen7/PersonalEditor7.cs | 6 +- pk3DS/Subforms/TextEditor.cs | 2 +- 12 files changed, 161 insertions(+), 174 deletions(-) diff --git a/pk3DS/Main.Designer.cs b/pk3DS/Main.Designer.cs index 4727419..c807b51 100644 --- a/pk3DS/Main.Designer.cs +++ b/pk3DS/Main.Designer.cs @@ -80,6 +80,7 @@ private void InitializeComponent() this.B_OWSE = new System.Windows.Forms.Button(); this.Tab_ExeFS = new System.Windows.Forms.TabPage(); this.FLP_ExeFS = new System.Windows.Forms.FlowLayoutPanel(); + this.B_TM = new System.Windows.Forms.Button(); this.B_ShinyRate = new System.Windows.Forms.Button(); this.Tab_CRO = new System.Windows.Forms.TabPage(); this.FLP_CRO = new System.Windows.Forms.FlowLayoutPanel(); @@ -89,7 +90,6 @@ private void InitializeComponent() this.B_Static = new System.Windows.Forms.Button(); this.Tab_Output = new System.Windows.Forms.TabPage(); this.L_Status = new System.Windows.Forms.Label(); - this.B_TM = new System.Windows.Forms.Button(); this.menuStrip1.SuspendLayout(); this.TC_RomFS.SuspendLayout(); this.Tab_RomFS.SuspendLayout(); @@ -156,7 +156,7 @@ private void InitializeComponent() this.B_Mart.Name = "B_Mart"; this.B_Mart.Size = new System.Drawing.Size(100, 23); this.B_Mart.TabIndex = 2; - this.B_Mart.Text = "Mart"; + this.B_Mart.Text = "Poké Mart"; this.B_Mart.UseVisualStyleBackColor = true; this.B_Mart.Click += new System.EventHandler(this.B_Mart_Click); // @@ -166,7 +166,7 @@ private void InitializeComponent() this.B_MoveTutor.Name = "B_MoveTutor"; this.B_MoveTutor.Size = new System.Drawing.Size(100, 23); this.B_MoveTutor.TabIndex = 3; - this.B_MoveTutor.Text = "Move Tutor"; + this.B_MoveTutor.Text = "Move Tutors"; this.B_MoveTutor.UseVisualStyleBackColor = true; this.B_MoveTutor.Click += new System.EventHandler(this.B_MoveTutor_Click); // @@ -217,7 +217,7 @@ private void InitializeComponent() this.Menu_Open.Name = "Menu_Open"; this.Menu_Open.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); this.Menu_Open.ShowShortcutKeys = false; - this.Menu_Open.Size = new System.Drawing.Size(105, 22); + this.Menu_Open.Size = new System.Drawing.Size(152, 22); this.Menu_Open.Text = "&Open..."; this.Menu_Open.Click += new System.EventHandler(this.B_Open_Click); // @@ -226,7 +226,7 @@ private void InitializeComponent() this.Menu_Exit.Name = "Menu_Exit"; this.Menu_Exit.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E))); this.Menu_Exit.ShowShortcutKeys = false; - this.Menu_Exit.Size = new System.Drawing.Size(105, 22); + this.Menu_Exit.Size = new System.Drawing.Size(152, 22); this.Menu_Exit.Text = "&Exit"; this.Menu_Exit.Click += new System.EventHandler(this.Menu_Exit_Click); // @@ -305,7 +305,7 @@ private void InitializeComponent() // this.Menu_RomFS.Enabled = false; this.Menu_RomFS.Name = "Menu_RomFS"; - this.Menu_RomFS.Size = new System.Drawing.Size(111, 22); + this.Menu_RomFS.Size = new System.Drawing.Size(152, 22); this.Menu_RomFS.Text = "RomFS"; this.Menu_RomFS.Click += new System.EventHandler(this.rebuildRomFS); // @@ -313,7 +313,7 @@ private void InitializeComponent() // this.Menu_ExeFS.Enabled = false; this.Menu_ExeFS.Name = "Menu_ExeFS"; - this.Menu_ExeFS.Size = new System.Drawing.Size(111, 22); + this.Menu_ExeFS.Size = new System.Drawing.Size(152, 22); this.Menu_ExeFS.Text = "ExeFS"; this.Menu_ExeFS.Click += new System.EventHandler(this.rebuildExeFS); // @@ -321,7 +321,7 @@ private void InitializeComponent() // this.Menu_CRO.Enabled = false; this.Menu_CRO.Name = "Menu_CRO"; - this.Menu_CRO.Size = new System.Drawing.Size(111, 22); + this.Menu_CRO.Size = new System.Drawing.Size(152, 22); this.Menu_CRO.Text = "CRO"; this.Menu_CRO.Click += new System.EventHandler(this.patchCRO_CRR); // @@ -329,7 +329,7 @@ private void InitializeComponent() // this.Menu_3DS.Enabled = false; this.Menu_3DS.Name = "Menu_3DS"; - this.Menu_3DS.Size = new System.Drawing.Size(111, 22); + this.Menu_3DS.Size = new System.Drawing.Size(152, 22); this.Menu_3DS.Text = ".3DS"; this.Menu_3DS.Click += new System.EventHandler(this.B_Rebuild3DS_Click); // @@ -337,7 +337,7 @@ private void InitializeComponent() // this.Menu_Patch.Enabled = false; this.Menu_Patch.Name = "Menu_Patch"; - this.Menu_Patch.Size = new System.Drawing.Size(111, 22); + this.Menu_Patch.Size = new System.Drawing.Size(152, 22); this.Menu_Patch.Text = "Patch"; this.Menu_Patch.Click += new System.EventHandler(this.B_Patch_Click); // @@ -363,7 +363,7 @@ private void InitializeComponent() this.Menu_Language.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.CB_Lang}); this.Menu_Language.Name = "Menu_Language"; - this.Menu_Language.Size = new System.Drawing.Size(146, 22); + this.Menu_Language.Size = new System.Drawing.Size(152, 22); this.Menu_Language.Text = "Language"; // // CB_Lang @@ -389,14 +389,14 @@ private void InitializeComponent() this.Menu_About.Name = "Menu_About"; this.Menu_About.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.B))); this.Menu_About.ShowShortcutKeys = false; - this.Menu_About.Size = new System.Drawing.Size(146, 22); + this.Menu_About.Size = new System.Drawing.Size(152, 22); this.Menu_About.Text = "A&bout pk3DS"; this.Menu_About.Click += new System.EventHandler(this.L_About_Click); // // Menu_GARCs // this.Menu_GARCs.Name = "Menu_GARCs"; - this.Menu_GARCs.Size = new System.Drawing.Size(146, 22); + this.Menu_GARCs.Size = new System.Drawing.Size(152, 22); this.Menu_GARCs.Text = "About GARCs"; this.Menu_GARCs.Click += new System.EventHandler(this.L_GARCInfo_Click); // @@ -536,7 +536,7 @@ private void InitializeComponent() this.B_Trainer.Name = "B_Trainer"; this.B_Trainer.Size = new System.Drawing.Size(100, 23); this.B_Trainer.TabIndex = 2; - this.B_Trainer.Text = "Trainer"; + this.B_Trainer.Text = "Trainers"; this.B_Trainer.UseVisualStyleBackColor = true; this.B_Trainer.Click += new System.EventHandler(this.B_Trainer_Click); // @@ -556,7 +556,7 @@ private void InitializeComponent() this.B_Royal.Name = "B_Royal"; this.B_Royal.Size = new System.Drawing.Size(100, 23); this.B_Royal.TabIndex = 14; - this.B_Royal.Text = "Tree/Royal"; + this.B_Royal.Text = "Royal/Tree"; this.B_Royal.UseVisualStyleBackColor = true; this.B_Royal.Click += new System.EventHandler(this.B_Maison_Click); // @@ -627,6 +627,16 @@ private void InitializeComponent() this.FLP_ExeFS.Size = new System.Drawing.Size(346, 148); this.FLP_ExeFS.TabIndex = 11; // + // B_TM + // + this.B_TM.Location = new System.Drawing.Point(215, 3); + this.B_TM.Name = "B_TM"; + this.B_TM.Size = new System.Drawing.Size(100, 23); + this.B_TM.TabIndex = 6; + this.B_TM.Text = "TMs"; + this.B_TM.UseVisualStyleBackColor = true; + this.B_TM.Click += new System.EventHandler(this.B_TMHM_Click); + // // B_ShinyRate // this.B_ShinyRate.Location = new System.Drawing.Point(3, 61); @@ -718,16 +728,6 @@ private void InitializeComponent() this.L_Status.TabIndex = 14; this.L_Status.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // B_TM - // - this.B_TM.Location = new System.Drawing.Point(215, 3); - this.B_TM.Name = "B_TM"; - this.B_TM.Size = new System.Drawing.Size(100, 23); - this.B_TM.TabIndex = 6; - this.B_TM.Text = "TM/HM"; - this.B_TM.UseVisualStyleBackColor = true; - this.B_TM.Click += new System.EventHandler(this.B_TMHM_Click); - // // Main // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/pk3DS/Subforms/Gen6/EggMoveEditor6.cs b/pk3DS/Subforms/Gen6/EggMoveEditor6.cs index dc95f79..418d5e2 100644 --- a/pk3DS/Subforms/Gen6/EggMoveEditor6.cs +++ b/pk3DS/Subforms/Gen6/EggMoveEditor6.cs @@ -122,7 +122,7 @@ private void B_RandAll_Click(object sender, EventArgs e) rand.Execute(); sets.Select(z => z.Write()).ToArray().CopyTo(files, 0); getList(); - WinFormsUtil.Alert("All Pokemon's Egg Moves have been randomized!"); + WinFormsUtil.Alert("All Pokémon's Egg Moves have been randomized!"); } private void B_Dump_Click(object sender, EventArgs e) { diff --git a/pk3DS/Subforms/Gen6/EvolutionEditor6.cs b/pk3DS/Subforms/Gen6/EvolutionEditor6.cs index a9d66fe..95d4813 100644 --- a/pk3DS/Subforms/Gen6/EvolutionEditor6.cs +++ b/pk3DS/Subforms/Gen6/EvolutionEditor6.cs @@ -143,7 +143,7 @@ private void B_RandAll_Click(object sender, EventArgs e) evos.Select(z => z.Write()).ToArray().CopyTo(files, 0); getList(); - WinFormsUtil.Alert("All Pokemon's Evolutions have been randomized!"); + WinFormsUtil.Alert("All Pokémon's Evolutions have been randomized!"); } private void B_Dump_Click(object sender, EventArgs e) { diff --git a/pk3DS/Subforms/Gen6/LevelUpEditor6.cs b/pk3DS/Subforms/Gen6/LevelUpEditor6.cs index ffff656..d956dd9 100644 --- a/pk3DS/Subforms/Gen6/LevelUpEditor6.cs +++ b/pk3DS/Subforms/Gen6/LevelUpEditor6.cs @@ -150,7 +150,7 @@ private void B_RandAll_Click(object sender, EventArgs e) rand.Execute(); sets.Select(z => z.Write()).ToArray().CopyTo(files, 0); getList(); - WinFormsUtil.Alert("All Pokemon's Level Up Moves have been randomized!"); + WinFormsUtil.Alert("All Pokémon's Level Up Moves have been randomized!"); } private void B_Dump_Click(object sender, EventArgs e) { diff --git a/pk3DS/Subforms/Gen6/PersonalEditor6.Designer.cs b/pk3DS/Subforms/Gen6/PersonalEditor6.Designer.cs index ff53df2..f8541d6 100644 --- a/pk3DS/Subforms/Gen6/PersonalEditor6.Designer.cs +++ b/pk3DS/Subforms/Gen6/PersonalEditor6.Designer.cs @@ -107,6 +107,9 @@ private void InitializeComponent() this.CLB_TMHM = new System.Windows.Forms.CheckedListBox(); this.TP_Randomizer = new System.Windows.Forms.TabPage(); this.GB_Modifier = new System.Windows.Forms.GroupBox(); + this.CHK_CatchRateMod = new System.Windows.Forms.CheckBox(); + this.L_CatchRateMod = new System.Windows.Forms.Label(); + this.NUD_CatchRateMod = new System.Windows.Forms.NumericUpDown(); this.CHK_EXP = new System.Windows.Forms.CheckBox(); this.CHK_Growth = new System.Windows.Forms.CheckBox(); this.CHK_QuickHatch = new System.Windows.Forms.CheckBox(); @@ -141,21 +144,18 @@ private void InitializeComponent() this.B_Randomize = new System.Windows.Forms.Button(); this.PB_MonSprite = new System.Windows.Forms.PictureBox(); this.B_Dump = new System.Windows.Forms.Button(); - this.CHK_CatchRateMod = new System.Windows.Forms.CheckBox(); - this.L_CatchRateMod = new System.Windows.Forms.Label(); - this.NUD_CatchRateMod = new System.Windows.Forms.NumericUpDown(); this.TC_Pokemon.SuspendLayout(); this.TP_General.SuspendLayout(); this.TP_MoveTutors.SuspendLayout(); this.TP_Randomizer.SuspendLayout(); this.GB_Modifier.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_CatchRateMod)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_EXP)).BeginInit(); this.GB_Randomizer.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.NUD_Egg)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_TypePercent)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_StatDev)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.PB_MonSprite)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.NUD_CatchRateMod)).BeginInit(); this.SuspendLayout(); // // CB_Species @@ -942,9 +942,9 @@ private void InitializeComponent() this.L_ORASTutors.AutoSize = true; this.L_ORASTutors.Location = new System.Drawing.Point(298, 3); this.L_ORASTutors.Name = "L_ORASTutors"; - this.L_ORASTutors.Size = new System.Drawing.Size(65, 13); + this.L_ORASTutors.Size = new System.Drawing.Size(104, 13); this.L_ORASTutors.TabIndex = 7; - this.L_ORASTutors.Text = "Oras Tutors:"; + this.L_ORASTutors.Text = "Battle Resort Tutors:"; this.L_ORASTutors.Visible = false; // // L_Special @@ -1028,6 +1028,47 @@ private void InitializeComponent() this.GB_Modifier.TabStop = false; this.GB_Modifier.Text = "Modifier Options"; // + // CHK_CatchRateMod + // + this.CHK_CatchRateMod.AutoSize = true; + this.CHK_CatchRateMod.Location = new System.Drawing.Point(204, 38); + this.CHK_CatchRateMod.Name = "CHK_CatchRateMod"; + this.CHK_CatchRateMod.Size = new System.Drawing.Size(114, 17); + this.CHK_CatchRateMod.TabIndex = 19; + this.CHK_CatchRateMod.Text = "Modify Catch Rate"; + this.CHK_CatchRateMod.UseVisualStyleBackColor = true; + // + // L_CatchRateMod + // + this.L_CatchRateMod.AutoSize = true; + this.L_CatchRateMod.Location = new System.Drawing.Point(204, 58); + this.L_CatchRateMod.Name = "L_CatchRateMod"; + this.L_CatchRateMod.Size = new System.Drawing.Size(34, 13); + this.L_CatchRateMod.TabIndex = 18; + this.L_CatchRateMod.Text = "Value"; + // + // NUD_CatchRateMod + // + this.NUD_CatchRateMod.Location = new System.Drawing.Point(267, 56); + this.NUD_CatchRateMod.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.NUD_CatchRateMod.Minimum = new decimal(new int[] { + 3, + 0, + 0, + 0}); + this.NUD_CatchRateMod.Name = "NUD_CatchRateMod"; + this.NUD_CatchRateMod.Size = new System.Drawing.Size(46, 20); + this.NUD_CatchRateMod.TabIndex = 17; + this.NUD_CatchRateMod.Value = new decimal(new int[] { + 3, + 0, + 0, + 0}); + // // CHK_EXP // this.CHK_EXP.AutoSize = true; @@ -1141,7 +1182,7 @@ private void InitializeComponent() // L_Same // this.L_Same.AutoSize = true; - this.L_Same.Location = new System.Drawing.Point(201, 100); + this.L_Same.Location = new System.Drawing.Point(226, 100); this.L_Same.Name = "L_Same"; this.L_Same.Size = new System.Drawing.Size(48, 13); this.L_Same.TabIndex = 23; @@ -1149,7 +1190,7 @@ private void InitializeComponent() // // NUD_Egg // - this.NUD_Egg.Location = new System.Drawing.Point(252, 98); + this.NUD_Egg.Location = new System.Drawing.Point(277, 98); this.NUD_Egg.Name = "NUD_Egg"; this.NUD_Egg.Size = new System.Drawing.Size(46, 20); this.NUD_Egg.TabIndex = 22; @@ -1164,9 +1205,9 @@ private void InitializeComponent() this.CHK_WGuard.AutoSize = true; this.CHK_WGuard.Location = new System.Drawing.Point(118, 49); this.CHK_WGuard.Name = "CHK_WGuard"; - this.CHK_WGuard.Size = new System.Drawing.Size(72, 17); + this.CHK_WGuard.Size = new System.Drawing.Size(96, 17); this.CHK_WGuard.TabIndex = 10; - this.CHK_WGuard.Text = "W. Guard"; + this.CHK_WGuard.Text = "Wonder Guard"; this.CHK_WGuard.UseVisualStyleBackColor = true; // // CHK_Ability @@ -1187,11 +1228,11 @@ 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(204, 49); + this.CHK_ORASTutors.Location = new System.Drawing.Point(229, 49); this.CHK_ORASTutors.Name = "CHK_ORASTutors"; - this.CHK_ORASTutors.Size = new System.Drawing.Size(79, 17); + this.CHK_ORASTutors.Size = new System.Drawing.Size(120, 17); this.CHK_ORASTutors.TabIndex = 9; - this.CHK_ORASTutors.Text = "R/S Tutors"; + this.CHK_ORASTutors.Text = "Battle Resort Tutors"; this.CHK_ORASTutors.UseVisualStyleBackColor = true; // // CHK_Tutors @@ -1199,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(204, 34); + this.CHK_Tutors.Location = new System.Drawing.Point(229, 34); this.CHK_Tutors.Name = "CHK_Tutors"; this.CHK_Tutors.Size = new System.Drawing.Size(94, 17); this.CHK_Tutors.TabIndex = 8; @@ -1259,9 +1300,9 @@ private void InitializeComponent() this.L_SingleType.AutoSize = true; this.L_SingleType.Location = new System.Drawing.Point(115, 82); this.L_SingleType.Name = "L_SingleType"; - this.L_SingleType.Size = new System.Drawing.Size(74, 13); + this.L_SingleType.Size = new System.Drawing.Size(77, 13); this.L_SingleType.TabIndex = 21; - this.L_SingleType.Text = "SingleType(%)"; + this.L_SingleType.Text = "Single Type(%)"; // // CHK_rDEF // @@ -1316,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(252, 19); + this.CHK_HM.Location = new System.Drawing.Point(277, 19); this.CHK_HM.Name = "CHK_HM"; this.CHK_HM.Size = new System.Drawing.Size(43, 17); this.CHK_HM.TabIndex = 7; @@ -1337,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(204, 19); + this.CHK_TM.Location = new System.Drawing.Point(229, 19); this.CHK_TM.Name = "CHK_TM"; this.CHK_TM.Size = new System.Drawing.Size(42, 17); this.CHK_TM.TabIndex = 0; @@ -1374,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(204, 80); + this.CHK_EggGroup.Location = new System.Drawing.Point(229, 80); this.CHK_EggGroup.Name = "CHK_EggGroup"; this.CHK_EggGroup.Size = new System.Drawing.Size(77, 17); this.CHK_EggGroup.TabIndex = 13; @@ -1386,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(204, 65); + this.CHK_CatchRate.Location = new System.Drawing.Point(229, 65); this.CHK_CatchRate.Name = "CHK_CatchRate"; this.CHK_CatchRate.Size = new System.Drawing.Size(80, 17); this.CHK_CatchRate.TabIndex = 11; @@ -1433,47 +1474,6 @@ private void InitializeComponent() this.B_Dump.UseVisualStyleBackColor = true; this.B_Dump.Click += new System.EventHandler(this.B_Dump_Click); // - // CHK_CatchRateMod - // - this.CHK_CatchRateMod.AutoSize = true; - this.CHK_CatchRateMod.Location = new System.Drawing.Point(204, 38); - this.CHK_CatchRateMod.Name = "CHK_CatchRateMod"; - this.CHK_CatchRateMod.Size = new System.Drawing.Size(114, 17); - this.CHK_CatchRateMod.TabIndex = 19; - this.CHK_CatchRateMod.Text = "Modify Catch Rate"; - this.CHK_CatchRateMod.UseVisualStyleBackColor = true; - // - // L_CatchRateMod - // - this.L_CatchRateMod.AutoSize = true; - this.L_CatchRateMod.Location = new System.Drawing.Point(204, 58); - this.L_CatchRateMod.Name = "L_CatchRateMod"; - this.L_CatchRateMod.Size = new System.Drawing.Size(34, 13); - this.L_CatchRateMod.TabIndex = 18; - this.L_CatchRateMod.Text = "Value"; - // - // NUD_CatchRateMod - // - this.NUD_CatchRateMod.Location = new System.Drawing.Point(267, 56); - this.NUD_CatchRateMod.Maximum = new decimal(new int[] { - 255, - 0, - 0, - 0}); - this.NUD_CatchRateMod.Minimum = new decimal(new int[] { - 3, - 0, - 0, - 0}); - this.NUD_CatchRateMod.Name = "NUD_CatchRateMod"; - this.NUD_CatchRateMod.Size = new System.Drawing.Size(46, 20); - this.NUD_CatchRateMod.TabIndex = 17; - this.NUD_CatchRateMod.Value = new decimal(new int[] { - 3, - 0, - 0, - 0}); - // // PersonalEditor6 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1499,6 +1499,7 @@ private void InitializeComponent() this.TP_Randomizer.ResumeLayout(false); this.GB_Modifier.ResumeLayout(false); this.GB_Modifier.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_CatchRateMod)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_EXP)).EndInit(); this.GB_Randomizer.ResumeLayout(false); this.GB_Randomizer.PerformLayout(); @@ -1506,7 +1507,6 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.NUD_TypePercent)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_StatDev)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.PB_MonSprite)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.NUD_CatchRateMod)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/pk3DS/Subforms/Gen6/PersonalEditor6.cs b/pk3DS/Subforms/Gen6/PersonalEditor6.cs index 5014878..0b6f95c 100644 --- a/pk3DS/Subforms/Gen6/PersonalEditor6.cs +++ b/pk3DS/Subforms/Gen6/PersonalEditor6.cs @@ -118,9 +118,10 @@ private void Setup() Array.Copy(species, temp_species, temp_species.Length); species = temp_species; - CLB_OrasTutors.Visible = + CLB_OrasTutors.Visible = CLB_OrasTutors.Enabled = L_ORASTutors.Visible = false; + CHK_ORASTutors.Visible = false; } else if (mode == "ORAS") { @@ -360,7 +361,7 @@ private void B_Randomize_Click(object sender, EventArgs e) rnd.Execute(); readEntry(); - WinFormsUtil.Alert("All relevant Pokemon Personal Entries have been randomized!"); + WinFormsUtil.Alert("All relevant Pokémon Personal Entries have been randomized!"); } private void B_ModifyAll(object sender, EventArgs e) { @@ -427,6 +428,7 @@ private void B_Dump_Click(object sender, EventArgs e) private void CHK_Stats_CheckedChanged(object sender, EventArgs e) { L_StatDev.Visible = NUD_StatDev.Visible = CHK_Stats.Checked; + CHK_rHP.Enabled = CHK_rATK.Enabled = CHK_rDEF.Enabled = CHK_rSPA.Enabled = CHK_rSPD.Enabled = CHK_rSPE.Enabled = CHK_Stats.Checked; } private void CHK_Ability_CheckedChanged(object sender, EventArgs e) { diff --git a/pk3DS/Subforms/Gen7/EggMoveEditor7.cs b/pk3DS/Subforms/Gen7/EggMoveEditor7.cs index de83409..7056d9d 100644 --- a/pk3DS/Subforms/Gen7/EggMoveEditor7.cs +++ b/pk3DS/Subforms/Gen7/EggMoveEditor7.cs @@ -137,7 +137,7 @@ private void B_RandAll_Click(object sender, EventArgs e) rand.Execute(); // sets.Select(z => z.Write()).ToArray().CopyTo(files, 0); getList(); - WinFormsUtil.Alert("All Pokemon's Egg Up Moves have been randomized!"); + WinFormsUtil.Alert("All Pokémon's Egg Moves have been randomized!"); } private void B_Dump_Click(object sender, EventArgs e) { diff --git a/pk3DS/Subforms/Gen7/EvolutionEditor7.cs b/pk3DS/Subforms/Gen7/EvolutionEditor7.cs index 9ba9144..dfeeac6 100644 --- a/pk3DS/Subforms/Gen7/EvolutionEditor7.cs +++ b/pk3DS/Subforms/Gen7/EvolutionEditor7.cs @@ -158,7 +158,7 @@ private void B_RandAll_Click(object sender, EventArgs e) evos.Select(z => z.Write()).ToArray().CopyTo(files, 0); getList(); - WinFormsUtil.Alert("All Pokemon's Evolutions have been randomized!"); + WinFormsUtil.Alert("All Pokémon's Evolutions have been randomized!"); } private void B_Dump_Click(object sender, EventArgs e) { diff --git a/pk3DS/Subforms/Gen7/LevelUpEditor7.cs b/pk3DS/Subforms/Gen7/LevelUpEditor7.cs index 71bec7a..c87f128 100644 --- a/pk3DS/Subforms/Gen7/LevelUpEditor7.cs +++ b/pk3DS/Subforms/Gen7/LevelUpEditor7.cs @@ -145,7 +145,7 @@ private void B_RandAll_Click(object sender, EventArgs e) rand.Execute(); sets.Select(z => z.Write()).ToArray().CopyTo(files, 0); getList(); - WinFormsUtil.Alert("All Pokemon's Level Up Moves have been randomized!"); + WinFormsUtil.Alert("All Pokémon's Level Up Moves have been randomized!"); } private void B_Dump_Click(object sender, EventArgs e) { diff --git a/pk3DS/Subforms/Gen7/PersonalEditor7.Designer.cs b/pk3DS/Subforms/Gen7/PersonalEditor7.Designer.cs index 637d028..1c59787 100644 --- a/pk3DS/Subforms/Gen7/PersonalEditor7.Designer.cs +++ b/pk3DS/Subforms/Gen7/PersonalEditor7.Designer.cs @@ -114,6 +114,9 @@ private void InitializeComponent() this.CLB_TM = new System.Windows.Forms.CheckedListBox(); this.TP_Randomizer = new System.Windows.Forms.TabPage(); this.GB_Modifier = new System.Windows.Forms.GroupBox(); + this.CHK_CatchRateMod = new System.Windows.Forms.CheckBox(); + this.L_CatchRateMod = new System.Windows.Forms.Label(); + this.NUD_CatchRateMod = new System.Windows.Forms.NumericUpDown(); this.CHK_CallRate = new System.Windows.Forms.CheckBox(); this.L_CallRateVal = new System.Windows.Forms.Label(); this.NUD_CallRate = new System.Windows.Forms.NumericUpDown(); @@ -129,7 +132,6 @@ private void InitializeComponent() this.NUD_Egg = new System.Windows.Forms.NumericUpDown(); this.CHK_WGuard = new System.Windows.Forms.CheckBox(); this.CHK_Ability = new System.Windows.Forms.CheckBox(); - this.CHK_ORASTutors = new System.Windows.Forms.CheckBox(); this.CHK_Tutors = new System.Windows.Forms.CheckBox(); this.CHK_rSPE = new System.Windows.Forms.CheckBox(); this.CHK_Type = new System.Windows.Forms.CheckBox(); @@ -151,14 +153,12 @@ private void InitializeComponent() this.B_Randomize = new System.Windows.Forms.Button(); this.PB_MonSprite = new System.Windows.Forms.PictureBox(); this.B_Dump = new System.Windows.Forms.Button(); - this.CHK_CatchRateMod = new System.Windows.Forms.CheckBox(); - this.L_CatchRateMod = new System.Windows.Forms.Label(); - this.NUD_CatchRateMod = new System.Windows.Forms.NumericUpDown(); this.TC_Pokemon.SuspendLayout(); this.TP_General.SuspendLayout(); this.TP_MoveTutors.SuspendLayout(); this.TP_Randomizer.SuspendLayout(); this.GB_Modifier.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_CatchRateMod)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_CallRate)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_EXP)).BeginInit(); this.GB_Randomizer.SuspendLayout(); @@ -166,7 +166,6 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.NUD_TypePercent)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_StatDev)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.PB_MonSprite)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.NUD_CatchRateMod)).BeginInit(); this.SuspendLayout(); // // CB_Species @@ -306,11 +305,11 @@ private void InitializeComponent() // this.CHK_Variant.AutoSize = true; this.CHK_Variant.CheckAlign = System.Drawing.ContentAlignment.MiddleRight; - this.CHK_Variant.Location = new System.Drawing.Point(318, 319); + this.CHK_Variant.Location = new System.Drawing.Point(303, 323); this.CHK_Variant.Name = "CHK_Variant"; - this.CHK_Variant.Size = new System.Drawing.Size(88, 17); + this.CHK_Variant.Size = new System.Drawing.Size(104, 17); this.CHK_Variant.TabIndex = 91; - this.CHK_Variant.Text = "Local Variant"; + this.CHK_Variant.Text = "Regional Variant"; this.CHK_Variant.UseVisualStyleBackColor = true; // // TB_BST @@ -1110,6 +1109,47 @@ private void InitializeComponent() this.GB_Modifier.TabStop = false; this.GB_Modifier.Text = "Modifier Options"; // + // CHK_CatchRateMod + // + this.CHK_CatchRateMod.AutoSize = true; + this.CHK_CatchRateMod.Location = new System.Drawing.Point(204, 81); + this.CHK_CatchRateMod.Name = "CHK_CatchRateMod"; + this.CHK_CatchRateMod.Size = new System.Drawing.Size(114, 17); + this.CHK_CatchRateMod.TabIndex = 16; + this.CHK_CatchRateMod.Text = "Modify Catch Rate"; + this.CHK_CatchRateMod.UseVisualStyleBackColor = true; + // + // L_CatchRateMod + // + this.L_CatchRateMod.AutoSize = true; + this.L_CatchRateMod.Location = new System.Drawing.Point(204, 101); + this.L_CatchRateMod.Name = "L_CatchRateMod"; + this.L_CatchRateMod.Size = new System.Drawing.Size(34, 13); + this.L_CatchRateMod.TabIndex = 15; + this.L_CatchRateMod.Text = "Value"; + // + // NUD_CatchRateMod + // + this.NUD_CatchRateMod.Location = new System.Drawing.Point(267, 99); + this.NUD_CatchRateMod.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.NUD_CatchRateMod.Minimum = new decimal(new int[] { + 3, + 0, + 0, + 0}); + this.NUD_CatchRateMod.Name = "NUD_CatchRateMod"; + this.NUD_CatchRateMod.Size = new System.Drawing.Size(46, 20); + this.NUD_CatchRateMod.TabIndex = 14; + this.NUD_CatchRateMod.Value = new decimal(new int[] { + 3, + 0, + 0, + 0}); + // // CHK_CallRate // this.CHK_CallRate.AutoSize = true; @@ -1230,7 +1270,6 @@ private void InitializeComponent() this.GB_Randomizer.Controls.Add(this.NUD_Egg); this.GB_Randomizer.Controls.Add(this.CHK_WGuard); this.GB_Randomizer.Controls.Add(this.CHK_Ability); - this.GB_Randomizer.Controls.Add(this.CHK_ORASTutors); this.GB_Randomizer.Controls.Add(this.CHK_Tutors); this.GB_Randomizer.Controls.Add(this.CHK_rSPE); this.GB_Randomizer.Controls.Add(this.CHK_Type); @@ -1259,7 +1298,7 @@ private void InitializeComponent() // L_Same // this.L_Same.AutoSize = true; - this.L_Same.Location = new System.Drawing.Point(201, 100); + this.L_Same.Location = new System.Drawing.Point(226, 86); this.L_Same.Name = "L_Same"; this.L_Same.Size = new System.Drawing.Size(48, 13); this.L_Same.TabIndex = 23; @@ -1267,7 +1306,7 @@ private void InitializeComponent() // // NUD_Egg // - this.NUD_Egg.Location = new System.Drawing.Point(252, 98); + this.NUD_Egg.Location = new System.Drawing.Point(277, 84); this.NUD_Egg.Name = "NUD_Egg"; this.NUD_Egg.Size = new System.Drawing.Size(46, 20); this.NUD_Egg.TabIndex = 22; @@ -1282,9 +1321,9 @@ private void InitializeComponent() this.CHK_WGuard.AutoSize = true; this.CHK_WGuard.Location = new System.Drawing.Point(118, 49); this.CHK_WGuard.Name = "CHK_WGuard"; - this.CHK_WGuard.Size = new System.Drawing.Size(72, 17); + this.CHK_WGuard.Size = new System.Drawing.Size(96, 17); this.CHK_WGuard.TabIndex = 10; - this.CHK_WGuard.Text = "W. Guard"; + this.CHK_WGuard.Text = "Wonder Guard"; this.CHK_WGuard.UseVisualStyleBackColor = true; // // CHK_Ability @@ -1300,24 +1339,12 @@ private void InitializeComponent() this.CHK_Ability.UseVisualStyleBackColor = true; this.CHK_Ability.CheckedChanged += new System.EventHandler(this.CHK_Ability_CheckedChanged); // - // CHK_ORASTutors - // - 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(204, 49); - this.CHK_ORASTutors.Name = "CHK_ORASTutors"; - this.CHK_ORASTutors.Size = new System.Drawing.Size(79, 17); - this.CHK_ORASTutors.TabIndex = 9; - this.CHK_ORASTutors.Text = "R/S Tutors"; - this.CHK_ORASTutors.UseVisualStyleBackColor = true; - // // CHK_Tutors // 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(204, 34); + this.CHK_Tutors.Location = new System.Drawing.Point(229, 34); this.CHK_Tutors.Name = "CHK_Tutors"; this.CHK_Tutors.Size = new System.Drawing.Size(94, 17); this.CHK_Tutors.TabIndex = 8; @@ -1377,9 +1404,9 @@ private void InitializeComponent() this.L_SingleType.AutoSize = true; this.L_SingleType.Location = new System.Drawing.Point(115, 82); this.L_SingleType.Name = "L_SingleType"; - this.L_SingleType.Size = new System.Drawing.Size(74, 13); + this.L_SingleType.Size = new System.Drawing.Size(77, 13); this.L_SingleType.TabIndex = 21; - this.L_SingleType.Text = "SingleType(%)"; + this.L_SingleType.Text = "Single Type(%)"; // // CHK_rDEF // @@ -1434,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(252, 19); + this.CHK_HM.Location = new System.Drawing.Point(277, 19); this.CHK_HM.Name = "CHK_HM"; this.CHK_HM.Size = new System.Drawing.Size(43, 17); this.CHK_HM.TabIndex = 7; @@ -1455,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(204, 19); + this.CHK_TM.Location = new System.Drawing.Point(229, 19); this.CHK_TM.Name = "CHK_TM"; this.CHK_TM.Size = new System.Drawing.Size(42, 17); this.CHK_TM.TabIndex = 0; @@ -1492,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(204, 80); + this.CHK_EggGroup.Location = new System.Drawing.Point(229, 66); this.CHK_EggGroup.Name = "CHK_EggGroup"; this.CHK_EggGroup.Size = new System.Drawing.Size(77, 17); this.CHK_EggGroup.TabIndex = 13; @@ -1504,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(204, 65); + this.CHK_CatchRate.Location = new System.Drawing.Point(229, 50); this.CHK_CatchRate.Name = "CHK_CatchRate"; this.CHK_CatchRate.Size = new System.Drawing.Size(80, 17); this.CHK_CatchRate.TabIndex = 11; @@ -1551,47 +1578,6 @@ private void InitializeComponent() this.B_Dump.UseVisualStyleBackColor = true; this.B_Dump.Click += new System.EventHandler(this.B_Dump_Click); // - // CHK_CatchRateMod - // - this.CHK_CatchRateMod.AutoSize = true; - this.CHK_CatchRateMod.Location = new System.Drawing.Point(204, 81); - this.CHK_CatchRateMod.Name = "CHK_CatchRateMod"; - this.CHK_CatchRateMod.Size = new System.Drawing.Size(114, 17); - this.CHK_CatchRateMod.TabIndex = 16; - this.CHK_CatchRateMod.Text = "Modify Catch Rate"; - this.CHK_CatchRateMod.UseVisualStyleBackColor = true; - // - // L_CatchRateMod - // - this.L_CatchRateMod.AutoSize = true; - this.L_CatchRateMod.Location = new System.Drawing.Point(204, 101); - this.L_CatchRateMod.Name = "L_CatchRateMod"; - this.L_CatchRateMod.Size = new System.Drawing.Size(34, 13); - this.L_CatchRateMod.TabIndex = 15; - this.L_CatchRateMod.Text = "Value"; - // - // NUD_CatchRateMod - // - this.NUD_CatchRateMod.Location = new System.Drawing.Point(267, 99); - this.NUD_CatchRateMod.Maximum = new decimal(new int[] { - 255, - 0, - 0, - 0}); - this.NUD_CatchRateMod.Minimum = new decimal(new int[] { - 3, - 0, - 0, - 0}); - this.NUD_CatchRateMod.Name = "NUD_CatchRateMod"; - this.NUD_CatchRateMod.Size = new System.Drawing.Size(46, 20); - this.NUD_CatchRateMod.TabIndex = 14; - this.NUD_CatchRateMod.Value = new decimal(new int[] { - 3, - 0, - 0, - 0}); - // // PersonalEditor7 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1617,6 +1603,7 @@ private void InitializeComponent() this.TP_Randomizer.ResumeLayout(false); this.GB_Modifier.ResumeLayout(false); this.GB_Modifier.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_CatchRateMod)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_CallRate)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_EXP)).EndInit(); this.GB_Randomizer.ResumeLayout(false); @@ -1625,7 +1612,6 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.NUD_TypePercent)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_StatDev)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.PB_MonSprite)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.NUD_CatchRateMod)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -1719,7 +1705,6 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox CHK_Item; private System.Windows.Forms.CheckBox CHK_Type; private System.Windows.Forms.CheckBox CHK_HM; - private System.Windows.Forms.CheckBox CHK_ORASTutors; private System.Windows.Forms.CheckBox CHK_Tutors; private System.Windows.Forms.CheckBox CHK_WGuard; private System.Windows.Forms.CheckBox CHK_CatchRate; diff --git a/pk3DS/Subforms/Gen7/PersonalEditor7.cs b/pk3DS/Subforms/Gen7/PersonalEditor7.cs index bb275c6..b720ecf 100644 --- a/pk3DS/Subforms/Gen7/PersonalEditor7.cs +++ b/pk3DS/Subforms/Gen7/PersonalEditor7.cs @@ -303,7 +303,6 @@ private void B_Randomize_Click(object sender, EventArgs e) ModifyLearnsetTM = CHK_TM.Checked, ModifyLearnsetHM = CHK_HM.Checked, ModifyLearnsetTypeTutors = CHK_Tutors.Checked, - ModifyLearnsetMoveTutors = Main.Config.ORAS && CHK_ORASTutors.Checked, ModifyTypes = CHK_Type.Checked, ModifyHeldItems = CHK_Item.Checked, SameTypeChance = NUD_TypePercent.Value, @@ -314,7 +313,7 @@ private void B_Randomize_Click(object sender, EventArgs e) rnd.Execute(); readEntry(); - WinFormsUtil.Alert("All relevant Pokemon Personal Entries have been randomized!"); + WinFormsUtil.Alert("All relevant Pokémon Personal Entries have been randomized!"); } private void B_ModifyAll(object sender, EventArgs e) { @@ -386,7 +385,8 @@ private void B_Dump_Click(object sender, EventArgs e) } private void CHK_Stats_CheckedChanged(object sender, EventArgs e) { - L_StatDev.Visible = NUD_StatDev.Visible = CHK_Stats.Checked; + L_StatDev.Enabled = NUD_StatDev.Enabled = CHK_Stats.Checked; + CHK_rHP.Enabled = CHK_rATK.Enabled = CHK_rDEF.Enabled = CHK_rSPA.Enabled = CHK_rSPD.Enabled = CHK_rSPE.Enabled = CHK_Stats.Checked; } private void CHK_Ability_CheckedChanged(object sender, EventArgs e) { diff --git a/pk3DS/Subforms/TextEditor.cs b/pk3DS/Subforms/TextEditor.cs index 4d02bb9..41f1611 100644 --- a/pk3DS/Subforms/TextEditor.cs +++ b/pk3DS/Subforms/TextEditor.cs @@ -243,7 +243,7 @@ private void B_Randomize_Click(object sender, EventArgs e) { // gametext can be horribly broken if randomized if (Mode == "gametext" && DialogResult.Yes != - WinFormsUtil.Prompt(MessageBoxButtons.YesNo, "Randomizing Game Text is dangerous?", "Continue?")) + WinFormsUtil.Prompt(MessageBoxButtons.YesNo, "Randomizing Game Text is dangerous!", "Continue?")) return; // get if the user wants to randomize current text file or all files