Leahnaya/pk3DS
1
0
Fork 0
mirror of https://github.com/kwsch/pk3DS.git synced 2026-04-25 15:47:19 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Duplicate TM & Maison buttons

Browse Source 
Show different labels for different generations
Closes #163
This commit is contained in:
Kurt 2017-07-07 20:47:58 -07:00
parent d243f9940d
commit f0923d5997
2 changed files with 47 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
pk3DS/Main.Designer.cs generated
View File

@ -73,12 +73,14 @@ private void InitializeComponent()
this.B_EggMove = new System.Windows.Forms.Button();
this.B_Trainer = new System.Windows.Forms.Button();
this.B_Maison = new System.Windows.Forms.Button();
this.B_Royal = new System.Windows.Forms.Button();
this.B_Item = new System.Windows.Forms.Button();
this.B_Move = new System.Windows.Forms.Button();
this.B_TitleScreen = new System.Windows.Forms.Button();
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_ShinyRate = new System.Windows.Forms.Button();
this.Tab_CRO = new System.Windows.Forms.TabPage();
this.FLP_CRO = new System.Windows.Forms.FlowLayoutPanel();
this.B_TypeChart = new System.Windows.Forms.Button();
@ -87,7 +89,7 @@ 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_ShinyRate = new System.Windows.Forms.Button();
this.B_TM = new System.Windows.Forms.Button();
this.menuStrip1.SuspendLayout();
this.TC_RomFS.SuspendLayout();
this.Tab_RomFS.SuspendLayout();
@ -130,7 +132,7 @@ private void InitializeComponent()
//
// B_OPower
//
this.B_OPower.Location = new System.Drawing.Point(109, 32);
this.B_OPower.Location = new System.Drawing.Point(215, 32);
this.B_OPower.Name = "B_OPower";
this.B_OPower.Size = new System.Drawing.Size(100, 23);
this.B_OPower.TabIndex = 4;
@ -140,7 +142,7 @@ private void InitializeComponent()
//
// B_Pickup
//
this.B_Pickup.Location = new System.Drawing.Point(3, 32);
this.B_Pickup.Location = new System.Drawing.Point(109, 32);
this.B_Pickup.Name = "B_Pickup";
this.B_Pickup.Size = new System.Drawing.Size(100, 23);
this.B_Pickup.TabIndex = 0;
@ -150,7 +152,7 @@ private void InitializeComponent()
//
// B_Mart
//
this.B_Mart.Location = new System.Drawing.Point(215, 3);
this.B_Mart.Location = new System.Drawing.Point(3, 32);
this.B_Mart.Name = "B_Mart";
this.B_Mart.Size = new System.Drawing.Size(100, 23);
this.B_Mart.TabIndex = 2;
@ -361,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
@ -387,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);
//
@ -437,6 +439,7 @@ private void InitializeComponent()
this.FLP_RomFS.Controls.Add(this.B_EggMove);
this.FLP_RomFS.Controls.Add(this.B_Trainer);
this.FLP_RomFS.Controls.Add(this.B_Maison);
this.FLP_RomFS.Controls.Add(this.B_Royal);
this.FLP_RomFS.Controls.Add(this.B_Item);
this.FLP_RomFS.Controls.Add(this.B_Move);
this.FLP_RomFS.Controls.Add(this.B_TitleScreen);
@ -547,9 +550,19 @@ private void InitializeComponent()
this.B_Maison.UseVisualStyleBackColor = true;
this.B_Maison.Click += new System.EventHandler(this.B_Maison_Click);
//
// B_Royal
//
this.B_Royal.Location = new System.Drawing.Point(109, 90);
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.UseVisualStyleBackColor = true;
this.B_Royal.Click += new System.EventHandler(this.B_Maison_Click);
//
// B_Item
//
this.B_Item.Location = new System.Drawing.Point(109, 90);
this.B_Item.Location = new System.Drawing.Point(215, 90);
this.B_Item.Name = "B_Item";
this.B_Item.Size = new System.Drawing.Size(100, 23);
this.B_Item.TabIndex = 8;
@ -559,7 +572,7 @@ private void InitializeComponent()
//
// B_Move
//
this.B_Move.Location = new System.Drawing.Point(215, 90);
this.B_Move.Location = new System.Drawing.Point(3, 119);
this.B_Move.Name = "B_Move";
this.B_Move.Size = new System.Drawing.Size(100, 23);
this.B_Move.TabIndex = 11;
@ -569,7 +582,7 @@ private void InitializeComponent()
//
// B_TitleScreen
//
this.B_TitleScreen.Location = new System.Drawing.Point(3, 119);
this.B_TitleScreen.Location = new System.Drawing.Point(109, 119);
this.B_TitleScreen.Name = "B_TitleScreen";
this.B_TitleScreen.Size = new System.Drawing.Size(100, 23);
this.B_TitleScreen.TabIndex = 12;
@ -579,7 +592,7 @@ private void InitializeComponent()
//
// B_OWSE
//
this.B_OWSE.Location = new System.Drawing.Point(109, 119);
this.B_OWSE.Location = new System.Drawing.Point(215, 119);
this.B_OWSE.Name = "B_OWSE";
this.B_OWSE.Size = new System.Drawing.Size(100, 23);
this.B_OWSE.TabIndex = 13;
@ -603,6 +616,7 @@ private void InitializeComponent()
this.FLP_ExeFS.AutoScroll = true;
this.FLP_ExeFS.Controls.Add(this.B_MoveTutor);
this.FLP_ExeFS.Controls.Add(this.B_TMHM);
this.FLP_ExeFS.Controls.Add(this.B_TM);
this.FLP_ExeFS.Controls.Add(this.B_Mart);
this.FLP_ExeFS.Controls.Add(this.B_Pickup);
this.FLP_ExeFS.Controls.Add(this.B_OPower);
@ -613,6 +627,16 @@ private void InitializeComponent()
this.FLP_ExeFS.Size = new System.Drawing.Size(346, 148);
this.FLP_ExeFS.TabIndex = 11;
//
// B_ShinyRate
//
this.B_ShinyRate.Location = new System.Drawing.Point(3, 61);
this.B_ShinyRate.Name = "B_ShinyRate";
this.B_ShinyRate.Size = new System.Drawing.Size(100, 23);
this.B_ShinyRate.TabIndex = 5;
this.B_ShinyRate.Text = "Shiny Rate";
this.B_ShinyRate.UseVisualStyleBackColor = true;
this.B_ShinyRate.Click += new System.EventHandler(this.B_ShinyRate_Click);
//
// Tab_CRO
//
this.Tab_CRO.Controls.Add(this.FLP_CRO);
@ -694,15 +718,15 @@ private void InitializeComponent()
this.L_Status.TabIndex = 14;
this.L_Status.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// B_ShinyRate
// B_TM
//
this.B_ShinyRate.Location = new System.Drawing.Point(215, 32);
this.B_ShinyRate.Name = "B_ShinyRate";
this.B_ShinyRate.Size = new System.Drawing.Size(100, 23);
this.B_ShinyRate.TabIndex = 5;
this.B_ShinyRate.Text = "Shiny Rate";
this.B_ShinyRate.UseVisualStyleBackColor = true;
this.B_ShinyRate.Click += new System.EventHandler(this.B_ShinyRate_Click);
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
//
@ -798,5 +822,7 @@ private void InitializeComponent()
private System.Windows.Forms.Label L_Status;
private System.Windows.Forms.Button B_OWSE;
private System.Windows.Forms.Button B_ShinyRate;
private System.Windows.Forms.Button B_Royal;
private System.Windows.Forms.Button B_TM;
}
}

4
pk3DS/Main.cs
View File

@ -261,8 +261,8 @@ private void toggleSubEditors()
B_MoveTutor.Visible = Config.ORAS; // Default false unless loaded
break;
case 7:
romfs = new Control[] {B_GameText, B_StoryText, B_Personal, B_Evolution, B_LevelUp, B_Wild, B_MegaEvo, B_EggMove, B_Trainer, B_Item, B_Move, B_Maison, B_Pickup, B_OWSE };
exefs = new Control[] {B_TMHM, B_TypeChart, B_ShinyRate};
romfs = new Control[] {B_GameText, B_StoryText, B_Personal, B_Evolution, B_LevelUp, B_Wild, B_MegaEvo, B_EggMove, B_Trainer, B_Item, B_Move, B_Royal, B_Pickup, B_OWSE };
exefs = new Control[] {B_TM, B_TypeChart, B_ShinyRate};
cro = new Control[] {B_Mart};
if (Config.Version != GameVersion.SMDEMO)