diff --git a/Misc/Util.cs b/Misc/Util.cs index 5518d6245..4788ec51b 100644 --- a/Misc/Util.cs +++ b/Misc/Util.cs @@ -17,7 +17,7 @@ namespace PKHeX { Color newColor = overlayImage.GetPixel(i % (overlayImage.Width), i / (overlayImage.Width)); newColor = Color.FromArgb((int)((double)(newColor.A) * trans), newColor.R, newColor.G, newColor.B); // Apply transparency change - if (newColor != Color.FromArgb(0, 0, 0, 0)) + if (newColor.A != 0) // If Pixel isn't transparent, we'll overwrite the color. { newImage.SetPixel( i % (overlayImage.Width) + x, diff --git a/PKHeX.csproj b/PKHeX.csproj index ceafdaafe..2cc90abe7 100644 --- a/PKHeX.csproj +++ b/PKHeX.csproj @@ -301,6 +301,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PKX/f1-Main.Designer.cs b/PKX/f1-Main.Designer.cs index 3be5b6617..e3d8498bb 100644 --- a/PKX/f1-Main.Designer.cs +++ b/PKX/f1-Main.Designer.cs @@ -225,8 +225,7 @@ this.L_Save = new System.Windows.Forms.Label(); this.tabBoxMulti = new System.Windows.Forms.TabControl(); this.Tab_Box = new System.Windows.Forms.TabPage(); - this.B_BoxRight = new System.Windows.Forms.Button(); - this.B_BoxLeft = new System.Windows.Forms.Button(); + this.PAN_Box = new System.Windows.Forms.Panel(); this.bpkx30 = new System.Windows.Forms.PictureBox(); this.bpkx29 = new System.Windows.Forms.PictureBox(); this.bpkx28 = new System.Windows.Forms.PictureBox(); @@ -257,9 +256,11 @@ this.bpkx3 = new System.Windows.Forms.PictureBox(); this.bpkx2 = new System.Windows.Forms.PictureBox(); this.bpkx1 = new System.Windows.Forms.PictureBox(); + this.B_BoxRight = new System.Windows.Forms.Button(); + this.B_BoxLeft = new System.Windows.Forms.Button(); this.C_BoxSelect = new System.Windows.Forms.ComboBox(); this.Tab_PartyBattle = new System.Windows.Forms.TabPage(); - this.panel2 = new System.Windows.Forms.Panel(); + this.PAN_BattleBox = new System.Windows.Forms.Panel(); this.bbpkx1 = new System.Windows.Forms.PictureBox(); this.bbpkx2 = new System.Windows.Forms.PictureBox(); this.bbpkx3 = new System.Windows.Forms.PictureBox(); @@ -269,7 +270,7 @@ this.L_ReadOnlyPBB = new System.Windows.Forms.Label(); this.L_BattleBox = new System.Windows.Forms.Label(); this.L_Party = new System.Windows.Forms.Label(); - this.panel1 = new System.Windows.Forms.Panel(); + this.PAN_Party = new System.Windows.Forms.Panel(); this.ppkx1 = new System.Windows.Forms.PictureBox(); this.ppkx2 = new System.Windows.Forms.PictureBox(); this.ppkx3 = new System.Windows.Forms.PictureBox(); @@ -351,6 +352,7 @@ this.menuStrip1.SuspendLayout(); this.tabBoxMulti.SuspendLayout(); this.Tab_Box.SuspendLayout(); + this.PAN_Box.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bpkx30)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bpkx29)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bpkx28)).BeginInit(); @@ -382,14 +384,14 @@ ((System.ComponentModel.ISupportInitialize)(this.bpkx2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bpkx1)).BeginInit(); this.Tab_PartyBattle.SuspendLayout(); - this.panel2.SuspendLayout(); + this.PAN_BattleBox.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bbpkx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bbpkx2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bbpkx3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bbpkx4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bbpkx5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bbpkx6)).BeginInit(); - this.panel1.SuspendLayout(); + this.PAN_Party.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.ppkx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.ppkx2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.ppkx3)).BeginInit(); @@ -2337,8 +2339,6 @@ this.CB_ExtraBytes.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CB_ExtraBytes.FormattingEnabled = true; this.CB_ExtraBytes.Items.AddRange(new object[] { - "0x16", - "0x17", "0x35", "0x36", "0x37", @@ -2666,38 +2666,9 @@ // // Tab_Box // + this.Tab_Box.Controls.Add(this.PAN_Box); this.Tab_Box.Controls.Add(this.B_BoxRight); this.Tab_Box.Controls.Add(this.B_BoxLeft); - this.Tab_Box.Controls.Add(this.bpkx30); - this.Tab_Box.Controls.Add(this.bpkx29); - this.Tab_Box.Controls.Add(this.bpkx28); - this.Tab_Box.Controls.Add(this.bpkx27); - this.Tab_Box.Controls.Add(this.bpkx26); - this.Tab_Box.Controls.Add(this.bpkx25); - this.Tab_Box.Controls.Add(this.bpkx24); - this.Tab_Box.Controls.Add(this.bpkx23); - this.Tab_Box.Controls.Add(this.bpkx22); - this.Tab_Box.Controls.Add(this.bpkx21); - this.Tab_Box.Controls.Add(this.bpkx20); - this.Tab_Box.Controls.Add(this.bpkx19); - this.Tab_Box.Controls.Add(this.bpkx18); - this.Tab_Box.Controls.Add(this.bpkx17); - this.Tab_Box.Controls.Add(this.bpkx16); - this.Tab_Box.Controls.Add(this.bpkx15); - this.Tab_Box.Controls.Add(this.bpkx14); - this.Tab_Box.Controls.Add(this.bpkx13); - this.Tab_Box.Controls.Add(this.bpkx12); - this.Tab_Box.Controls.Add(this.bpkx11); - this.Tab_Box.Controls.Add(this.bpkx10); - this.Tab_Box.Controls.Add(this.bpkx9); - this.Tab_Box.Controls.Add(this.bpkx8); - this.Tab_Box.Controls.Add(this.bpkx7); - this.Tab_Box.Controls.Add(this.bpkx6); - this.Tab_Box.Controls.Add(this.bpkx5); - this.Tab_Box.Controls.Add(this.bpkx4); - this.Tab_Box.Controls.Add(this.bpkx3); - this.Tab_Box.Controls.Add(this.bpkx2); - this.Tab_Box.Controls.Add(this.bpkx1); this.Tab_Box.Controls.Add(this.C_BoxSelect); this.Tab_Box.Location = new System.Drawing.Point(4, 22); this.Tab_Box.Name = "Tab_Box"; @@ -2707,6 +2678,374 @@ this.Tab_Box.Text = "Box"; this.Tab_Box.UseVisualStyleBackColor = true; // + // PAN_Box + // + this.PAN_Box.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.PAN_Box.Controls.Add(this.bpkx30); + this.PAN_Box.Controls.Add(this.bpkx29); + this.PAN_Box.Controls.Add(this.bpkx28); + this.PAN_Box.Controls.Add(this.bpkx27); + this.PAN_Box.Controls.Add(this.bpkx26); + this.PAN_Box.Controls.Add(this.bpkx25); + this.PAN_Box.Controls.Add(this.bpkx24); + this.PAN_Box.Controls.Add(this.bpkx23); + this.PAN_Box.Controls.Add(this.bpkx22); + this.PAN_Box.Controls.Add(this.bpkx21); + this.PAN_Box.Controls.Add(this.bpkx20); + this.PAN_Box.Controls.Add(this.bpkx19); + this.PAN_Box.Controls.Add(this.bpkx18); + this.PAN_Box.Controls.Add(this.bpkx17); + this.PAN_Box.Controls.Add(this.bpkx16); + this.PAN_Box.Controls.Add(this.bpkx15); + this.PAN_Box.Controls.Add(this.bpkx14); + this.PAN_Box.Controls.Add(this.bpkx13); + this.PAN_Box.Controls.Add(this.bpkx12); + this.PAN_Box.Controls.Add(this.bpkx11); + this.PAN_Box.Controls.Add(this.bpkx10); + this.PAN_Box.Controls.Add(this.bpkx9); + this.PAN_Box.Controls.Add(this.bpkx8); + this.PAN_Box.Controls.Add(this.bpkx7); + this.PAN_Box.Controls.Add(this.bpkx6); + this.PAN_Box.Controls.Add(this.bpkx5); + this.PAN_Box.Controls.Add(this.bpkx4); + this.PAN_Box.Controls.Add(this.bpkx3); + this.PAN_Box.Controls.Add(this.bpkx2); + this.PAN_Box.Controls.Add(this.bpkx1); + this.PAN_Box.Location = new System.Drawing.Point(26, 35); + this.PAN_Box.Name = "PAN_Box"; + this.PAN_Box.Size = new System.Drawing.Size(251, 160); + this.PAN_Box.TabIndex = 62; + // + // bpkx30 + // + this.bpkx30.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx30.Location = new System.Drawing.Point(207, 126); + this.bpkx30.Name = "bpkx30"; + this.bpkx30.Size = new System.Drawing.Size(42, 32); + this.bpkx30.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx30.TabIndex = 59; + this.bpkx30.TabStop = false; + this.bpkx30.Click += new System.EventHandler(this.slotModifier_Click); + // + // bpkx29 + // + this.bpkx29.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx29.Location = new System.Drawing.Point(166, 126); + this.bpkx29.Name = "bpkx29"; + this.bpkx29.Size = new System.Drawing.Size(42, 32); + this.bpkx29.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx29.TabIndex = 58; + this.bpkx29.TabStop = false; + this.bpkx29.Click += new System.EventHandler(this.slotModifier_Click); + // + // bpkx28 + // + this.bpkx28.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx28.Location = new System.Drawing.Point(125, 126); + this.bpkx28.Name = "bpkx28"; + this.bpkx28.Size = new System.Drawing.Size(42, 32); + this.bpkx28.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx28.TabIndex = 57; + this.bpkx28.TabStop = false; + this.bpkx28.Click += new System.EventHandler(this.slotModifier_Click); + // + // bpkx27 + // + this.bpkx27.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx27.Location = new System.Drawing.Point(84, 126); + this.bpkx27.Name = "bpkx27"; + this.bpkx27.Size = new System.Drawing.Size(42, 32); + this.bpkx27.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx27.TabIndex = 56; + this.bpkx27.TabStop = false; + this.bpkx27.Click += new System.EventHandler(this.slotModifier_Click); + // + // bpkx26 + // + this.bpkx26.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx26.Location = new System.Drawing.Point(43, 126); + this.bpkx26.Name = "bpkx26"; + this.bpkx26.Size = new System.Drawing.Size(42, 32); + this.bpkx26.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx26.TabIndex = 55; + this.bpkx26.TabStop = false; + this.bpkx26.Click += new System.EventHandler(this.slotModifier_Click); + // + // bpkx25 + // + this.bpkx25.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx25.Location = new System.Drawing.Point(2, 126); + this.bpkx25.Name = "bpkx25"; + this.bpkx25.Size = new System.Drawing.Size(42, 32); + this.bpkx25.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx25.TabIndex = 54; + this.bpkx25.TabStop = false; + this.bpkx25.Click += new System.EventHandler(this.slotModifier_Click); + // + // bpkx24 + // + this.bpkx24.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx24.Location = new System.Drawing.Point(207, 95); + this.bpkx24.Name = "bpkx24"; + this.bpkx24.Size = new System.Drawing.Size(42, 32); + this.bpkx24.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx24.TabIndex = 53; + this.bpkx24.TabStop = false; + this.bpkx24.Click += new System.EventHandler(this.slotModifier_Click); + // + // bpkx23 + // + this.bpkx23.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx23.Location = new System.Drawing.Point(166, 95); + this.bpkx23.Name = "bpkx23"; + this.bpkx23.Size = new System.Drawing.Size(42, 32); + this.bpkx23.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx23.TabIndex = 52; + this.bpkx23.TabStop = false; + this.bpkx23.Click += new System.EventHandler(this.slotModifier_Click); + // + // bpkx22 + // + this.bpkx22.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx22.Location = new System.Drawing.Point(125, 95); + this.bpkx22.Name = "bpkx22"; + this.bpkx22.Size = new System.Drawing.Size(42, 32); + this.bpkx22.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx22.TabIndex = 51; + this.bpkx22.TabStop = false; + this.bpkx22.Click += new System.EventHandler(this.slotModifier_Click); + // + // bpkx21 + // + this.bpkx21.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx21.Location = new System.Drawing.Point(84, 95); + this.bpkx21.Name = "bpkx21"; + this.bpkx21.Size = new System.Drawing.Size(42, 32); + this.bpkx21.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx21.TabIndex = 50; + this.bpkx21.TabStop = false; + this.bpkx21.Click += new System.EventHandler(this.slotModifier_Click); + // + // bpkx20 + // + this.bpkx20.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx20.Location = new System.Drawing.Point(43, 95); + this.bpkx20.Name = "bpkx20"; + this.bpkx20.Size = new System.Drawing.Size(42, 32); + this.bpkx20.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx20.TabIndex = 49; + this.bpkx20.TabStop = false; + this.bpkx20.Click += new System.EventHandler(this.slotModifier_Click); + // + // bpkx19 + // + this.bpkx19.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx19.Location = new System.Drawing.Point(2, 95); + this.bpkx19.Name = "bpkx19"; + this.bpkx19.Size = new System.Drawing.Size(42, 32); + this.bpkx19.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx19.TabIndex = 48; + this.bpkx19.TabStop = false; + this.bpkx19.Click += new System.EventHandler(this.slotModifier_Click); + // + // bpkx18 + // + this.bpkx18.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx18.Location = new System.Drawing.Point(207, 64); + this.bpkx18.Name = "bpkx18"; + this.bpkx18.Size = new System.Drawing.Size(42, 32); + this.bpkx18.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx18.TabIndex = 47; + this.bpkx18.TabStop = false; + this.bpkx18.Click += new System.EventHandler(this.slotModifier_Click); + // + // bpkx17 + // + this.bpkx17.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx17.Location = new System.Drawing.Point(166, 64); + this.bpkx17.Name = "bpkx17"; + this.bpkx17.Size = new System.Drawing.Size(42, 32); + this.bpkx17.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx17.TabIndex = 46; + this.bpkx17.TabStop = false; + this.bpkx17.Click += new System.EventHandler(this.slotModifier_Click); + // + // bpkx16 + // + this.bpkx16.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx16.Location = new System.Drawing.Point(125, 64); + this.bpkx16.Name = "bpkx16"; + this.bpkx16.Size = new System.Drawing.Size(42, 32); + this.bpkx16.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx16.TabIndex = 45; + this.bpkx16.TabStop = false; + this.bpkx16.Click += new System.EventHandler(this.slotModifier_Click); + // + // bpkx15 + // + this.bpkx15.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx15.Location = new System.Drawing.Point(84, 64); + this.bpkx15.Name = "bpkx15"; + this.bpkx15.Size = new System.Drawing.Size(42, 32); + this.bpkx15.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx15.TabIndex = 44; + this.bpkx15.TabStop = false; + this.bpkx15.Click += new System.EventHandler(this.slotModifier_Click); + // + // bpkx14 + // + this.bpkx14.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx14.Location = new System.Drawing.Point(43, 64); + this.bpkx14.Name = "bpkx14"; + this.bpkx14.Size = new System.Drawing.Size(42, 32); + this.bpkx14.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx14.TabIndex = 43; + this.bpkx14.TabStop = false; + this.bpkx14.Click += new System.EventHandler(this.slotModifier_Click); + // + // bpkx13 + // + this.bpkx13.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx13.Location = new System.Drawing.Point(2, 64); + this.bpkx13.Name = "bpkx13"; + this.bpkx13.Size = new System.Drawing.Size(42, 32); + this.bpkx13.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx13.TabIndex = 42; + this.bpkx13.TabStop = false; + this.bpkx13.Click += new System.EventHandler(this.slotModifier_Click); + // + // bpkx12 + // + this.bpkx12.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx12.Location = new System.Drawing.Point(207, 33); + this.bpkx12.Name = "bpkx12"; + this.bpkx12.Size = new System.Drawing.Size(42, 32); + this.bpkx12.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx12.TabIndex = 41; + this.bpkx12.TabStop = false; + this.bpkx12.Click += new System.EventHandler(this.slotModifier_Click); + // + // bpkx11 + // + this.bpkx11.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx11.Location = new System.Drawing.Point(166, 33); + this.bpkx11.Name = "bpkx11"; + this.bpkx11.Size = new System.Drawing.Size(42, 32); + this.bpkx11.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx11.TabIndex = 40; + this.bpkx11.TabStop = false; + this.bpkx11.Click += new System.EventHandler(this.slotModifier_Click); + // + // bpkx10 + // + this.bpkx10.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx10.Location = new System.Drawing.Point(125, 33); + this.bpkx10.Name = "bpkx10"; + this.bpkx10.Size = new System.Drawing.Size(42, 32); + this.bpkx10.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx10.TabIndex = 39; + this.bpkx10.TabStop = false; + this.bpkx10.Click += new System.EventHandler(this.slotModifier_Click); + // + // bpkx9 + // + this.bpkx9.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx9.Location = new System.Drawing.Point(84, 33); + this.bpkx9.Name = "bpkx9"; + this.bpkx9.Size = new System.Drawing.Size(42, 32); + this.bpkx9.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx9.TabIndex = 38; + this.bpkx9.TabStop = false; + this.bpkx9.Click += new System.EventHandler(this.slotModifier_Click); + // + // bpkx8 + // + this.bpkx8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx8.Location = new System.Drawing.Point(43, 33); + this.bpkx8.Name = "bpkx8"; + this.bpkx8.Size = new System.Drawing.Size(42, 32); + this.bpkx8.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx8.TabIndex = 37; + this.bpkx8.TabStop = false; + this.bpkx8.Click += new System.EventHandler(this.slotModifier_Click); + // + // bpkx7 + // + this.bpkx7.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx7.Location = new System.Drawing.Point(2, 33); + this.bpkx7.Name = "bpkx7"; + this.bpkx7.Size = new System.Drawing.Size(42, 32); + this.bpkx7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx7.TabIndex = 36; + this.bpkx7.TabStop = false; + this.bpkx7.Click += new System.EventHandler(this.slotModifier_Click); + // + // bpkx6 + // + this.bpkx6.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx6.Location = new System.Drawing.Point(207, 2); + this.bpkx6.Name = "bpkx6"; + this.bpkx6.Size = new System.Drawing.Size(42, 32); + this.bpkx6.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx6.TabIndex = 35; + this.bpkx6.TabStop = false; + this.bpkx6.Click += new System.EventHandler(this.slotModifier_Click); + // + // bpkx5 + // + this.bpkx5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx5.Location = new System.Drawing.Point(166, 2); + this.bpkx5.Name = "bpkx5"; + this.bpkx5.Size = new System.Drawing.Size(42, 32); + this.bpkx5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx5.TabIndex = 34; + this.bpkx5.TabStop = false; + this.bpkx5.Click += new System.EventHandler(this.slotModifier_Click); + // + // bpkx4 + // + this.bpkx4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx4.Location = new System.Drawing.Point(125, 2); + this.bpkx4.Name = "bpkx4"; + this.bpkx4.Size = new System.Drawing.Size(42, 32); + this.bpkx4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx4.TabIndex = 33; + this.bpkx4.TabStop = false; + this.bpkx4.Click += new System.EventHandler(this.slotModifier_Click); + // + // bpkx3 + // + this.bpkx3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx3.Location = new System.Drawing.Point(84, 2); + this.bpkx3.Name = "bpkx3"; + this.bpkx3.Size = new System.Drawing.Size(42, 32); + this.bpkx3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx3.TabIndex = 32; + this.bpkx3.TabStop = false; + this.bpkx3.Click += new System.EventHandler(this.slotModifier_Click); + // + // bpkx2 + // + this.bpkx2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx2.Location = new System.Drawing.Point(43, 2); + this.bpkx2.Name = "bpkx2"; + this.bpkx2.Size = new System.Drawing.Size(42, 32); + this.bpkx2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx2.TabIndex = 31; + this.bpkx2.TabStop = false; + this.bpkx2.Click += new System.EventHandler(this.slotModifier_Click); + // + // bpkx1 + // + this.bpkx1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.bpkx1.Location = new System.Drawing.Point(2, 2); + this.bpkx1.Name = "bpkx1"; + this.bpkx1.Size = new System.Drawing.Size(42, 32); + this.bpkx1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bpkx1.TabIndex = 30; + this.bpkx1.TabStop = false; + this.bpkx1.Click += new System.EventHandler(this.slotModifier_Click); + // // B_BoxRight // this.B_BoxRight.FlatStyle = System.Windows.Forms.FlatStyle.System; @@ -2729,336 +3068,6 @@ this.B_BoxLeft.UseVisualStyleBackColor = true; this.B_BoxLeft.Click += new System.EventHandler(this.B_BoxLeft_Click); // - // bpkx30 - // - this.bpkx30.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx30.Location = new System.Drawing.Point(233, 163); - this.bpkx30.Name = "bpkx30"; - this.bpkx30.Size = new System.Drawing.Size(42, 32); - this.bpkx30.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.bpkx30.TabIndex = 59; - this.bpkx30.TabStop = false; - this.bpkx30.Click += new System.EventHandler(this.slotModifier_Click); - // - // bpkx29 - // - this.bpkx29.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx29.Location = new System.Drawing.Point(192, 163); - this.bpkx29.Name = "bpkx29"; - this.bpkx29.Size = new System.Drawing.Size(42, 32); - this.bpkx29.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.bpkx29.TabIndex = 58; - this.bpkx29.TabStop = false; - this.bpkx29.Click += new System.EventHandler(this.slotModifier_Click); - // - // bpkx28 - // - this.bpkx28.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx28.Location = new System.Drawing.Point(151, 163); - this.bpkx28.Name = "bpkx28"; - this.bpkx28.Size = new System.Drawing.Size(42, 32); - this.bpkx28.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.bpkx28.TabIndex = 57; - this.bpkx28.TabStop = false; - this.bpkx28.Click += new System.EventHandler(this.slotModifier_Click); - // - // bpkx27 - // - this.bpkx27.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx27.Location = new System.Drawing.Point(110, 163); - this.bpkx27.Name = "bpkx27"; - this.bpkx27.Size = new System.Drawing.Size(42, 32); - this.bpkx27.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.bpkx27.TabIndex = 56; - this.bpkx27.TabStop = false; - this.bpkx27.Click += new System.EventHandler(this.slotModifier_Click); - // - // bpkx26 - // - this.bpkx26.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx26.Location = new System.Drawing.Point(69, 163); - this.bpkx26.Name = "bpkx26"; - this.bpkx26.Size = new System.Drawing.Size(42, 32); - this.bpkx26.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.bpkx26.TabIndex = 55; - this.bpkx26.TabStop = false; - this.bpkx26.Click += new System.EventHandler(this.slotModifier_Click); - // - // bpkx25 - // - this.bpkx25.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx25.Location = new System.Drawing.Point(28, 163); - this.bpkx25.Name = "bpkx25"; - this.bpkx25.Size = new System.Drawing.Size(42, 32); - this.bpkx25.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.bpkx25.TabIndex = 54; - this.bpkx25.TabStop = false; - this.bpkx25.Click += new System.EventHandler(this.slotModifier_Click); - // - // bpkx24 - // - this.bpkx24.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx24.Location = new System.Drawing.Point(233, 132); - this.bpkx24.Name = "bpkx24"; - this.bpkx24.Size = new System.Drawing.Size(42, 32); - this.bpkx24.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.bpkx24.TabIndex = 53; - this.bpkx24.TabStop = false; - this.bpkx24.Click += new System.EventHandler(this.slotModifier_Click); - // - // bpkx23 - // - this.bpkx23.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx23.Location = new System.Drawing.Point(192, 132); - this.bpkx23.Name = "bpkx23"; - this.bpkx23.Size = new System.Drawing.Size(42, 32); - this.bpkx23.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.bpkx23.TabIndex = 52; - this.bpkx23.TabStop = false; - this.bpkx23.Click += new System.EventHandler(this.slotModifier_Click); - // - // bpkx22 - // - this.bpkx22.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx22.Location = new System.Drawing.Point(151, 132); - this.bpkx22.Name = "bpkx22"; - this.bpkx22.Size = new System.Drawing.Size(42, 32); - this.bpkx22.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.bpkx22.TabIndex = 51; - this.bpkx22.TabStop = false; - this.bpkx22.Click += new System.EventHandler(this.slotModifier_Click); - // - // bpkx21 - // - this.bpkx21.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx21.Location = new System.Drawing.Point(110, 132); - this.bpkx21.Name = "bpkx21"; - this.bpkx21.Size = new System.Drawing.Size(42, 32); - this.bpkx21.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.bpkx21.TabIndex = 50; - this.bpkx21.TabStop = false; - this.bpkx21.Click += new System.EventHandler(this.slotModifier_Click); - // - // bpkx20 - // - this.bpkx20.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx20.Location = new System.Drawing.Point(69, 132); - this.bpkx20.Name = "bpkx20"; - this.bpkx20.Size = new System.Drawing.Size(42, 32); - this.bpkx20.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.bpkx20.TabIndex = 49; - this.bpkx20.TabStop = false; - this.bpkx20.Click += new System.EventHandler(this.slotModifier_Click); - // - // bpkx19 - // - this.bpkx19.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx19.Location = new System.Drawing.Point(28, 132); - this.bpkx19.Name = "bpkx19"; - this.bpkx19.Size = new System.Drawing.Size(42, 32); - this.bpkx19.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.bpkx19.TabIndex = 48; - this.bpkx19.TabStop = false; - this.bpkx19.Click += new System.EventHandler(this.slotModifier_Click); - // - // bpkx18 - // - this.bpkx18.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx18.Location = new System.Drawing.Point(233, 101); - this.bpkx18.Name = "bpkx18"; - this.bpkx18.Size = new System.Drawing.Size(42, 32); - this.bpkx18.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.bpkx18.TabIndex = 47; - this.bpkx18.TabStop = false; - this.bpkx18.Click += new System.EventHandler(this.slotModifier_Click); - // - // bpkx17 - // - this.bpkx17.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx17.Location = new System.Drawing.Point(192, 101); - this.bpkx17.Name = "bpkx17"; - this.bpkx17.Size = new System.Drawing.Size(42, 32); - this.bpkx17.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.bpkx17.TabIndex = 46; - this.bpkx17.TabStop = false; - this.bpkx17.Click += new System.EventHandler(this.slotModifier_Click); - // - // bpkx16 - // - this.bpkx16.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx16.Location = new System.Drawing.Point(151, 101); - this.bpkx16.Name = "bpkx16"; - this.bpkx16.Size = new System.Drawing.Size(42, 32); - this.bpkx16.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.bpkx16.TabIndex = 45; - this.bpkx16.TabStop = false; - this.bpkx16.Click += new System.EventHandler(this.slotModifier_Click); - // - // bpkx15 - // - this.bpkx15.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx15.Location = new System.Drawing.Point(110, 101); - this.bpkx15.Name = "bpkx15"; - this.bpkx15.Size = new System.Drawing.Size(42, 32); - this.bpkx15.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.bpkx15.TabIndex = 44; - this.bpkx15.TabStop = false; - this.bpkx15.Click += new System.EventHandler(this.slotModifier_Click); - // - // bpkx14 - // - this.bpkx14.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx14.Location = new System.Drawing.Point(69, 101); - this.bpkx14.Name = "bpkx14"; - this.bpkx14.Size = new System.Drawing.Size(42, 32); - this.bpkx14.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.bpkx14.TabIndex = 43; - this.bpkx14.TabStop = false; - this.bpkx14.Click += new System.EventHandler(this.slotModifier_Click); - // - // bpkx13 - // - this.bpkx13.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx13.Location = new System.Drawing.Point(28, 101); - this.bpkx13.Name = "bpkx13"; - this.bpkx13.Size = new System.Drawing.Size(42, 32); - this.bpkx13.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.bpkx13.TabIndex = 42; - this.bpkx13.TabStop = false; - this.bpkx13.Click += new System.EventHandler(this.slotModifier_Click); - // - // bpkx12 - // - this.bpkx12.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx12.Location = new System.Drawing.Point(233, 70); - this.bpkx12.Name = "bpkx12"; - this.bpkx12.Size = new System.Drawing.Size(42, 32); - this.bpkx12.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.bpkx12.TabIndex = 41; - this.bpkx12.TabStop = false; - this.bpkx12.Click += new System.EventHandler(this.slotModifier_Click); - // - // bpkx11 - // - this.bpkx11.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx11.Location = new System.Drawing.Point(192, 70); - this.bpkx11.Name = "bpkx11"; - this.bpkx11.Size = new System.Drawing.Size(42, 32); - this.bpkx11.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.bpkx11.TabIndex = 40; - this.bpkx11.TabStop = false; - this.bpkx11.Click += new System.EventHandler(this.slotModifier_Click); - // - // bpkx10 - // - this.bpkx10.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx10.Location = new System.Drawing.Point(151, 70); - this.bpkx10.Name = "bpkx10"; - this.bpkx10.Size = new System.Drawing.Size(42, 32); - this.bpkx10.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.bpkx10.TabIndex = 39; - this.bpkx10.TabStop = false; - this.bpkx10.Click += new System.EventHandler(this.slotModifier_Click); - // - // bpkx9 - // - this.bpkx9.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx9.Location = new System.Drawing.Point(110, 70); - this.bpkx9.Name = "bpkx9"; - this.bpkx9.Size = new System.Drawing.Size(42, 32); - this.bpkx9.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.bpkx9.TabIndex = 38; - this.bpkx9.TabStop = false; - this.bpkx9.Click += new System.EventHandler(this.slotModifier_Click); - // - // bpkx8 - // - this.bpkx8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx8.Location = new System.Drawing.Point(69, 70); - this.bpkx8.Name = "bpkx8"; - this.bpkx8.Size = new System.Drawing.Size(42, 32); - this.bpkx8.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.bpkx8.TabIndex = 37; - this.bpkx8.TabStop = false; - this.bpkx8.Click += new System.EventHandler(this.slotModifier_Click); - // - // bpkx7 - // - this.bpkx7.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx7.Location = new System.Drawing.Point(28, 70); - this.bpkx7.Name = "bpkx7"; - this.bpkx7.Size = new System.Drawing.Size(42, 32); - this.bpkx7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.bpkx7.TabIndex = 36; - this.bpkx7.TabStop = false; - this.bpkx7.Click += new System.EventHandler(this.slotModifier_Click); - // - // bpkx6 - // - this.bpkx6.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx6.Location = new System.Drawing.Point(233, 39); - this.bpkx6.Name = "bpkx6"; - this.bpkx6.Size = new System.Drawing.Size(42, 32); - this.bpkx6.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.bpkx6.TabIndex = 35; - this.bpkx6.TabStop = false; - this.bpkx6.Click += new System.EventHandler(this.slotModifier_Click); - // - // bpkx5 - // - this.bpkx5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx5.Location = new System.Drawing.Point(192, 39); - this.bpkx5.Name = "bpkx5"; - this.bpkx5.Size = new System.Drawing.Size(42, 32); - this.bpkx5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.bpkx5.TabIndex = 34; - this.bpkx5.TabStop = false; - this.bpkx5.Click += new System.EventHandler(this.slotModifier_Click); - // - // bpkx4 - // - this.bpkx4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx4.Location = new System.Drawing.Point(151, 39); - this.bpkx4.Name = "bpkx4"; - this.bpkx4.Size = new System.Drawing.Size(42, 32); - this.bpkx4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.bpkx4.TabIndex = 33; - this.bpkx4.TabStop = false; - this.bpkx4.Click += new System.EventHandler(this.slotModifier_Click); - // - // bpkx3 - // - this.bpkx3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx3.Location = new System.Drawing.Point(110, 39); - this.bpkx3.Name = "bpkx3"; - this.bpkx3.Size = new System.Drawing.Size(42, 32); - this.bpkx3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.bpkx3.TabIndex = 32; - this.bpkx3.TabStop = false; - this.bpkx3.Click += new System.EventHandler(this.slotModifier_Click); - // - // bpkx2 - // - this.bpkx2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx2.Location = new System.Drawing.Point(69, 39); - this.bpkx2.Name = "bpkx2"; - this.bpkx2.Size = new System.Drawing.Size(42, 32); - this.bpkx2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.bpkx2.TabIndex = 31; - this.bpkx2.TabStop = false; - this.bpkx2.Click += new System.EventHandler(this.slotModifier_Click); - // - // bpkx1 - // - this.bpkx1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.bpkx1.Location = new System.Drawing.Point(28, 39); - this.bpkx1.Name = "bpkx1"; - this.bpkx1.Size = new System.Drawing.Size(42, 32); - this.bpkx1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.bpkx1.TabIndex = 30; - this.bpkx1.TabStop = false; - this.bpkx1.Click += new System.EventHandler(this.slotModifier_Click); - // // C_BoxSelect // this.C_BoxSelect.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; @@ -3103,11 +3112,11 @@ // // Tab_PartyBattle // - this.Tab_PartyBattle.Controls.Add(this.panel2); + this.Tab_PartyBattle.Controls.Add(this.PAN_BattleBox); this.Tab_PartyBattle.Controls.Add(this.L_ReadOnlyPBB); this.Tab_PartyBattle.Controls.Add(this.L_BattleBox); this.Tab_PartyBattle.Controls.Add(this.L_Party); - this.Tab_PartyBattle.Controls.Add(this.panel1); + this.Tab_PartyBattle.Controls.Add(this.PAN_Party); this.Tab_PartyBattle.Location = new System.Drawing.Point(4, 22); this.Tab_PartyBattle.Name = "Tab_PartyBattle"; this.Tab_PartyBattle.Padding = new System.Windows.Forms.Padding(3); @@ -3116,19 +3125,19 @@ this.Tab_PartyBattle.Text = "Party-Battle Box"; this.Tab_PartyBattle.UseVisualStyleBackColor = true; // - // panel2 + // PAN_BattleBox // - this.panel2.BackgroundImage = global::PKHeX.Properties.Resources.party; - this.panel2.Controls.Add(this.bbpkx1); - this.panel2.Controls.Add(this.bbpkx2); - this.panel2.Controls.Add(this.bbpkx3); - this.panel2.Controls.Add(this.bbpkx4); - this.panel2.Controls.Add(this.bbpkx5); - this.panel2.Controls.Add(this.bbpkx6); - this.panel2.Location = new System.Drawing.Point(168, 28); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(111, 160); - this.panel2.TabIndex = 17; + this.PAN_BattleBox.BackgroundImage = global::PKHeX.Properties.Resources.party; + this.PAN_BattleBox.Controls.Add(this.bbpkx1); + this.PAN_BattleBox.Controls.Add(this.bbpkx2); + this.PAN_BattleBox.Controls.Add(this.bbpkx3); + this.PAN_BattleBox.Controls.Add(this.bbpkx4); + this.PAN_BattleBox.Controls.Add(this.bbpkx5); + this.PAN_BattleBox.Controls.Add(this.bbpkx6); + this.PAN_BattleBox.Location = new System.Drawing.Point(168, 28); + this.PAN_BattleBox.Name = "PAN_BattleBox"; + this.PAN_BattleBox.Size = new System.Drawing.Size(111, 160); + this.PAN_BattleBox.TabIndex = 17; // // bbpkx1 // @@ -3218,19 +3227,19 @@ this.L_Party.TabIndex = 0; this.L_Party.Text = "Party:"; // - // panel1 + // PAN_Party // - this.panel1.BackgroundImage = global::PKHeX.Properties.Resources.party; - this.panel1.Controls.Add(this.ppkx1); - this.panel1.Controls.Add(this.ppkx2); - this.panel1.Controls.Add(this.ppkx3); - this.panel1.Controls.Add(this.ppkx4); - this.panel1.Controls.Add(this.ppkx5); - this.panel1.Controls.Add(this.ppkx6); - this.panel1.Location = new System.Drawing.Point(24, 28); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(111, 160); - this.panel1.TabIndex = 16; + this.PAN_Party.BackgroundImage = global::PKHeX.Properties.Resources.party; + this.PAN_Party.Controls.Add(this.ppkx1); + this.PAN_Party.Controls.Add(this.ppkx2); + this.PAN_Party.Controls.Add(this.ppkx3); + this.PAN_Party.Controls.Add(this.ppkx4); + this.PAN_Party.Controls.Add(this.ppkx5); + this.PAN_Party.Controls.Add(this.ppkx6); + this.PAN_Party.Location = new System.Drawing.Point(24, 28); + this.PAN_Party.Name = "PAN_Party"; + this.PAN_Party.Size = new System.Drawing.Size(111, 160); + this.PAN_Party.TabIndex = 16; // // ppkx1 // @@ -3876,7 +3885,7 @@ this.menuStrip1.PerformLayout(); this.tabBoxMulti.ResumeLayout(false); this.Tab_Box.ResumeLayout(false); - this.Tab_Box.PerformLayout(); + this.PAN_Box.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.bpkx30)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bpkx29)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bpkx28)).EndInit(); @@ -3909,16 +3918,16 @@ ((System.ComponentModel.ISupportInitialize)(this.bpkx1)).EndInit(); this.Tab_PartyBattle.ResumeLayout(false); this.Tab_PartyBattle.PerformLayout(); - this.panel2.ResumeLayout(false); - this.panel2.PerformLayout(); + this.PAN_BattleBox.ResumeLayout(false); + this.PAN_BattleBox.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.bbpkx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bbpkx2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bbpkx3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bbpkx4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bbpkx5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bbpkx6)).EndInit(); - this.panel1.ResumeLayout(false); - this.panel1.PerformLayout(); + this.PAN_Party.ResumeLayout(false); + this.PAN_Party.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.ppkx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.ppkx2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.ppkx3)).EndInit(); @@ -4243,10 +4252,11 @@ private System.Windows.Forms.TextBox TB_PP1; private System.Windows.Forms.ToolStripMenuItem codeGeneratorToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem reportToolStripMenuItem; - private System.Windows.Forms.Panel panel1; - private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.Panel PAN_Party; + private System.Windows.Forms.Panel PAN_BattleBox; private System.Windows.Forms.Button B_OpenSuperTraining; private System.Windows.Forms.Button B_OutAHK; + private System.Windows.Forms.Panel PAN_Box; } } diff --git a/PKX/f1-Main.cs b/PKX/f1-Main.cs index 7ee9291b1..acefa872d 100644 --- a/PKX/f1-Main.cs +++ b/PKX/f1-Main.cs @@ -175,7 +175,7 @@ namespace PKHeX public int savindex; public bool savedited; public int colorizedbox = 32; - public Color colorizedcolor = Color.Transparent; + public Image colorizedcolor = null; public Color defaultwhite = Color.White; public int colorizedslot = 0; public int largeWidth, shortWidth = 0; @@ -4931,10 +4931,6 @@ namespace PKHeX ivt[i].BackColor = Color.Red; exitfunction = true; } - //else if (iva[i] == 31) - // ivt[i].BackColor = Color.Honeydew; - //else if (iva[i] == 0) - // ivt[i].BackColor = Color.LavenderBlush; else ivt[i].BackColor = Color.White; } if (exitfunction) return; @@ -7537,7 +7533,7 @@ namespace PKHeX } } // Visual to display what slot is currently loaded. - getSlotColor(slot, Color.PowderBlue); + getSlotColor(slot, Properties.Resources.slotView); } else System.Media.SystemSounds.Exclamation.Play(); @@ -7566,7 +7562,7 @@ namespace PKHeX getPKXBoxes(); savedited = true; - getSlotColor(slot, Color.Honeydew); + getSlotColor(slot, Properties.Resources.slotSet); } private void fixparty() { @@ -7619,7 +7615,7 @@ namespace PKHeX getPKXBoxes(); savedited = true; - getSlotColor(slot, Color.LavenderBlush); + getSlotColor(slot, Properties.Resources.slotDel); } private void slotModifier_Click(object sender, EventArgs e) { @@ -7680,7 +7676,7 @@ namespace PKHeX } } - getSlotColor(slot, Color.PowderBlue); + getSlotColor(slot, Properties.Resources.slotView); } } return; @@ -7696,7 +7692,7 @@ namespace PKHeX Array.Copy(ekxdata, 0, savefile, offset, 0xE8); getPKXBoxes(); savedited = true; - getSlotColor(slot, Color.Honeydew); + getSlotColor(slot, Properties.Resources.slotSet); } } } @@ -7771,6 +7767,10 @@ namespace PKHeX { int boxoffset = 0x27A00 + 0x7F000 * savindex + C_BoxSelect.SelectedIndex * (0xE8 * 30); + int boxbgofst = (0x7F000 * savindex) + 0x9C1E + C_BoxSelect.SelectedIndex; + int boxbgval = 1 + savefile[boxbgofst]; + PAN_Box.BackgroundImage = (Image)Properties.Resources.ResourceManager.GetObject("box_wp" + boxbgval.ToString("00")); + PictureBox[] pba = { bpkx1, bpkx2, bpkx3, bpkx4, bpkx5, bpkx6, bpkx7, bpkx8, bpkx9, bpkx10,bpkx11,bpkx12, @@ -7851,11 +7851,11 @@ namespace PKHeX { if (colorizedbox == C_BoxSelect.SelectedIndex) { - pba[colorizedslot].BackColor = colorizedcolor; + pba[colorizedslot].BackgroundImage = colorizedcolor; } else { - pba[colorizedslot].BackColor = Color.Transparent; + pba[colorizedslot].BackgroundImage = null; // Properties.Resources.slotTrans; } } } @@ -7957,7 +7957,7 @@ namespace PKHeX if (species != 0 && (((XOR < 8) && (gamevers < 24)) || ((XOR < 16) && (gamevers >= 24)))) { // Is Shiny // Redraw our image - baseImage = PKHeX.Util.layerImage(baseImage, Properties.Resources.rare_icon, 0, 0, 0.33); + baseImage = PKHeX.Util.layerImage(baseImage, Properties.Resources.rare_icon, 0, 0, 0.7); } if (species != 0 && BitConverter.ToUInt16(dslotdata, 0xA) > 0) { @@ -7968,7 +7968,7 @@ namespace PKHeX pb.Image = baseImage; } - private void getSlotColor(int slot, Color color) + private void getSlotColor(int slot, Image color) { PictureBox[] pba = { bpkx1, bpkx2, bpkx3, bpkx4, bpkx5, bpkx6, @@ -7984,13 +7984,13 @@ namespace PKHeX }; for (int i = 0; i < pba.Length; i++) { - pba[i].BackColor = Color.Transparent; + pba[i].BackgroundImage = null; } if (slot < 32) { colorizedbox = C_BoxSelect.SelectedIndex; } - pba[slot].BackColor = color; + pba[slot].BackgroundImage = color; colorizedcolor = color; colorizedslot = slot; } @@ -8216,6 +8216,8 @@ namespace PKHeX // Open Box Layout Menu PKHeX.SAV_BoxLayout sb21 = new PKHeX.SAV_BoxLayout(this); sb21.ShowDialog(); + getBoxNames(); + getPKXBoxes(); } private void B_OpenTrainerInfo_Click(object sender, EventArgs e) { @@ -8389,9 +8391,7 @@ namespace PKHeX // Allow Import/Export of Boxes PKHeX.SAV_BoxIO boxio = new PKHeX.SAV_BoxIO(this, SaveGame.Box, SaveGame.PCLayout); boxio.ShowDialog(); - } - - + } #endregion // Language Translation diff --git a/PKX/f1-Main.resx b/PKX/f1-Main.resx index 23859fc31..93f02e28d 100644 --- a/PKX/f1-Main.resx +++ b/PKX/f1-Main.resx @@ -474,100 +474,10 @@ True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - True - + True @@ -597,7 +507,7 @@ True - + True diff --git a/PKX/f4-RibbMedal.Designer.cs b/PKX/f4-RibbMedal.Designer.cs index b9e274eca..a14355e0c 100644 --- a/PKX/f4-RibbMedal.Designer.cs +++ b/PKX/f4-RibbMedal.Designer.cs @@ -246,6 +246,10 @@ this.Hoenn1b_5 = new System.Windows.Forms.CheckBox(); this.Hoenn1b_6 = new System.Windows.Forms.CheckBox(); this.Hoenn1b_7 = new System.Windows.Forms.CheckBox(); + this.L_Hits = new System.Windows.Forms.Label(); + this.numericUpDown1 = new System.Windows.Forms.NumericUpDown(); + this.label1 = new System.Windows.Forms.Label(); + this.comboBox1 = new System.Windows.Forms.ComboBox(); this.Tab_Medals.SuspendLayout(); this.GB_Medals1.SuspendLayout(); this.GB_Medals2.SuspendLayout(); @@ -295,6 +299,7 @@ ((System.ComponentModel.ISupportInitialize)(this.PB_11)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.PB_10)).BeginInit(); this.tabControl1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit(); this.SuspendLayout(); // // BTN_Save @@ -363,6 +368,10 @@ // // GB_Medals1 // + this.GB_Medals1.Controls.Add(this.comboBox1); + this.GB_Medals1.Controls.Add(this.label1); + this.GB_Medals1.Controls.Add(this.numericUpDown1); + this.GB_Medals1.Controls.Add(this.L_Hits); this.GB_Medals1.Controls.Add(this.L_SuperTraining); this.GB_Medals1.Controls.Add(this.L_Rank3); this.GB_Medals1.Controls.Add(this.L_Rank2); @@ -2688,6 +2697,51 @@ this.Hoenn1b_7.Text = "Smart Master"; this.Hoenn1b_7.UseVisualStyleBackColor = true; // + // L_Hits + // + this.L_Hits.Location = new System.Drawing.Point(-1, 190); + this.L_Hits.Name = "L_Hits"; + this.L_Hits.Size = new System.Drawing.Size(100, 13); + this.L_Hits.TabIndex = 20; + this.L_Hits.Text = "Hits Remaining:"; + this.L_Hits.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // numericUpDown1 + // + this.numericUpDown1.Location = new System.Drawing.Point(105, 187); + this.numericUpDown1.Maximum = new decimal(new int[] { + 255, + 0, + 0, + 0}); + this.numericUpDown1.Name = "numericUpDown1"; + this.numericUpDown1.Size = new System.Drawing.Size(50, 20); + this.numericUpDown1.TabIndex = 21; + this.numericUpDown1.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; + this.numericUpDown1.Value = new decimal(new int[] { + 255, + 0, + 0, + 0}); + // + // label1 + // + this.label1.Location = new System.Drawing.Point(-1, 169); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(100, 13); + this.label1.TabIndex = 22; + this.label1.Text = "Last Used Bag:"; + this.label1.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // comboBox1 + // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBox1.FormattingEnabled = true; + this.comboBox1.Location = new System.Drawing.Point(105, 166); + this.comboBox1.Name = "comboBox1"; + this.comboBox1.Size = new System.Drawing.Size(110, 21); + this.comboBox1.TabIndex = 23; + // // RibbMedal // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -2761,6 +2815,7 @@ ((System.ComponentModel.ISupportInitialize)(this.PB_11)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.PB_10)).EndInit(); this.tabControl1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit(); this.ResumeLayout(false); } @@ -2984,5 +3039,9 @@ private System.Windows.Forms.PictureBox PB_53; private System.Windows.Forms.PictureBox PB_52; private System.Windows.Forms.PictureBox PB_51; + private System.Windows.Forms.ComboBox comboBox1; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.NumericUpDown numericUpDown1; + private System.Windows.Forms.Label L_Hits; } } \ No newline at end of file diff --git a/PKX/f4-RibbMedal.cs b/PKX/f4-RibbMedal.cs index 0241aa5ac..4db0474b7 100644 --- a/PKX/f4-RibbMedal.cs +++ b/PKX/f4-RibbMedal.cs @@ -21,6 +21,15 @@ namespace PKHeX InitializeComponent(); m_parent = frm1; TranslateInterface("RibbonMedal"); + + // Set up Training Bag Data + comboBox1.Items.Clear(); + comboBox1.Items.Add("---"); + for (int i = 1; i < m_parent.trainingbags.Length-1; i++) + comboBox1.Items.Add(m_parent.trainingbags[i]); + comboBox1.SelectedIndex = m_parent.buff[0x17]; + numericUpDown1.Value = m_parent.buff[0x16]; + getRibbons(); } public void TranslateInterface(string FORM_NAME) @@ -457,6 +466,8 @@ namespace PKHeX private void BTN_Save_Click(object sender, EventArgs e) { + m_parent.buff[0x17] = (byte)comboBox1.SelectedIndex; + m_parent.buff[0x16] = (byte)numericUpDown1.Value; setRibbons(); Close(); } // Save Button diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index f6bd081c0..1b0253cf3 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -6787,6 +6787,174 @@ namespace PKHeX.Properties { } } + internal static System.Drawing.Bitmap box_wp01 { + get { + object obj = ResourceManager.GetObject("box_wp01", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap box_wp02 { + get { + object obj = ResourceManager.GetObject("box_wp02", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap box_wp03 { + get { + object obj = ResourceManager.GetObject("box_wp03", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap box_wp04 { + get { + object obj = ResourceManager.GetObject("box_wp04", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap box_wp05 { + get { + object obj = ResourceManager.GetObject("box_wp05", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap box_wp06 { + get { + object obj = ResourceManager.GetObject("box_wp06", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap box_wp07 { + get { + object obj = ResourceManager.GetObject("box_wp07", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap box_wp08 { + get { + object obj = ResourceManager.GetObject("box_wp08", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap box_wp09 { + get { + object obj = ResourceManager.GetObject("box_wp09", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap box_wp10 { + get { + object obj = ResourceManager.GetObject("box_wp10", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap box_wp11 { + get { + object obj = ResourceManager.GetObject("box_wp11", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap box_wp12 { + get { + object obj = ResourceManager.GetObject("box_wp12", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap box_wp13 { + get { + object obj = ResourceManager.GetObject("box_wp13", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap box_wp14 { + get { + object obj = ResourceManager.GetObject("box_wp14", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap box_wp15 { + get { + object obj = ResourceManager.GetObject("box_wp15", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap box_wp16 { + get { + object obj = ResourceManager.GetObject("box_wp16", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap box_wp17 { + get { + object obj = ResourceManager.GetObject("box_wp17", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap box_wp18 { + get { + object obj = ResourceManager.GetObject("box_wp18", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap box_wp19 { + get { + object obj = ResourceManager.GetObject("box_wp19", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap box_wp20 { + get { + object obj = ResourceManager.GetObject("box_wp20", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap box_wp21 { + get { + object obj = ResourceManager.GetObject("box_wp21", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap box_wp22 { + get { + object obj = ResourceManager.GetObject("box_wp22", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap box_wp23 { + get { + object obj = ResourceManager.GetObject("box_wp23", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap box_wp24 { + get { + object obj = ResourceManager.GetObject("box_wp24", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap careless { get { object obj = ResourceManager.GetObject("careless", resourceCulture); @@ -7207,6 +7375,34 @@ namespace PKHeX.Properties { } } + internal static System.Drawing.Bitmap slotDel { + get { + object obj = ResourceManager.GetObject("slotDel", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap slotSet { + get { + object obj = ResourceManager.GetObject("slotSet", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap slotTrans { + get { + object obj = ResourceManager.GetObject("slotTrans", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap slotView { + get { + object obj = ResourceManager.GetObject("slotView", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap smile { get { object obj = ResourceManager.GetObject("smile", resourceCulture); @@ -15549,9 +15745,9 @@ namespace PKHeX.Properties { } /// - /// Looks up a localized string similar to カロス\u3000チャンプリボン + /// Looks up a localized string similar to カロス チャンプリボン ///チャンプリボン - ///シンオウ\u3000チャンプリボン + ///シンオウ チャンプリボン ///なかよしリボン ///しゅぎょうリボン ///グレートバトルリボン @@ -15587,10 +15783,7 @@ namespace PKHeX.Properties { ///ナショナルチャンプリボン ///ワールドチャンプリボン ///おもいでコンテストリボン - ///おもいでバトルリボン - ///カロスで\u3000チャンピオンに\u3000かって\nでんどういり\u3000した\u3000きねんリボン - ///べつちほうの\u3000リーグで\u3000かちぬき\nでんどういり\u3000した\u3000きねんリボン - ///シンオウで\u3000チャンピオンに\u3000かって\nでんどう [rest of string was truncated]";. + ///おもいでバトルリボン. /// internal static string text_Ribbon_ja { get { @@ -15637,17 +15830,7 @@ namespace PKHeX.Properties { ///내셔널챔피언리본 ///월드챔피언리본 ///추억콘테스트리본 - ///추억배틀리본 - ///칼로스에서 챔피언에게 이겨서\n전당등록한 기념리본 - ///다른 지방의 리그에서 이겨서\n전당등록한 기념리본 - ///신오에서 챔피언에게 이겨서\n전당등록한 기념리본 - ///깊은 인연으로 맺어진\n포켓몬에게 수여되는 리본 - ///가혹한 시련을 뛰어넘은\n포켓몬에게 수여되는 리본 - ///혹독한 배틀을 이겨낸\n포켓몬에게 수여되는 리본 - ///배틀을 평정한 강한\n포켓몬에게 수여되는 리본 - ///많이 노력하고 있는\n포켓몬에게 수여되는 리본 - ///기분이 맑아지는 일을 떠올려서\n인생의 에너지가 되는 리본 - ///두근두근했던 [rest of string was truncated]";. + ///추억배틀리본. /// internal static string text_Ribbon_ko { get { @@ -16315,21 +16498,24 @@ namespace PKHeX.Properties { } /// - /// Looks up a localized string similar to Entraînez-vous contre Lépidonille\ue07f! - ///Tir Volonté sur Pérégrain\ue07f! - ///À l’assaut de Magnéti\ue07f! - ///À l’assaut de Wailmer\ue07f! - ///À l’assaut de Coupenotte\ue07f! - ///À l’assaut de Tentacool\ue07f! - ///À l’assaut de Sonistrelle\ue07f! - ///À l’assaut de Racaillou\ue07f! - ///Les tirs à tête chercheuse de Magnéton\ue07f! - ///La Cible Aubaine de Relicanth\ue07f! - ///Déchaînez-vous contre Incisache\ue07f! - ///Les Ballons Pixels de Tentacruel\ue07f! - ///Mitraillez Ptéra\ue07f! - ///Brisez la Barrière de Gravalanch\ue07f! - ///Débarrassez-vous de Magnézo [rest of string was truncated]";. + /// Looks up a localized string similar to Entraînez-vous contre Lépidonille! + ///Tir Volonté sur Pérégrain! + ///À l’assaut de Magnéti! + ///À l’assaut de Wailmer! + ///À l’assaut de Coupenotte! + ///À l’assaut de Tentacool! + ///À l’assaut de Sonistrelle! + ///À l’assaut de Racaillou! + ///Les tirs à tête chercheuse de Magnéton! + ///La Cible Aubaine de Relicanth! + ///Déchaînez-vous contre Incisache! + ///Les Ballons Pixels de Tentacruel! + ///Mitraillez Ptéra! + ///Brisez la Barrière de Gravalanch! + ///Débarrassez-vous de Magnézone! + ///Répliquez aux tirs de Wailord! + ///Évitez les tirs de Tranchodon! + ///Terrassez Kravarec [rest of string was truncated]";. /// internal static string text_SuperTraining_fr { get { @@ -16438,10 +16624,7 @@ namespace PKHeX.Properties { ///무쇠팔 강철팔의 협공! ///염동력! 스푼 난무 ///인생역전! 출세 잉어킹 - ///경이로운 연속 메가진화! - ///\x10\x02뷿& - ///\x10\x02뷿' - ///\x [rest of string was truncated]";. + ///경이로운 연속 메가진화!. /// internal static string text_SuperTraining_ko { get { diff --git a/Properties/Resources.resx b/Properties/Resources.resx index 4193b127f..4f69b30ea 100644 --- a/Properties/Resources.resx +++ b/Properties/Resources.resx @@ -3601,9 +3601,93 @@ ..\Resources\img\misc\party.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\img\box\box_wp01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\box\box_wp02.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\box\box_wp03.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\box\box_wp04.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\box\box_wp05.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\box\box_wp06.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\box\box_wp07.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\box\box_wp08.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\box\box_wp09.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\box\box_wp10.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\box\box_wp11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\box\box_wp12.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\box\box_wp13.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\box\box_wp14.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\box\box_wp15.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\box\box_wp16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\box\box_wp17.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\box\box_wp18.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\box\box_wp19.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\box\box_wp20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\box\box_wp21.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\box\box_wp22.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\box\box_wp23.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\box\box_wp24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\text\es\lang_es.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 + + ..\Resources\img\box\slotDel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\box\slotSet.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\box\slotTrans.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\box\slotView.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\text\de\text_ItemPouch_de.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 diff --git a/Resources/img/Pokemon Sprites/48.png b/Resources/img/Pokemon Sprites/48.png index 51a260be3..bfd70988e 100644 Binary files a/Resources/img/Pokemon Sprites/48.png and b/Resources/img/Pokemon Sprites/48.png differ diff --git a/Resources/img/box/box_wp01.png b/Resources/img/box/box_wp01.png new file mode 100644 index 000000000..7e6a0093d Binary files /dev/null and b/Resources/img/box/box_wp01.png differ diff --git a/Resources/img/box/box_wp02.png b/Resources/img/box/box_wp02.png new file mode 100644 index 000000000..46dc65324 Binary files /dev/null and b/Resources/img/box/box_wp02.png differ diff --git a/Resources/img/box/box_wp03.png b/Resources/img/box/box_wp03.png new file mode 100644 index 000000000..6663c7224 Binary files /dev/null and b/Resources/img/box/box_wp03.png differ diff --git a/Resources/img/box/box_wp04.png b/Resources/img/box/box_wp04.png new file mode 100644 index 000000000..79762573d Binary files /dev/null and b/Resources/img/box/box_wp04.png differ diff --git a/Resources/img/box/box_wp05.png b/Resources/img/box/box_wp05.png new file mode 100644 index 000000000..db836c42d Binary files /dev/null and b/Resources/img/box/box_wp05.png differ diff --git a/Resources/img/box/box_wp06.png b/Resources/img/box/box_wp06.png new file mode 100644 index 000000000..eac5d6233 Binary files /dev/null and b/Resources/img/box/box_wp06.png differ diff --git a/Resources/img/box/box_wp07.png b/Resources/img/box/box_wp07.png new file mode 100644 index 000000000..87afd8659 Binary files /dev/null and b/Resources/img/box/box_wp07.png differ diff --git a/Resources/img/box/box_wp08.png b/Resources/img/box/box_wp08.png new file mode 100644 index 000000000..2a9bfacb5 Binary files /dev/null and b/Resources/img/box/box_wp08.png differ diff --git a/Resources/img/box/box_wp09.png b/Resources/img/box/box_wp09.png new file mode 100644 index 000000000..3a33b0572 Binary files /dev/null and b/Resources/img/box/box_wp09.png differ diff --git a/Resources/img/box/box_wp10.png b/Resources/img/box/box_wp10.png new file mode 100644 index 000000000..6331196a6 Binary files /dev/null and b/Resources/img/box/box_wp10.png differ diff --git a/Resources/img/box/box_wp11.png b/Resources/img/box/box_wp11.png new file mode 100644 index 000000000..f22970b6e Binary files /dev/null and b/Resources/img/box/box_wp11.png differ diff --git a/Resources/img/box/box_wp12.png b/Resources/img/box/box_wp12.png new file mode 100644 index 000000000..de3c15760 Binary files /dev/null and b/Resources/img/box/box_wp12.png differ diff --git a/Resources/img/box/box_wp13.png b/Resources/img/box/box_wp13.png new file mode 100644 index 000000000..07d85f40c Binary files /dev/null and b/Resources/img/box/box_wp13.png differ diff --git a/Resources/img/box/box_wp14.png b/Resources/img/box/box_wp14.png new file mode 100644 index 000000000..31d5d51dc Binary files /dev/null and b/Resources/img/box/box_wp14.png differ diff --git a/Resources/img/box/box_wp15.png b/Resources/img/box/box_wp15.png new file mode 100644 index 000000000..2c0840cb0 Binary files /dev/null and b/Resources/img/box/box_wp15.png differ diff --git a/Resources/img/box/box_wp16.png b/Resources/img/box/box_wp16.png new file mode 100644 index 000000000..53bd6e757 Binary files /dev/null and b/Resources/img/box/box_wp16.png differ diff --git a/Resources/img/box/box_wp17.png b/Resources/img/box/box_wp17.png new file mode 100644 index 000000000..3a1673bc2 Binary files /dev/null and b/Resources/img/box/box_wp17.png differ diff --git a/Resources/img/box/box_wp18.png b/Resources/img/box/box_wp18.png new file mode 100644 index 000000000..b684e8f98 Binary files /dev/null and b/Resources/img/box/box_wp18.png differ diff --git a/Resources/img/box/box_wp19.png b/Resources/img/box/box_wp19.png new file mode 100644 index 000000000..dc23270e3 Binary files /dev/null and b/Resources/img/box/box_wp19.png differ diff --git a/Resources/img/box/box_wp20.png b/Resources/img/box/box_wp20.png new file mode 100644 index 000000000..acb4691ef Binary files /dev/null and b/Resources/img/box/box_wp20.png differ diff --git a/Resources/img/box/box_wp21.png b/Resources/img/box/box_wp21.png new file mode 100644 index 000000000..f6e045890 Binary files /dev/null and b/Resources/img/box/box_wp21.png differ diff --git a/Resources/img/box/box_wp22.png b/Resources/img/box/box_wp22.png new file mode 100644 index 000000000..6336738bd Binary files /dev/null and b/Resources/img/box/box_wp22.png differ diff --git a/Resources/img/box/box_wp23.png b/Resources/img/box/box_wp23.png new file mode 100644 index 000000000..fefe6734c Binary files /dev/null and b/Resources/img/box/box_wp23.png differ diff --git a/Resources/img/box/box_wp24.png b/Resources/img/box/box_wp24.png new file mode 100644 index 000000000..89f39bb61 Binary files /dev/null and b/Resources/img/box/box_wp24.png differ diff --git a/Resources/img/box/slotDel.png b/Resources/img/box/slotDel.png new file mode 100644 index 000000000..49c9a9349 Binary files /dev/null and b/Resources/img/box/slotDel.png differ diff --git a/Resources/img/box/slotSet.png b/Resources/img/box/slotSet.png new file mode 100644 index 000000000..ed7c67d9e Binary files /dev/null and b/Resources/img/box/slotSet.png differ diff --git a/Resources/img/box/slotTrans.png b/Resources/img/box/slotTrans.png new file mode 100644 index 000000000..99c7338f7 Binary files /dev/null and b/Resources/img/box/slotTrans.png differ diff --git a/Resources/img/box/slotView.png b/Resources/img/box/slotView.png new file mode 100644 index 000000000..2736eba13 Binary files /dev/null and b/Resources/img/box/slotView.png differ