diff --git a/PKHeX/MainWindow/Main.Designer.cs b/PKHeX/MainWindow/Main.Designer.cs
index cc4951835..ccd735cad 100644
--- a/PKHeX/MainWindow/Main.Designer.cs
+++ b/PKHeX/MainWindow/Main.Designer.cs
@@ -157,7 +157,9 @@ public void InitializeComponent()
this.FLP_HackedStats = new System.Windows.Forms.FlowLayoutPanel();
this.CHK_HackedStats = new System.Windows.Forms.CheckBox();
this.FLP_StatsHeaderRight = new System.Windows.Forms.FlowLayoutPanel();
+ this.FLP_IVs = new System.Windows.Forms.FlowLayoutPanel();
this.Label_IVs = new System.Windows.Forms.Label();
+ this.Label_DVs = new System.Windows.Forms.Label();
this.Label_EVs = new System.Windows.Forms.Label();
this.Label_Stats = new System.Windows.Forms.Label();
this.FLP_HP = new System.Windows.Forms.FlowLayoutPanel();
@@ -411,9 +413,9 @@ public void InitializeComponent()
this.B_OpenOPowers = new System.Windows.Forms.Button();
this.B_OpenEventFlags = new System.Windows.Forms.Button();
this.B_OpenPokedex = new System.Windows.Forms.Button();
- this.B_LinkInfo = new System.Windows.Forms.Button();
+ this.B_OpenLinkInfo = new System.Windows.Forms.Button();
this.B_OpenBerryField = new System.Windows.Forms.Button();
- this.B_Pokeblocks = new System.Windows.Forms.Button();
+ this.B_OpenPokeblocks = new System.Windows.Forms.Button();
this.B_OpenSecretBase = new System.Windows.Forms.Button();
this.B_OpenPokepuffs = new System.Windows.Forms.Button();
this.B_OpenSuperTraining = new System.Windows.Forms.Button();
@@ -473,6 +475,7 @@ public void InitializeComponent()
this.FLP_StatHeader.SuspendLayout();
this.FLP_HackedStats.SuspendLayout();
this.FLP_StatsHeaderRight.SuspendLayout();
+ this.FLP_IVs.SuspendLayout();
this.FLP_HP.SuspendLayout();
this.FLP_HPRight.SuspendLayout();
this.FLP_Atk.SuspendLayout();
@@ -2079,7 +2082,7 @@ public void InitializeComponent()
// FLP_StatsHeaderRight
//
this.FLP_StatsHeaderRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
- this.FLP_StatsHeaderRight.Controls.Add(this.Label_IVs);
+ this.FLP_StatsHeaderRight.Controls.Add(this.FLP_IVs);
this.FLP_StatsHeaderRight.Controls.Add(this.Label_EVs);
this.FLP_StatsHeaderRight.Controls.Add(this.Label_Stats);
this.FLP_StatsHeaderRight.Location = new System.Drawing.Point(107, 0);
@@ -2088,6 +2091,17 @@ public void InitializeComponent()
this.FLP_StatsHeaderRight.Size = new System.Drawing.Size(162, 21);
this.FLP_StatsHeaderRight.TabIndex = 123;
//
+ // FLP_IVs
+ //
+ this.FLP_IVs.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+ this.FLP_IVs.Controls.Add(this.Label_IVs);
+ this.FLP_IVs.Controls.Add(this.Label_DVs);
+ this.FLP_IVs.Location = new System.Drawing.Point(0, 0);
+ this.FLP_IVs.Margin = new System.Windows.Forms.Padding(0);
+ this.FLP_IVs.Name = "FLP_IVs";
+ this.FLP_IVs.Size = new System.Drawing.Size(30, 21);
+ this.FLP_IVs.TabIndex = 124;
+ //
// Label_IVs
//
this.Label_IVs.Location = new System.Drawing.Point(0, 0);
@@ -2098,6 +2112,16 @@ public void InitializeComponent()
this.Label_IVs.Text = "IVs";
this.Label_IVs.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
+ // Label_DVs
+ //
+ this.Label_DVs.Location = new System.Drawing.Point(0, 21);
+ this.Label_DVs.Margin = new System.Windows.Forms.Padding(0);
+ this.Label_DVs.Name = "Label_DVs";
+ this.Label_DVs.Size = new System.Drawing.Size(30, 21);
+ this.Label_DVs.TabIndex = 26;
+ this.Label_DVs.Text = "DVs";
+ this.Label_DVs.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
// Label_EVs
//
this.Label_EVs.Location = new System.Drawing.Point(30, 0);
@@ -3572,7 +3596,7 @@ public void InitializeComponent()
this.Menu_ExportMAIN.Name = "Menu_ExportMAIN";
this.Menu_ExportMAIN.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E)));
this.Menu_ExportMAIN.ShowShortcutKeys = false;
- this.Menu_ExportMAIN.Size = new System.Drawing.Size(130, 22);
+ this.Menu_ExportMAIN.Size = new System.Drawing.Size(142, 22);
this.Menu_ExportMAIN.Text = "&Export main";
this.Menu_ExportMAIN.Click += new System.EventHandler(this.clickExportSAV);
//
@@ -3582,8 +3606,8 @@ public void InitializeComponent()
this.Menu_ExportBAK.Name = "Menu_ExportBAK";
this.Menu_ExportBAK.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.B)));
this.Menu_ExportBAK.ShowShortcutKeys = false;
- this.Menu_ExportBAK.Size = new System.Drawing.Size(130, 22);
- this.Menu_ExportBAK.Text = "Export &BAK";
+ this.Menu_ExportBAK.Size = new System.Drawing.Size(142, 22);
+ this.Menu_ExportBAK.Text = "Export &Backup";
this.Menu_ExportBAK.Click += new System.EventHandler(this.clickExportSAVBAK);
//
// Menu_Exit
@@ -3729,7 +3753,7 @@ public void InitializeComponent()
this.Menu_Database.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D)));
this.Menu_Database.ShowShortcutKeys = false;
this.Menu_Database.Size = new System.Drawing.Size(182, 22);
- this.Menu_Database.Text = "PK6 &Database";
+ this.Menu_Database.Text = "PKM &Database";
this.Menu_Database.Click += new System.EventHandler(this.mainMenuDatabase);
//
// Menu_MGDatabase
@@ -5231,9 +5255,9 @@ public void InitializeComponent()
this.FLP_SAVtools.Controls.Add(this.B_OpenOPowers);
this.FLP_SAVtools.Controls.Add(this.B_OpenEventFlags);
this.FLP_SAVtools.Controls.Add(this.B_OpenPokedex);
- this.FLP_SAVtools.Controls.Add(this.B_LinkInfo);
+ this.FLP_SAVtools.Controls.Add(this.B_OpenLinkInfo);
this.FLP_SAVtools.Controls.Add(this.B_OpenBerryField);
- this.FLP_SAVtools.Controls.Add(this.B_Pokeblocks);
+ this.FLP_SAVtools.Controls.Add(this.B_OpenPokeblocks);
this.FLP_SAVtools.Controls.Add(this.B_OpenSecretBase);
this.FLP_SAVtools.Controls.Add(this.B_OpenPokepuffs);
this.FLP_SAVtools.Controls.Add(this.B_OpenSuperTraining);
@@ -5315,15 +5339,15 @@ public void InitializeComponent()
this.B_OpenPokedex.UseVisualStyleBackColor = true;
this.B_OpenPokedex.Click += new System.EventHandler(this.B_OpenPokedex_Click);
//
- // B_LinkInfo
+ // B_OpenLinkInfo
//
- this.B_LinkInfo.Location = new System.Drawing.Point(96, 61);
- this.B_LinkInfo.Name = "B_LinkInfo";
- this.B_LinkInfo.Size = new System.Drawing.Size(87, 23);
- this.B_LinkInfo.TabIndex = 23;
- this.B_LinkInfo.Text = "Link Data";
- this.B_LinkInfo.UseVisualStyleBackColor = true;
- this.B_LinkInfo.Click += new System.EventHandler(this.B_LinkInfo_Click);
+ this.B_OpenLinkInfo.Location = new System.Drawing.Point(96, 61);
+ this.B_OpenLinkInfo.Name = "B_OpenLinkInfo";
+ this.B_OpenLinkInfo.Size = new System.Drawing.Size(87, 23);
+ this.B_OpenLinkInfo.TabIndex = 23;
+ this.B_OpenLinkInfo.Text = "Link Data";
+ this.B_OpenLinkInfo.UseVisualStyleBackColor = true;
+ this.B_OpenLinkInfo.Click += new System.EventHandler(this.B_LinkInfo_Click);
//
// B_OpenBerryField
//
@@ -5335,16 +5359,16 @@ public void InitializeComponent()
this.B_OpenBerryField.UseVisualStyleBackColor = true;
this.B_OpenBerryField.Click += new System.EventHandler(this.B_OpenBerryField_Click);
//
- // B_Pokeblocks
+ // B_OpenPokeblocks
//
- this.B_Pokeblocks.Location = new System.Drawing.Point(3, 90);
- this.B_Pokeblocks.Name = "B_Pokeblocks";
- this.B_Pokeblocks.Size = new System.Drawing.Size(87, 23);
- this.B_Pokeblocks.TabIndex = 22;
- this.B_Pokeblocks.Text = "Pokéblocks";
- this.B_Pokeblocks.UseVisualStyleBackColor = true;
- this.B_Pokeblocks.Visible = false;
- this.B_Pokeblocks.Click += new System.EventHandler(this.B_OpenPokeblocks_Click);
+ this.B_OpenPokeblocks.Location = new System.Drawing.Point(3, 90);
+ this.B_OpenPokeblocks.Name = "B_OpenPokeblocks";
+ this.B_OpenPokeblocks.Size = new System.Drawing.Size(87, 23);
+ this.B_OpenPokeblocks.TabIndex = 22;
+ this.B_OpenPokeblocks.Text = "Pokéblocks";
+ this.B_OpenPokeblocks.UseVisualStyleBackColor = true;
+ this.B_OpenPokeblocks.Visible = false;
+ this.B_OpenPokeblocks.Click += new System.EventHandler(this.B_OpenPokeblocks_Click);
//
// B_OpenSecretBase
//
@@ -5559,6 +5583,7 @@ public void InitializeComponent()
this.FLP_HackedStats.ResumeLayout(false);
this.FLP_HackedStats.PerformLayout();
this.FLP_StatsHeaderRight.ResumeLayout(false);
+ this.FLP_IVs.ResumeLayout(false);
this.FLP_HP.ResumeLayout(false);
this.FLP_HPRight.ResumeLayout(false);
this.FLP_HPRight.PerformLayout();
@@ -6008,11 +6033,11 @@ public void InitializeComponent()
private System.Windows.Forms.FlowLayoutPanel FLP_SAVtools;
private System.Windows.Forms.GroupBox GB_SAVtools;
private System.Windows.Forms.PictureBox PB_Mark1;
- private System.Windows.Forms.Button B_Pokeblocks;
+ private System.Windows.Forms.Button B_OpenPokeblocks;
private System.Windows.Forms.ToolStripMenuItem Menu_BatchEditor;
private System.Windows.Forms.Button BTN_Medals;
private System.Windows.Forms.FlowLayoutPanel FLP_PKMEditors;
- private System.Windows.Forms.Button B_LinkInfo;
+ private System.Windows.Forms.Button B_OpenLinkInfo;
private System.Windows.Forms.Button B_CGearSkin;
private System.Windows.Forms.LinkLabel L_UpdateAvailable;
private System.Windows.Forms.Label L_MetTimeOfDay;
@@ -6097,6 +6122,8 @@ public void InitializeComponent()
private System.Windows.Forms.MaskedTextBox TB_Smart;
private System.Windows.Forms.MaskedTextBox TB_Tough;
private System.Windows.Forms.MaskedTextBox TB_Sheen;
+ private System.Windows.Forms.FlowLayoutPanel FLP_IVs;
+ private System.Windows.Forms.Label Label_DVs;
}
}
diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs
index a59e45cf3..3c329d897 100644
--- a/PKHeX/MainWindow/Main.cs
+++ b/PKHeX/MainWindow/Main.cs
@@ -835,7 +835,18 @@ private void loadSAV(SaveFile sav, string path)
GB_SUBE.Visible = SAV.HasSUBE;
PB_Locked.Visible = SAV.HasBattleBox && SAV.BattleBoxLocked;
- PAN_Box.Visible = CB_BoxSelect.Visible = B_BoxLeft.Visible = B_BoxRight.Visible = SAV.HasBox;
+ if (!SAV.HasBox && tabBoxMulti.TabPages.Contains(Tab_Box))
+ {
+ tabBoxMulti.TabPages.Remove(Tab_Box);
+ tabBoxMulti.TabPages.Remove(Tab_Other);
+ }
+ else if (SAV.HasBox && !tabBoxMulti.TabPages.Contains(Tab_Box))
+ {
+ tabBoxMulti.TabPages.Insert(0, Tab_Box);
+ tabBoxMulti.TabPages.Insert(2, Tab_Other);
+ // force update -- re-added tab may be untranslated
+ Util.TranslateInterface(this, curlanguage);
+ }
Menu_LoadBoxes.Enabled = Menu_DumpBoxes.Enabled = Menu_Report.Enabled = Menu_Modify.Enabled = B_SaveBoxBin.Enabled = SAV.HasBox;
if (path != null) // Actual save file
@@ -854,10 +865,10 @@ private void loadSAV(SaveFile sav, string path)
B_OpenOPowers.Visible = SAV.HasOPower;
B_OpenPokedex.Visible = SAV.HasPokeDex;
B_OpenBerryField.Visible = SAV.HasBerryField && SAV.XY;
- B_Pokeblocks.Visible = SAV.HasPokeBlock;
+ B_OpenPokeblocks.Visible = SAV.HasPokeBlock;
B_JPEG.Visible = SAV.HasJPEG;
B_OpenEventFlags.Visible = SAV.HasEvents;
- B_LinkInfo.Visible = SAV.HasLink;
+ B_OpenLinkInfo.Visible = SAV.HasLink;
B_CGearSkin.Visible = SAV.Generation == 5;
}
@@ -893,6 +904,7 @@ private void loadSAV(SaveFile sav, string path)
CHK_IsEgg.Visible = Label_Gender.Visible = SAV.Generation >= 2;
FLP_PKRS.Visible = FLP_EggPKRSRight.Visible = SAV.Generation >= 2;
Label_OTGender.Visible = SAV.Generation >= 2;
+ Label_IVs.Visible = SAV.Generation >= 2; // DVs appears instead
if (SAV.Generation == 1)
Label_IsShiny.Visible = false;
diff --git a/PKHeX/MainWindow/Main.resx b/PKHeX/MainWindow/Main.resx
index b8929a07f..e5c0098ac 100644
--- a/PKHeX/MainWindow/Main.resx
+++ b/PKHeX/MainWindow/Main.resx
@@ -120,117 +120,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
@@ -290,6 +179,15 @@
True
+
+ True
+
+
+ True
+
+
+ True
+
True
@@ -302,6 +200,9 @@
True
+
+ True
+
True
@@ -332,6 +233,18 @@
True
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
True
@@ -344,6 +257,39 @@
True
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
True
@@ -371,6 +317,12 @@
True
+
+ True
+
+
+ True
+
True
@@ -392,6 +344,9 @@
True
+
+ True
+
True
@@ -416,6 +371,18 @@
True
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
True
@@ -428,6 +395,18 @@
True
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
True
@@ -536,6 +515,12 @@
True
+
+ True
+
+
+ True
+
True
@@ -620,7 +605,7 @@
True
-
+
True
@@ -629,9 +614,21 @@
True
+
+ True
+
True
+
+ True
+
+
+ True
+
+
+ True
+
True
@@ -839,6 +836,24 @@
True
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAeZJREFUOE+1
@@ -1101,6 +1116,15 @@
True
+
+ True
+
+
+ True
+
+
+ True
+
True
@@ -1966,9 +1990,6 @@
True
-
- True
-
True
@@ -1990,61 +2011,13 @@
True
-
+
True
True
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
+
True
diff --git a/PKHeX/Resources/text/en/lang_en.txt b/PKHeX/Resources/text/en/lang_en.txt
index d71b13a26..633fe5432 100644
--- a/PKHeX/Resources/text/en/lang_en.txt
+++ b/PKHeX/Resources/text/en/lang_en.txt
@@ -21,7 +21,7 @@ Menu_Open = Open...
Menu_Save = Save PKM...
Menu_ExportSAV = Export SAV...
Menu_ExportMAIN = Export main
-Menu_ExportBAK = Export BAK
+Menu_ExportBAK = Export Backup
Menu_Exit = Quit
--
Menu_Tools = Tools
@@ -38,6 +38,8 @@ Menu_LoadBoxes = Load Boxes
Menu_DumpBoxes = Dump Boxes
Menu_Report = Box Data Report
Menu_Database = PKM Database
+Menu_MGDatabase = Mystery Gift Database
+Menu_BatchEditor = Batch Editor
Menu_Other = Other
Menu_OpenSDF = Open SaveDataFiler Folder
Menu_OpenSDB = Open SaveDataBackup Folder
@@ -92,7 +94,9 @@ Label_EggLocation = Location:
Label_EggDate = Date:
--------------------Stats Tab Data----------------------
Tab_Stats = Stats
+CHK_HackedStats = Hacked Stats
Label_IVs = IVs
+Label_DVs = DVs
Label_EVs = EVs
Label_Stats = Stats
Label_HP = HP:
@@ -101,6 +105,7 @@ Label_DEF = Def:
Label_SPA = SpA:
Label_SPD = SpD:
Label_SPE = Spe:
+Label_SPC = SpC:
Label_Total = Total:
Label_HiddenPowerPrefix = Hidden Power Type:
Label_CharacteristicPrefix = Characteristic:
@@ -144,15 +149,18 @@ B_OpenItemPouch = Items
B_OpenTrainerInfo = Trainer Info
B_OUTPasserby = Passerby
B_OpenBoxLayout = Box Layout
-B_OpenWondercards = WonderCard
+B_OpenWondercards = Mystery Gift
B_OpenSuperTraining = Super Train
B_OpenHallofFame = Hall of Fame
B_OpenOPowers = O-Powers
B_OpenEventFlags = Event Flags
B_OpenPokedex = Pokédex
B_OpenBerryField = Berry Field
+B_OpenPokeBlocks = Pokéblocks
+B_OpenLinkInfo = Link Data
--
B_OpenSecretBase = Secret Base
+B_CGearSkin = C-Gear Skin
--------------------Tab Internals-----------------------
L_Party = Party:
L_BattleBox = Battle Box:
@@ -363,6 +371,66 @@ L_Arguments = Disabled ; Never left ; OT ; Past Gen ; Memories with ; Pokémon ;
! End
! -----------------------------------------------------
- DO NOT CHANGE THIS SECTION.
+! SAV_PokeBlockORAS = Pokéblock Editor
+- Change stuff below this line, not above.
+-------------------------------------------------------
+L_Red = Red Pokéblocks:
+L_Blue = Blue Pokéblocks:
+L_Pink = Pink Pokéblocks:
+L_Green = Green Pokéblocks:
+L_Yellow = Yellow Pokéblocks:
+L_Rainbow = Rainbow Pokéblocks:
+L_Red = Red Pokéblocks +:
+L_Blue = Blue Pokéblocks +:
+L_Pink = Pink Pokéblocks +:
+L_Green = Green Pokéblocks +:
+L_Yellow = Yellow Pokéblocks +:
+L_Rainbow = Rainbow Pokéblocks +:
+B_RandomizeBerries = Randomize Berries
+B_GiveAllBlocks = Give All Blocks
+B_Cancel = Cancel
+B_Save = Save
+! End
+! -----------------------------------------------------
+- DO NOT CHANGE THIS SECTION.
+! SAV_Link6 = Pokémon Link Tool
+- Change stuff below this line, not above.
+-------------------------------------------------------
+TAB_Main = Main
+TAB_PKM = Pokémon
+TAB_Items = Items
+L_BP = Battle Points:
+L_Pokemiles: PokéMiles
+CHK_LinkAvailable = Pokémon Link Enabled
+B_Import = Import
+B_Export = Export
+B_Cancel = Cancel
+B_Save = Save
+L_Item1 = Item 1:
+L_Item2 = Item 2:
+L_Item3 = Item 3:
+L_Item4 = Item 4:
+L_Item5 = Item 5:
+L_Item6 = Item 6:
+! End
+! -----------------------------------------------------
+- DO NOT CHANGE THIS SECTION.
+! SuperTrain = Super Training Records
+- Change stuff below this line, not above.
+----------------------Buttons--------------------------
+L_Records = Records
+L_Bags = Training Bags
+L_Species = Species:
+L_Unk = L_Unk
+L_Time0 = Time:
+L_Time1 = Time1
+L_Time2 = Time2
+L_UNKNOWN = UNKNOWN
+L_Species2 = Species
+B_Cancel = Cancel
+B_Save = Save
+! -----------------------------------------------------
+- DO NOT CHANGE THIS SECTION.
! SAV_BerryField = Berry Field Viewer
- Change stuff below this line, not above.
-------------------------------------------------------
@@ -525,13 +593,14 @@ B_Cancel = Cancel
- Change stuff below this line, not above.
------------------------------------------------------
L_goto = goto:
-GB_Owned = Owned
-CHK_P1 = Obtained
+GB_Owned = Seen
CHK_P2 = Male
CHK_P3 = Female
CHK_P4 = Shiny Male
CHK_P5 = Shiny Female
-GB_Encountered = Encountered
+GB_Owned = Owned
+CHK_P1 = Obtained
+GB_Displayed = Displayed
CHK_P6 = Male
CHK_P7 = Female
CHK_P8 = Shiny Male
@@ -606,6 +675,7 @@ Label_EncryptionConstant = Encryption Constant:
CHK_Nicknamed = Nickname:
Label_Species = Species:
L_PartyNum = Party Index:
+B_Delete = Delete
B_Close = Save
! End
! -----------------------------------------------------
@@ -613,12 +683,7 @@ B_Close = Save
! SAV_Inventory = Inventory Editor
- Change stuff below this line, not above.
-------------------------------------------------------
-GB_Pouch = Pouches
-B_DisplayBerries = Berry
-B_DisplayMedicine = Medicine
-B_DisplayTMHM = TM/HM
-B_DisplayKeyItems = Key Items
-B_DisplayItems = Items
+B_GiveAll = Give All
B_Save = Save
B_Cancel = Cancel
! End
@@ -723,14 +788,20 @@ L_PPUps = PPUps
-------------------------------------------------------
Tab_Multiplayer = Multiplayer
L_MultiplayerSprite = Multiplayer Sprite:
-L_Style = Style:
+GB_Sayings = Saved Sayings
+L_Saying1 = 1:
+L_Saying2 = 2:
+L_Saying3 = 3:
+L_Saying4 = 4:
+L_Saying5 = 5:
+--
Tab_BadgeMap = Badges/Map
GB_Map = Map Position
L_CurrentMap = Current Map:
L_X = X Coordinate:
L_Z = Z Coordinate:
L_Y = Y Coordinate:
-L_Offset = (offset)
+--
Tab_Appearance = Current Appearance (X/Y)
L_Outfit = Outfit Vals
B_GiveAccessories = Give All Accessories
@@ -745,6 +816,8 @@ L_FacialHair = Facial Hair:
L_Hairstyle = Hairstyle:
L_HairColor = Hair Color:
L_SkinColor = Skin Color:
+--
+Tab_Maison = Maison
GB_MaisonCurrent = Maison Streaks (Current)
L_SuperC = Super
L_NormalC = Normal
@@ -764,32 +837,35 @@ L_SinglesB = Singles:
B_Save = Save
L_Stats = Stats
B_Cancel = Cancel
+--
Tab_Overview = Overview
-L_Seconds = Sec:
-L_Minutes = Min:
-L_Hours = Hrs:
+L_TrainerName = Trainer Name:
L_Language = Language:
-L_PM = PokéMiles:
L_Region = Region:
-L_BP = BP:
L_Country = Country:
B_MaxCash = +
L_3DSReg = 3DS Region:
L_Money = $:
-L_SID = SID:
L_TID = TID:
-L_TrainerName = Trainer Name:
+L_SID = SID:
+-
+GB_Adventure = Adventure Info
+L_Seconds = Sec:
+L_Minutes = Min:
+L_Hours = Hrs:
+L_Started = Game Started:
+L_Fame = HoF Entered:
+L_LastSaved = Last Saved:
+-
+L_PM = PokéMiles:
+L_BP = BP:
+L_Style = Style:
L_Value = Value
-GB_Sayings = Saved Sayings
-L_Saying1 = 1:
-L_Saying2 = 2:
-L_Saying3 = 3:
-L_Saying4 = 4:
-L_Saying5 = 5:
+L_Offset = (offset)
! End
! -----------------------------------------------------
- DO NOT CHANGE THIS SECTION.
-! SAV_Wondercard = Wonder Card I/O
+! SAV_Wondercard = Mystery Gift I/O
- Change stuff below this line, not above.
-------------------------------------------------------
L_Details = Details:
diff --git a/PKHeX/Saves/SaveFile.cs b/PKHeX/Saves/SaveFile.cs
index ae2ea1090..63305c23c 100644
--- a/PKHeX/Saves/SaveFile.cs
+++ b/PKHeX/Saves/SaveFile.cs
@@ -328,7 +328,7 @@ public virtual MysteryGiftAlbum GiftAlbum
public abstract int getDaycareSlotOffset(int loc, int slot);
public abstract uint? getDaycareEXP(int loc, int slot);
public virtual ulong? getDaycareRNGSeed(int loc) { return null; }
- public virtual bool? getDaycareHasEgg(int loc) { return false; }
+ public virtual bool? getDaycareHasEgg(int loc) { return null; }
public abstract bool? getDaycareOccupied(int loc, int slot);
public abstract void setDaycareEXP(int loc, int slot, uint EXP);
diff --git a/PKHeX/Subforms/Save Editors/Gen6/SAV_SuperTrain.Designer.cs b/PKHeX/Subforms/Save Editors/Gen6/SAV_SuperTrain.Designer.cs
index bcccc2442..3f996480f 100644
--- a/PKHeX/Subforms/Save Editors/Gen6/SAV_SuperTrain.Designer.cs
+++ b/PKHeX/Subforms/Save Editors/Gen6/SAV_SuperTrain.Designer.cs
@@ -44,7 +44,7 @@ private void InitializeComponent()
this.TB_Unk = new System.Windows.Forms.MaskedTextBox();
this.L_Unk = new System.Windows.Forms.Label();
this.L_Species = new System.Windows.Forms.Label();
- this.label4 = new System.Windows.Forms.Label();
+ this.L_Time0 = new System.Windows.Forms.Label();
this.L_Records = new System.Windows.Forms.Label();
this.L_Bags = new System.Windows.Forms.Label();
this.L_UNKNOWN = new System.Windows.Forms.Label();
@@ -245,15 +245,15 @@ private void InitializeComponent()
this.L_Species.TabIndex = 129;
this.L_Species.Text = "Species:";
//
- // label4
+ // L_Time0
//
- this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(178, 99);
- this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(33, 13);
- this.label4.TabIndex = 130;
- this.label4.Text = "Time:";
+ this.L_Time0.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.L_Time0.AutoSize = true;
+ this.L_Time0.Location = new System.Drawing.Point(178, 99);
+ this.L_Time0.Name = "L_Time0";
+ this.L_Time0.Size = new System.Drawing.Size(33, 13);
+ this.L_Time0.TabIndex = 130;
+ this.L_Time0.Text = "Time:";
//
// L_Records
//
@@ -292,7 +292,7 @@ private void InitializeComponent()
this.Controls.Add(this.L_UNKNOWN);
this.Controls.Add(this.L_Bags);
this.Controls.Add(this.L_Records);
- this.Controls.Add(this.label4);
+ this.Controls.Add(this.L_Time0);
this.Controls.Add(this.L_Species);
this.Controls.Add(this.L_Unk);
this.Controls.Add(this.TB_Unk);
@@ -339,7 +339,7 @@ private void InitializeComponent()
private System.Windows.Forms.MaskedTextBox TB_Unk;
private System.Windows.Forms.Label L_Unk;
private System.Windows.Forms.Label L_Species;
- private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.Label L_Time0;
private System.Windows.Forms.Label L_Records;
private System.Windows.Forms.Label L_Bags;
private System.Windows.Forms.Label L_UNKNOWN;
diff --git a/PKHeX/Subforms/Save Editors/Gen6/SAV_Trainer.Designer.cs b/PKHeX/Subforms/Save Editors/Gen6/SAV_Trainer.Designer.cs
index 11747e675..60ba5c73c 100644
--- a/PKHeX/Subforms/Save Editors/Gen6/SAV_Trainer.Designer.cs
+++ b/PKHeX/Subforms/Save Editors/Gen6/SAV_Trainer.Designer.cs
@@ -179,8 +179,11 @@ private void InitializeComponent()
this.MT_Stat = new System.Windows.Forms.MaskedTextBox();
this.TC_Editor = new System.Windows.Forms.TabControl();
this.Tab_Overview = new System.Windows.Forms.TabPage();
- this.groupBox1 = new System.Windows.Forms.GroupBox();
- this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.GB_Stats = new System.Windows.Forms.GroupBox();
+ this.GB_Adventure = new System.Windows.Forms.GroupBox();
+ this.L_Fame = new System.Windows.Forms.Label();
+ this.CAL_HoFDate = new System.Windows.Forms.DateTimePicker();
+ this.CAL_HoFTime = new System.Windows.Forms.DateTimePicker();
this.L_Started = new System.Windows.Forms.Label();
this.CAL_AdventureStartDate = new System.Windows.Forms.DateTimePicker();
this.CAL_AdventureStartTime = new System.Windows.Forms.DateTimePicker();
@@ -199,9 +202,6 @@ private void InitializeComponent()
this.Tab_Multiplayer = new System.Windows.Forms.TabPage();
this.Tab_Maison = new System.Windows.Forms.TabPage();
this.Tab_Appearance = new System.Windows.Forms.TabPage();
- this.L_Fame = new System.Windows.Forms.Label();
- this.CAL_HoFDate = new System.Windows.Forms.DateTimePicker();
- this.CAL_HoFTime = new System.Windows.Forms.DateTimePicker();
((System.ComponentModel.ISupportInitialize)(this.PB_Badge8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.PB_Badge6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.PB_Badge4)).BeginInit();
@@ -216,8 +216,8 @@ private void InitializeComponent()
((System.ComponentModel.ISupportInitialize)(this.PB_Sprite)).BeginInit();
this.TC_Editor.SuspendLayout();
this.Tab_Overview.SuspendLayout();
- this.groupBox1.SuspendLayout();
- this.groupBox2.SuspendLayout();
+ this.GB_Stats.SuspendLayout();
+ this.GB_Adventure.SuspendLayout();
this.Tab_BadgeMap.SuspendLayout();
this.GB_Map.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.NUD_Z)).BeginInit();
@@ -1777,8 +1777,8 @@ private void InitializeComponent()
//
// Tab_Overview
//
- this.Tab_Overview.Controls.Add(this.groupBox1);
- this.Tab_Overview.Controls.Add(this.groupBox2);
+ this.Tab_Overview.Controls.Add(this.GB_Stats);
+ this.Tab_Overview.Controls.Add(this.GB_Adventure);
this.Tab_Overview.Controls.Add(this.CB_Vivillon);
this.Tab_Overview.Controls.Add(this.L_Vivillon);
this.Tab_Overview.Controls.Add(this.TB_OTName);
@@ -1808,48 +1808,81 @@ private void InitializeComponent()
this.Tab_Overview.Text = "Overview";
this.Tab_Overview.UseVisualStyleBackColor = true;
//
- // groupBox1
+ // GB_Stats
//
- this.groupBox1.Controls.Add(this.TB_BP);
- this.groupBox1.Controls.Add(this.TB_PM);
- this.groupBox1.Controls.Add(this.L_PM);
- this.groupBox1.Controls.Add(this.TB_Style);
- this.groupBox1.Controls.Add(this.L_Offset);
- this.groupBox1.Controls.Add(this.L_BP);
- this.groupBox1.Controls.Add(this.L_Value);
- this.groupBox1.Controls.Add(this.L_Style);
- this.groupBox1.Controls.Add(this.MT_Stat);
- this.groupBox1.Controls.Add(this.CB_Stats);
- this.groupBox1.Location = new System.Drawing.Point(209, 99);
- this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(171, 151);
- this.groupBox1.TabIndex = 55;
- this.groupBox1.TabStop = false;
- this.groupBox1.Text = "Stats";
+ this.GB_Stats.Controls.Add(this.TB_BP);
+ this.GB_Stats.Controls.Add(this.TB_PM);
+ this.GB_Stats.Controls.Add(this.L_PM);
+ this.GB_Stats.Controls.Add(this.TB_Style);
+ this.GB_Stats.Controls.Add(this.L_Offset);
+ this.GB_Stats.Controls.Add(this.L_BP);
+ this.GB_Stats.Controls.Add(this.L_Value);
+ this.GB_Stats.Controls.Add(this.L_Style);
+ this.GB_Stats.Controls.Add(this.MT_Stat);
+ this.GB_Stats.Controls.Add(this.CB_Stats);
+ this.GB_Stats.Location = new System.Drawing.Point(209, 99);
+ this.GB_Stats.Name = "GB_Stats";
+ this.GB_Stats.Size = new System.Drawing.Size(171, 151);
+ this.GB_Stats.TabIndex = 55;
+ this.GB_Stats.TabStop = false;
+ this.GB_Stats.Text = "Stats";
//
- // groupBox2
+ // GB_Adventure
//
- this.groupBox2.Controls.Add(this.L_Fame);
- this.groupBox2.Controls.Add(this.CAL_HoFDate);
- this.groupBox2.Controls.Add(this.CAL_HoFTime);
- this.groupBox2.Controls.Add(this.L_Started);
- this.groupBox2.Controls.Add(this.CAL_AdventureStartDate);
- this.groupBox2.Controls.Add(this.CAL_LastSavedDate);
- this.groupBox2.Controls.Add(this.L_LastSaved);
- this.groupBox2.Controls.Add(this.MT_Seconds);
- this.groupBox2.Controls.Add(this.MT_Hours);
- this.groupBox2.Controls.Add(this.L_Seconds);
- this.groupBox2.Controls.Add(this.L_Hours);
- this.groupBox2.Controls.Add(this.MT_Minutes);
- this.groupBox2.Controls.Add(this.L_Minutes);
- this.groupBox2.Controls.Add(this.CAL_AdventureStartTime);
- this.groupBox2.Controls.Add(this.CAL_LastSavedTime);
- this.groupBox2.Location = new System.Drawing.Point(3, 99);
- this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(200, 151);
- this.groupBox2.TabIndex = 56;
- this.groupBox2.TabStop = false;
- this.groupBox2.Text = "Adventure Info";
+ this.GB_Adventure.Controls.Add(this.L_Fame);
+ this.GB_Adventure.Controls.Add(this.CAL_HoFDate);
+ this.GB_Adventure.Controls.Add(this.CAL_HoFTime);
+ this.GB_Adventure.Controls.Add(this.L_Started);
+ this.GB_Adventure.Controls.Add(this.CAL_AdventureStartDate);
+ this.GB_Adventure.Controls.Add(this.CAL_LastSavedDate);
+ this.GB_Adventure.Controls.Add(this.L_LastSaved);
+ this.GB_Adventure.Controls.Add(this.MT_Seconds);
+ this.GB_Adventure.Controls.Add(this.MT_Hours);
+ this.GB_Adventure.Controls.Add(this.L_Seconds);
+ this.GB_Adventure.Controls.Add(this.L_Hours);
+ this.GB_Adventure.Controls.Add(this.MT_Minutes);
+ this.GB_Adventure.Controls.Add(this.L_Minutes);
+ this.GB_Adventure.Controls.Add(this.CAL_AdventureStartTime);
+ this.GB_Adventure.Controls.Add(this.CAL_LastSavedTime);
+ this.GB_Adventure.Location = new System.Drawing.Point(3, 99);
+ this.GB_Adventure.Name = "GB_Adventure";
+ this.GB_Adventure.Size = new System.Drawing.Size(200, 151);
+ this.GB_Adventure.TabIndex = 56;
+ this.GB_Adventure.TabStop = false;
+ this.GB_Adventure.Text = "Adventure Info";
+ //
+ // L_Fame
+ //
+ this.L_Fame.Location = new System.Drawing.Point(3, 72);
+ this.L_Fame.Name = "L_Fame";
+ this.L_Fame.Size = new System.Drawing.Size(80, 20);
+ this.L_Fame.TabIndex = 40;
+ this.L_Fame.Text = "HoF Entered:";
+ this.L_Fame.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+ //
+ // CAL_HoFDate
+ //
+ this.CAL_HoFDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
+ this.CAL_HoFDate.Location = new System.Drawing.Point(89, 72);
+ this.CAL_HoFDate.MaxDate = new System.DateTime(2050, 12, 31, 0, 0, 0, 0);
+ this.CAL_HoFDate.MinDate = new System.DateTime(2000, 1, 1, 0, 0, 0, 0);
+ this.CAL_HoFDate.Name = "CAL_HoFDate";
+ this.CAL_HoFDate.Size = new System.Drawing.Size(99, 20);
+ this.CAL_HoFDate.TabIndex = 39;
+ this.CAL_HoFDate.Value = new System.DateTime(2000, 1, 1, 0, 0, 0, 0);
+ //
+ // CAL_HoFTime
+ //
+ this.CAL_HoFTime.CustomFormat = "hh:mm tt";
+ this.CAL_HoFTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+ this.CAL_HoFTime.Location = new System.Drawing.Point(115, 91);
+ this.CAL_HoFTime.MaxDate = new System.DateTime(2050, 12, 31, 0, 0, 0, 0);
+ this.CAL_HoFTime.MinDate = new System.DateTime(2000, 1, 1, 0, 0, 0, 0);
+ this.CAL_HoFTime.Name = "CAL_HoFTime";
+ this.CAL_HoFTime.ShowUpDown = true;
+ this.CAL_HoFTime.Size = new System.Drawing.Size(73, 20);
+ this.CAL_HoFTime.TabIndex = 38;
+ this.CAL_HoFTime.Value = new System.DateTime(2001, 1, 1, 0, 0, 0, 0);
//
// L_Started
//
@@ -2119,39 +2152,6 @@ private void InitializeComponent()
this.Tab_Appearance.Text = "Appearance";
this.Tab_Appearance.UseVisualStyleBackColor = true;
//
- // L_Fame
- //
- this.L_Fame.Location = new System.Drawing.Point(3, 72);
- this.L_Fame.Name = "L_Fame";
- this.L_Fame.Size = new System.Drawing.Size(80, 20);
- this.L_Fame.TabIndex = 40;
- this.L_Fame.Text = "HoF Entered:";
- this.L_Fame.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
- //
- // CAL_HoFDate
- //
- this.CAL_HoFDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.CAL_HoFDate.Location = new System.Drawing.Point(89, 72);
- this.CAL_HoFDate.MaxDate = new System.DateTime(2050, 12, 31, 0, 0, 0, 0);
- this.CAL_HoFDate.MinDate = new System.DateTime(2000, 1, 1, 0, 0, 0, 0);
- this.CAL_HoFDate.Name = "CAL_HoFDate";
- this.CAL_HoFDate.Size = new System.Drawing.Size(99, 20);
- this.CAL_HoFDate.TabIndex = 39;
- this.CAL_HoFDate.Value = new System.DateTime(2000, 1, 1, 0, 0, 0, 0);
- //
- // CAL_HoFTime
- //
- this.CAL_HoFTime.CustomFormat = "hh:mm tt";
- this.CAL_HoFTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
- this.CAL_HoFTime.Location = new System.Drawing.Point(115, 91);
- this.CAL_HoFTime.MaxDate = new System.DateTime(2050, 12, 31, 0, 0, 0, 0);
- this.CAL_HoFTime.MinDate = new System.DateTime(2000, 1, 1, 0, 0, 0, 0);
- this.CAL_HoFTime.Name = "CAL_HoFTime";
- this.CAL_HoFTime.ShowUpDown = true;
- this.CAL_HoFTime.Size = new System.Drawing.Size(73, 20);
- this.CAL_HoFTime.TabIndex = 38;
- this.CAL_HoFTime.Value = new System.DateTime(2001, 1, 1, 0, 0, 0, 0);
- //
// SAV_Trainer
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -2185,10 +2185,10 @@ private void InitializeComponent()
this.TC_Editor.ResumeLayout(false);
this.Tab_Overview.ResumeLayout(false);
this.Tab_Overview.PerformLayout();
- this.groupBox1.ResumeLayout(false);
- this.groupBox1.PerformLayout();
- this.groupBox2.ResumeLayout(false);
- this.groupBox2.PerformLayout();
+ this.GB_Stats.ResumeLayout(false);
+ this.GB_Stats.PerformLayout();
+ this.GB_Adventure.ResumeLayout(false);
+ this.GB_Adventure.PerformLayout();
this.Tab_BadgeMap.ResumeLayout(false);
this.Tab_BadgeMap.PerformLayout();
this.GB_Map.ResumeLayout(false);
@@ -2371,8 +2371,8 @@ private void InitializeComponent()
private System.Windows.Forms.NumericUpDown NUD_M;
private System.Windows.Forms.NumericUpDown NUD_Z;
private System.Windows.Forms.GroupBox GB_Map;
- private System.Windows.Forms.GroupBox groupBox2;
- private System.Windows.Forms.GroupBox groupBox1;
+ private System.Windows.Forms.GroupBox GB_Adventure;
+ private System.Windows.Forms.GroupBox GB_Stats;
private System.Windows.Forms.DateTimePicker CAL_AdventureStartDate;
private System.Windows.Forms.DateTimePicker CAL_AdventureStartTime;
private System.Windows.Forms.Label L_Started;