From 2a5eca005b8faac957317da60130bf9d8e91918b Mon Sep 17 00:00:00 2001 From: sora10pls Date: Mon, 11 Sep 2017 00:29:53 -0400 Subject: [PATCH] More misc changes --- pk3DS/Main.Designer.cs | 26 +++++++-------- pk3DS/Subforms/Gen6/MaisonEditor6.Designer.cs | 12 +++---- pk3DS/Subforms/Gen6/MartEditor6.cs | 16 +++++----- pk3DS/Subforms/Gen6/MoveEditor6.cs | 2 +- pk3DS/Subforms/Gen7/MaisonEditor7.Designer.cs | 12 +++---- pk3DS/Subforms/Gen7/MartEditor7.cs | 32 +++++++++---------- pk3DS/Subforms/Gen7/MoveEditor7.cs | 2 +- 7 files changed, 51 insertions(+), 51 deletions(-) diff --git a/pk3DS/Main.Designer.cs b/pk3DS/Main.Designer.cs index c807b51..d317471 100644 --- a/pk3DS/Main.Designer.cs +++ b/pk3DS/Main.Designer.cs @@ -176,7 +176,7 @@ private void InitializeComponent() this.B_TMHM.Name = "B_TMHM"; this.B_TMHM.Size = new System.Drawing.Size(100, 23); this.B_TMHM.TabIndex = 1; - this.B_TMHM.Text = "TM/HM"; + this.B_TMHM.Text = "TMs/HMs"; this.B_TMHM.UseVisualStyleBackColor = true; this.B_TMHM.Click += new System.EventHandler(this.B_TMHM_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(152, 22); + this.Menu_Open.Size = new System.Drawing.Size(105, 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(152, 22); + this.Menu_Exit.Size = new System.Drawing.Size(105, 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(152, 22); + this.Menu_RomFS.Size = new System.Drawing.Size(111, 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(152, 22); + this.Menu_ExeFS.Size = new System.Drawing.Size(111, 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(152, 22); + this.Menu_CRO.Size = new System.Drawing.Size(111, 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(152, 22); + this.Menu_3DS.Size = new System.Drawing.Size(111, 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(152, 22); + this.Menu_Patch.Size = new System.Drawing.Size(111, 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(152, 22); + this.Menu_Language.Size = new System.Drawing.Size(146, 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(152, 22); + this.Menu_About.Size = new System.Drawing.Size(146, 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(152, 22); + this.Menu_GARCs.Size = new System.Drawing.Size(146, 22); this.Menu_GARCs.Text = "About GARCs"; this.Menu_GARCs.Click += new System.EventHandler(this.L_GARCInfo_Click); // @@ -546,7 +546,7 @@ private void InitializeComponent() this.B_Maison.Name = "B_Maison"; this.B_Maison.Size = new System.Drawing.Size(100, 23); this.B_Maison.TabIndex = 5; - this.B_Maison.Text = "Maison"; + this.B_Maison.Text = "Battle Maison"; this.B_Maison.UseVisualStyleBackColor = true; this.B_Maison.Click += new System.EventHandler(this.B_Maison_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 = "Royal/Tree"; + this.B_Royal.Text = "Battle Royal/Tree"; this.B_Royal.UseVisualStyleBackColor = true; this.B_Royal.Click += new System.EventHandler(this.B_Maison_Click); // diff --git a/pk3DS/Subforms/Gen6/MaisonEditor6.Designer.cs b/pk3DS/Subforms/Gen6/MaisonEditor6.Designer.cs index 6643bf7..a9591c9 100644 --- a/pk3DS/Subforms/Gen6/MaisonEditor6.Designer.cs +++ b/pk3DS/Subforms/Gen6/MaisonEditor6.Designer.cs @@ -102,7 +102,7 @@ private void InitializeComponent() this.L_Pokemon.Name = "L_Pokemon"; this.L_Pokemon.Size = new System.Drawing.Size(55, 13); this.L_Pokemon.TabIndex = 3; - this.L_Pokemon.Text = "Pokemon:"; + this.L_Pokemon.Text = "Pokémon:"; // // GB_Trainer // @@ -193,7 +193,7 @@ private void InitializeComponent() this.GB_Pokemon.Size = new System.Drawing.Size(275, 187); this.GB_Pokemon.TabIndex = 5; this.GB_Pokemon.TabStop = false; - this.GB_Pokemon.Text = "Pokemon Summary"; + this.GB_Pokemon.Text = "Pokémon Summary"; // // PB_PKM // @@ -238,9 +238,9 @@ private void InitializeComponent() this.CHK_DEF.AutoSize = true; this.CHK_DEF.Location = new System.Drawing.Point(172, 157); this.CHK_DEF.Name = "CHK_DEF"; - this.CHK_DEF.Size = new System.Drawing.Size(47, 17); + this.CHK_DEF.Size = new System.Drawing.Size(43, 17); this.CHK_DEF.TabIndex = 21; - this.CHK_DEF.Text = "DEF"; + this.CHK_DEF.Text = "Def"; this.CHK_DEF.UseVisualStyleBackColor = true; // // CHK_ATK @@ -248,9 +248,9 @@ private void InitializeComponent() this.CHK_ATK.AutoSize = true; this.CHK_ATK.Location = new System.Drawing.Point(172, 143); this.CHK_ATK.Name = "CHK_ATK"; - this.CHK_ATK.Size = new System.Drawing.Size(47, 17); + this.CHK_ATK.Size = new System.Drawing.Size(42, 17); this.CHK_ATK.TabIndex = 20; - this.CHK_ATK.Text = "ATK"; + this.CHK_ATK.Text = "Atk"; this.CHK_ATK.UseVisualStyleBackColor = true; // // CHK_HP diff --git a/pk3DS/Subforms/Gen6/MartEditor6.cs b/pk3DS/Subforms/Gen6/MartEditor6.cs index 7c77183..d963504 100644 --- a/pk3DS/Subforms/Gen6/MartEditor6.cs +++ b/pk3DS/Subforms/Gen6/MartEditor6.cs @@ -84,8 +84,8 @@ private static int GetDataOffset(byte[] data) { "No Badges", "1 Badge", "2 Badges", "3 Badges", "4 Badges", "5 Badges", "6 Badges", "7 Badges", "8 Badges", "Unused", - "Slateport Market [Incenses]", "Slateport Market [Vitamins]", "Slateport Market [TMs]", "Rustboro Mart [Poke Balls]", "Slateport Mart [Misc]", - "Mauville Mart [TMs]", "Verdanturf Mart [Poke Balls]", "Fallarbor Mart [Poke Balls]", "Lavaridge Town [Herbs]", + "Slateport Market [Incenses]", "Slateport Market [Vitamins]", "Slateport Market [TMs]", "Rustboro City [Poké Balls]", "Slateport City [X Items]", + "Mauville City [TMs]", "Verdanturf Town [Poké Balls]", "Fallarbor Town [Poké Balls]", "Lavaridge Town [Herbs]", "Lilycove Dept Store, 2F Left [Run Away Items]", "Lilycove Dept Store, 3F Left [Vitamins]", "Lilycove Dept Store, 3F Right [Misc]", "Lilycove Dept Store, 4F Left [Offensive TMs]", "Lilycove Dept Store, 4F Right [Defensive TMs]" } @@ -93,15 +93,15 @@ private static int GetDataOffset(byte[] data) { "No Badges", "1 Badge", "2 Badges", "3 Badges", "4 Badges", "5 Badges", "6 Badges", "7 Badges", "8 Badges", "Unused", - "Herbs", "Balls", "Stones", "Incence", "Aquacorde Balls", "Aquacorde Potion", - "Lumiose North Boulevard [Balls]", "Cyllage City [Balls]", - "Shalour City [TMs]", "Lumiose South Boulevard [TMs]", + "Herbs", "Poké Balls", "Stones", "Incenses", "Aquacorde Town [Poké Ball]", "Aquacorde Town [Potion]", + "Lumiose City North Boulevard [Poké Balls]", "Cyllage City [Poké Balls]", + "Shalour City [TMs]", "Lumiose City South Boulevard [TMs]", "Laverre City [Vitamins]", - "Snowbelle City [Balls]", + "Snowbelle City [Poké Balls]", "Kiloude City [TMs]", "Anistar City [TMs]", - "Santalune City [X-Stat]", - "Coumarine City [Balls]" + "Santalune City [X Items]", + "Coumarine City [Poké Balls]" }; private void getDataOffset(int index) diff --git a/pk3DS/Subforms/Gen6/MoveEditor6.cs b/pk3DS/Subforms/Gen6/MoveEditor6.cs index 819d16a..a200a52 100644 --- a/pk3DS/Subforms/Gen6/MoveEditor6.cs +++ b/pk3DS/Subforms/Gen6/MoveEditor6.cs @@ -27,7 +27,7 @@ public MoveEditor6(byte[][] infiles) private readonly string[] TargetingTypes = { "Single Adjacent Ally/Foe", "Any Ally", "Any Adjacent Ally", "Single Adjacent Foe", "Everyone but User", "All Foes", - "All Allies", "Self", "All Pokemon on Field", "Single Adjacent Foe (2)", "Entire Field", + "All Allies", "Self", "All Pokémon on Field", "Single Adjacent Foe (2)", "Entire Field", "Opponent's Field", "User's Field", "Self", }; diff --git a/pk3DS/Subforms/Gen7/MaisonEditor7.Designer.cs b/pk3DS/Subforms/Gen7/MaisonEditor7.Designer.cs index e83142a..56c5d7d 100644 --- a/pk3DS/Subforms/Gen7/MaisonEditor7.Designer.cs +++ b/pk3DS/Subforms/Gen7/MaisonEditor7.Designer.cs @@ -105,7 +105,7 @@ private void InitializeComponent() this.L_Pokemon.Name = "L_Pokemon"; this.L_Pokemon.Size = new System.Drawing.Size(55, 13); this.L_Pokemon.TabIndex = 3; - this.L_Pokemon.Text = "Pokemon:"; + this.L_Pokemon.Text = "Pokémon:"; // // GB_Trainer // @@ -198,7 +198,7 @@ private void InitializeComponent() this.GB_Pokemon.Size = new System.Drawing.Size(275, 187); this.GB_Pokemon.TabIndex = 5; this.GB_Pokemon.TabStop = false; - this.GB_Pokemon.Text = "Pokemon Summary"; + this.GB_Pokemon.Text = "Pokémon Summary"; // // L_Form // @@ -270,9 +270,9 @@ private void InitializeComponent() this.CHK_DEF.AutoSize = true; this.CHK_DEF.Location = new System.Drawing.Point(172, 157); this.CHK_DEF.Name = "CHK_DEF"; - this.CHK_DEF.Size = new System.Drawing.Size(47, 17); + this.CHK_DEF.Size = new System.Drawing.Size(43, 17); this.CHK_DEF.TabIndex = 21; - this.CHK_DEF.Text = "DEF"; + this.CHK_DEF.Text = "Def"; this.CHK_DEF.UseVisualStyleBackColor = true; // // CHK_ATK @@ -280,9 +280,9 @@ private void InitializeComponent() this.CHK_ATK.AutoSize = true; this.CHK_ATK.Location = new System.Drawing.Point(172, 143); this.CHK_ATK.Name = "CHK_ATK"; - this.CHK_ATK.Size = new System.Drawing.Size(47, 17); + this.CHK_ATK.Size = new System.Drawing.Size(42, 17); this.CHK_ATK.TabIndex = 20; - this.CHK_ATK.Text = "ATK"; + this.CHK_ATK.Text = "Atk"; this.CHK_ATK.UseVisualStyleBackColor = true; // // CHK_HP diff --git a/pk3DS/Subforms/Gen7/MartEditor7.cs b/pk3DS/Subforms/Gen7/MartEditor7.cs index 9e9498a..46fe337 100644 --- a/pk3DS/Subforms/Gen7/MartEditor7.cs +++ b/pk3DS/Subforms/Gen7/MartEditor7.cs @@ -67,22 +67,22 @@ public MartEditor7() private readonly string[] locations = { "No Trials", "1 Trial", "2 Trials", "3 Trials", "4 Trials", "5 Trials", "6 Trials", "7 Trials", - "KoniKoni Incense", - "KoniKoni Herb", - "Hau'oli Battle", - "Route 2", - "Heahea", - "Royal Avenue", - "Route 8", - "Paniola", - "Malie TMs", - "Mount Hokulani", - "Seafolk TM", - "KoniKoni TM", - "KoniKoni Jewelry", - "Thrifty 1", - "Thrifty 2", - "Thrifty 3 (Souvenir)" + "Konikoni City [Incenses]", + "Konikoni City [Herbs]", + "Hau'oli City [X Items]", + "Route 2 [Misc]", + "Heahea City [TMs]", + "Royal Avenue [TMs]", + "Route 8 [Misc]", + "Paniola Town [Poké Balls]", + "Malie City [TMs]", + "Mount Hokulani [Vitamins]", + "Seafolk Village [TMs]", + "Konikoni City [TMs]", + "Konikoni City [Stones]", + "Thrifty Megamart 1 [Poké Balls]", + "Thrifty Megamart 2 [Misc]", + "Thrifty Megamart 3 [Strange Souvenir]" }; private readonly int[] entriesBP = diff --git a/pk3DS/Subforms/Gen7/MoveEditor7.cs b/pk3DS/Subforms/Gen7/MoveEditor7.cs index ba185e6..289f72c 100644 --- a/pk3DS/Subforms/Gen7/MoveEditor7.cs +++ b/pk3DS/Subforms/Gen7/MoveEditor7.cs @@ -28,7 +28,7 @@ public MoveEditor7(byte[][] infiles) private readonly string[] TargetingTypes = { "Single Adjacent Ally/Foe", "Any Ally", "Any Adjacent Ally", "Single Adjacent Foe", "Everyone but User", "All Foes", - "All Allies", "Self", "All Pokemon on Field", "Single Adjacent Foe (2)", "Entire Field", + "All Allies", "Self", "All Pokémon on Field", "Single Adjacent Foe (2)", "Entire Field", "Opponent's Field", "User's Field", "Self", };