diff --git a/PKHeX/Subforms/Save Editors/Gen7/SAV_ZygardeCell.Designer.cs b/PKHeX/Subforms/Save Editors/Gen7/SAV_ZygardeCell.Designer.cs index e8b3bc297..80b0ab1e0 100644 --- a/PKHeX/Subforms/Save Editors/Gen7/SAV_ZygardeCell.Designer.cs +++ b/PKHeX/Subforms/Save Editors/Gen7/SAV_ZygardeCell.Designer.cs @@ -38,8 +38,11 @@ private void InitializeComponent() this.NUD_Cells = new System.Windows.Forms.NumericUpDown(); this.L_Cells = new System.Windows.Forms.Label(); this.B_GiveAll = new System.Windows.Forms.Button(); + this.L_Collected = new System.Windows.Forms.Label(); + this.NUD_Collected = new System.Windows.Forms.NumericUpDown(); ((System.ComponentModel.ISupportInitialize)(this.dgv)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_Cells)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_Collected)).BeginInit(); this.SuspendLayout(); // // dgv @@ -113,7 +116,7 @@ private void InitializeComponent() // NUD_Cells // this.NUD_Cells.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.NUD_Cells.Location = new System.Drawing.Point(90, 284); + this.NUD_Cells.Location = new System.Drawing.Point(90, 309); this.NUD_Cells.Maximum = new decimal(new int[] { 65535, 0, @@ -126,17 +129,17 @@ private void InitializeComponent() // L_Cells // this.L_Cells.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.L_Cells.Location = new System.Drawing.Point(12, 281); + this.L_Cells.Location = new System.Drawing.Point(12, 306); this.L_Cells.Name = "L_Cells"; this.L_Cells.Size = new System.Drawing.Size(72, 23); this.L_Cells.TabIndex = 4; - this.L_Cells.Text = "Total:"; + this.L_Cells.Text = "Stored:"; this.L_Cells.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // B_GiveAll // this.B_GiveAll.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.B_GiveAll.Location = new System.Drawing.Point(81, 306); + this.B_GiveAll.Location = new System.Drawing.Point(162, 306); this.B_GiveAll.Name = "B_GiveAll"; this.B_GiveAll.Size = new System.Drawing.Size(75, 23); this.B_GiveAll.TabIndex = 5; @@ -144,11 +147,36 @@ private void InitializeComponent() this.B_GiveAll.UseVisualStyleBackColor = true; this.B_GiveAll.Click += new System.EventHandler(this.B_GiveAll_Click); // + // L_Collected + // + this.L_Collected.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.L_Collected.Location = new System.Drawing.Point(12, 281); + this.L_Collected.Name = "L_Collected"; + this.L_Collected.Size = new System.Drawing.Size(72, 23); + this.L_Collected.TabIndex = 7; + this.L_Collected.Text = "Collected:"; + this.L_Collected.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // NUD_Collected + // + this.NUD_Collected.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.NUD_Collected.Location = new System.Drawing.Point(90, 284); + this.NUD_Collected.Maximum = new decimal(new int[] { + 65535, + 0, + 0, + 0}); + this.NUD_Collected.Name = "NUD_Collected"; + this.NUD_Collected.Size = new System.Drawing.Size(66, 20); + this.NUD_Collected.TabIndex = 6; + // // SAV_ZygardeCell // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(424, 341); + this.Controls.Add(this.L_Collected); + this.Controls.Add(this.NUD_Collected); this.Controls.Add(this.B_GiveAll); this.Controls.Add(this.L_Cells); this.Controls.Add(this.NUD_Cells); @@ -163,6 +191,7 @@ private void InitializeComponent() this.Text = "Zygarde Cells"; ((System.ComponentModel.ISupportInitialize)(this.dgv)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_Cells)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.NUD_Collected)).EndInit(); this.ResumeLayout(false); } @@ -178,5 +207,7 @@ private void InitializeComponent() private System.Windows.Forms.DataGridViewComboBoxColumn dgv_val; private System.Windows.Forms.DataGridViewTextBoxColumn dgv_location; private System.Windows.Forms.DataGridViewTextBoxColumn dgv_ref; + private System.Windows.Forms.Label L_Collected; + private System.Windows.Forms.NumericUpDown NUD_Collected; } } \ No newline at end of file diff --git a/PKHeX/Subforms/Save Editors/Gen7/SAV_ZygardeCell.cs b/PKHeX/Subforms/Save Editors/Gen7/SAV_ZygardeCell.cs index e98fded86..fe8c9e49a 100644 --- a/PKHeX/Subforms/Save Editors/Gen7/SAV_ZygardeCell.cs +++ b/PKHeX/Subforms/Save Editors/Gen7/SAV_ZygardeCell.cs @@ -18,9 +18,11 @@ public SAV_ZygardeCell() ushort[] cells = constants.Skip(celloffset).Take(cellcount).ToArray(); int receivedCount = cells.Count(cell => cell == 2); - int cellCount = constants[cellscollected]; + int cellCount = constants[cellstotal]; + int cellCollected = constants[cellscollected]; NUD_Cells.Value = cellCount; + NUD_Collected.Value = cellCollected; var combo = dgv.Columns[2] as DataGridViewComboBoxColumn; foreach (string t in states) @@ -39,7 +41,8 @@ public SAV_ZygardeCell() } } - private const int cellscollected = 0x142/2; + private const int cellstotal = 0x142/2; + private const int cellscollected = 0x152/2; private const int celloffset = 198; private const int cellcount = 95; private readonly string[] states = {"None", "Available", "Received"}; @@ -57,7 +60,8 @@ private void B_Save_Click(object sender, EventArgs e) constants[celloffset + i] = (ushort)val; } - constants[cellscollected] = (ushort)NUD_Cells.Value; + constants[cellstotal] = (ushort)NUD_Cells.Value; + constants[cellscollected] = (ushort)NUD_Collected.Value; SAV.EventConsts = constants; Array.Copy(SAV.Data, Main.SAV.Data, SAV.Data.Length); @@ -74,6 +78,8 @@ private void B_GiveAll_Click(object sender, EventArgs e) for (int i = 0; i < dgv.RowCount; i++) dgv.Rows[i].Cells[2].Value = states[2]; + NUD_Collected.Value = cellcount; + System.Media.SystemSounds.Asterisk.Play(); }