diff --git a/PKHeX.WinForms/MainWindow/Main.Designer.cs b/PKHeX.WinForms/MainWindow/Main.Designer.cs index 036d79024..54b4b65b3 100644 --- a/PKHeX.WinForms/MainWindow/Main.Designer.cs +++ b/PKHeX.WinForms/MainWindow/Main.Designer.cs @@ -321,9 +321,9 @@ this.Menu_ModifyDex = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_ModifyPKM = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_FlagIllegal = new System.Windows.Forms.ToolStripMenuItem(); + this.Menu_ModifyUnset = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_Undo = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_Redo = new System.Windows.Forms.ToolStripMenuItem(); - this.Menu_ModifyUnset = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_Unicode = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_About = new System.Windows.Forms.ToolStripMenuItem(); this.tabBoxMulti = new System.Windows.Forms.TabControl(); @@ -449,6 +449,7 @@ this.mnuLSave = new System.Windows.Forms.ToolStripMenuItem(); this.PB_Legal = new System.Windows.Forms.PictureBox(); this.L_UpdateAvailable = new System.Windows.Forms.LinkLabel(); + this.B_OpenFriendSafari = new System.Windows.Forms.Button(); this.tabMain.SuspendLayout(); this.Tab_Main.SuspendLayout(); this.FLP_Main.SuspendLayout(); @@ -1597,8 +1598,11 @@ // this.NUD_Purification.Location = new System.Drawing.Point(110, 1); this.NUD_Purification.Margin = new System.Windows.Forms.Padding(0, 1, 0, 0); - this.NUD_Purification.Maximum = new decimal(int.MaxValue); - this.NUD_Purification.Minimum = new decimal(0); + this.NUD_Purification.Maximum = new decimal(new int[] { + 2147483647, + 0, + 0, + 0}); this.NUD_Purification.Name = "NUD_Purification"; this.NUD_Purification.Size = new System.Drawing.Size(51, 20); this.NUD_Purification.TabIndex = 103; @@ -3992,7 +3996,7 @@ this.CB_MainLanguage}); this.Menu_Language.Image = ((System.Drawing.Image)(resources.GetObject("Menu_Language.Image"))); this.Menu_Language.Name = "Menu_Language"; - this.Menu_Language.Size = new System.Drawing.Size(152, 22); + this.Menu_Language.Size = new System.Drawing.Size(139, 22); this.Menu_Language.Text = "Language"; // // CB_MainLanguage @@ -4013,7 +4017,7 @@ this.Menu_Redo}); this.Menu_Modify.Image = ((System.Drawing.Image)(resources.GetObject("Menu_Modify.Image"))); this.Menu_Modify.Name = "Menu_Modify"; - this.Menu_Modify.Size = new System.Drawing.Size(152, 22); + this.Menu_Modify.Size = new System.Drawing.Size(139, 22); this.Menu_Modify.Text = "Set to SAV"; // // Menu_ModifyDex @@ -4044,6 +4048,14 @@ this.Menu_FlagIllegal.Text = "Flag Legality"; this.Menu_FlagIllegal.Click += new System.EventHandler(this.mainMenuFlagIllegal); // + // Menu_ModifyUnset + // + this.Menu_ModifyUnset.CheckOnClick = true; + this.Menu_ModifyUnset.Name = "Menu_ModifyUnset"; + this.Menu_ModifyUnset.Size = new System.Drawing.Size(189, 22); + this.Menu_ModifyUnset.Text = "Notify Unset Changes"; + this.Menu_ModifyUnset.Click += new System.EventHandler(this.mainMenuModifyUnset); + // // Menu_Undo // this.Menu_Undo.Enabled = false; @@ -4064,21 +4076,13 @@ this.Menu_Redo.Text = "Redo Last Change"; this.Menu_Redo.Click += new System.EventHandler(this.clickRedo); // - // Menu_ModifyUnset - // - this.Menu_ModifyUnset.CheckOnClick = true; - this.Menu_ModifyUnset.Name = "Menu_ModifyUnset"; - this.Menu_ModifyUnset.Size = new System.Drawing.Size(189, 22); - this.Menu_ModifyUnset.Text = "Notify Unset Changes"; - this.Menu_ModifyUnset.Click += new System.EventHandler(this.mainMenuModifyUnset); - // // Menu_Unicode // this.Menu_Unicode.Checked = true; this.Menu_Unicode.CheckOnClick = true; this.Menu_Unicode.CheckState = System.Windows.Forms.CheckState.Checked; this.Menu_Unicode.Name = "Menu_Unicode"; - this.Menu_Unicode.Size = new System.Drawing.Size(152, 22); + this.Menu_Unicode.Size = new System.Drawing.Size(139, 22); this.Menu_Unicode.Text = "Unicode"; this.Menu_Unicode.Click += new System.EventHandler(this.mainMenuUnicode); // @@ -4088,7 +4092,7 @@ this.Menu_About.Name = "Menu_About"; this.Menu_About.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P))); this.Menu_About.ShowShortcutKeys = false; - this.Menu_About.Size = new System.Drawing.Size(152, 22); + this.Menu_About.Size = new System.Drawing.Size(139, 22); this.Menu_About.Text = "About &PKHeX"; this.Menu_About.Click += new System.EventHandler(this.mainMenuAbout); // @@ -5516,6 +5520,7 @@ this.FLP_SAVtools.Controls.Add(this.B_OpenPokeBeans); this.FLP_SAVtools.Controls.Add(this.B_OpenZygardeCells); this.FLP_SAVtools.Controls.Add(this.B_OpenMiscEditor); + this.FLP_SAVtools.Controls.Add(this.B_OpenFriendSafari); this.FLP_SAVtools.Location = new System.Drawing.Point(6, 10); this.FLP_SAVtools.Name = "FLP_SAVtools"; this.FLP_SAVtools.Size = new System.Drawing.Size(297, 87); @@ -5782,6 +5787,16 @@ this.L_UpdateAvailable.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.L_UpdateAvailable.Visible = false; // + // B_OpenFriendSafari + // + this.B_OpenFriendSafari.Location = new System.Drawing.Point(96, 177); + this.B_OpenFriendSafari.Name = "B_OpenFriendSafari"; + this.B_OpenFriendSafari.Size = new System.Drawing.Size(87, 23); + this.B_OpenFriendSafari.TabIndex = 28; + this.B_OpenFriendSafari.Text = "Friend Safari"; + this.B_OpenFriendSafari.UseVisualStyleBackColor = true; + this.B_OpenFriendSafari.Click += new System.EventHandler(this.B_OpenFriendSafari_Click); + // // Main // this.AllowDrop = true; @@ -6437,6 +6452,7 @@ internal System.Windows.Forms.ToolStripMenuItem Menu_FlagIllegal; private System.Windows.Forms.Button B_OpenMiscEditor; private System.Windows.Forms.ToolStripMenuItem Menu_ModifyUnset; + private System.Windows.Forms.Button B_OpenFriendSafari; } } diff --git a/PKHeX.WinForms/MainWindow/Main.cs b/PKHeX.WinForms/MainWindow/Main.cs index 2370c7498..1e8be3787 100644 --- a/PKHeX.WinForms/MainWindow/Main.cs +++ b/PKHeX.WinForms/MainWindow/Main.cs @@ -1141,6 +1141,7 @@ namespace PKHeX.WinForms B_OpenOPowers.Enabled = SAV.HasOPower; B_OpenPokedex.Enabled = SAV.HasPokeDex; B_OpenBerryField.Enabled = SAV.HasBerryField && SAV.XY; + B_OpenFriendSafari.Enabled = SAV.XY; B_OpenPokeblocks.Enabled = SAV.HasPokeBlock; B_JPEG.Visible = SAV.HasJPEG; B_OpenEventFlags.Enabled = SAV.HasEvents; @@ -4126,6 +4127,19 @@ namespace PKHeX.WinForms else if (SAV.XY) new SAV_OPower().ShowDialog(); } + private void B_OpenFriendSafari_Click(object sender, EventArgs e) + { + if (!SAV.XY) + return; + + DialogResult dr = WinFormsUtil.Prompt(MessageBoxButtons.YesNo, "No editing support for Friend Safari :(", "Unlock all 3 slots for each friend?"); + if (dr != DialogResult.Yes) return; + + // Unlock + reveal all safari slots if friend data is present + for (int i = 1; i < 101; i++) + if (SAV.Data[0x1E7FF + 0x15*i] != 0x00) // no friend data == 0x00 + SAV.Data[0x1E7FF + 0x15*i] = 0x3D; + } private void B_OpenPokedex_Click(object sender, EventArgs e) { switch (SAV.Generation) diff --git a/PKHeX.WinForms/MainWindow/Main.resx b/PKHeX.WinForms/MainWindow/Main.resx index bede4a1e8..e9118b8cf 100644 --- a/PKHeX.WinForms/MainWindow/Main.resx +++ b/PKHeX.WinForms/MainWindow/Main.resx @@ -129,15 +129,6 @@ True - - True - - - True - - - True - @@ -164,21 +155,6 @@ True - - True - - - True - - - True - - - True - - - True - True @@ -188,51 +164,9 @@ True - - True - - - True - - - True - True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - True @@ -245,132 +179,18 @@ 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 - True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - True @@ -383,18 +203,6 @@ True - - True - - - True - - - True - - - True - True @@ -407,24 +215,9 @@ True - - True - - - True - True - - True - - - True - - - True - True @@ -437,402 +230,6 @@ 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 - - - 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 - - - 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 - - - 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 - - - True - True @@ -857,6 +254,609 @@ 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 + + + 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 + + + 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 + + + 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 + + + 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 + + + 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 + + + True + + + True + + + True + + + True + True @@ -1122,15 +1122,6 @@ True - - True - - - True - - - True - True @@ -1853,63 +1844,6 @@ True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - True @@ -2188,6 +2122,21 @@ True + + True + + + True + + + True + + + True + + + True + True @@ -2410,6 +2359,21 @@ True + + True + + + True + + + True + + + True + + + True + True @@ -2506,6 +2470,60 @@ True + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + True @@ -2572,6 +2590,9 @@ True + + True + True @@ -2655,6 +2676,9 @@ True + + True + True