From 191debe5205e27546597795a718b3d1c8c8aee05 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sat, 10 Sep 2016 13:40:03 -0700 Subject: [PATCH 1/8] Minor qol improvements Closes #251 -- remaining stuff pending a future localization update #240 -- DVs now shown instead of IVs Hides Box tab for saves that do not have Box (ORAS Demo) Hides Daycare Egg Available for gen 1 (use correct return type) --- PKHeX/MainWindow/Main.Designer.cs | 83 +++-- PKHeX/MainWindow/Main.cs | 18 +- PKHeX/MainWindow/Main.resx | 303 ++++++++---------- PKHeX/Resources/text/en/lang_en.txt | 130 ++++++-- PKHeX/Saves/SaveFile.cs | 2 +- .../Gen6/SAV_SuperTrain.Designer.cs | 22 +- .../Save Editors/Gen6/SAV_Trainer.Designer.cs | 174 +++++----- 7 files changed, 410 insertions(+), 322 deletions(-) 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; From 346745d6186476dc4c94526948d7d6e0afd62799 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sat, 10 Sep 2016 14:30:07 -0700 Subject: [PATCH 2/8] Implement past gen strings for 'es' lang Added fallback method to grab the english file if the requested language file does not exist. --- PKHeX/MainWindow/Main.cs | 13 +++++++------ PKHeX/Util/DataUtil.cs | 7 +++++++ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index 3c329d897..52420e86d 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -1099,15 +1099,16 @@ private void InitializeStrings() if (CB_MainLanguage.SelectedIndex < 8) curlanguage = lang_val[CB_MainLanguage.SelectedIndex]; + string l = curlanguage; + // Past Generation strings - g3items = Util.getStringList("ItemsG3", "en"); - g2items = Util.getStringList("ItemsG2", "en"); - g1items = Util.getStringList("ItemsG1", "en"); - metRSEFRLG_00000 = Util.getStringList("rsefrlg_00000", "en"); - metGSC_00000 = Util.getStringList("gsc_00000", "en"); + g3items = Util.getStringListFallback("ItemsG3", l, "en"); + g2items = Util.getStringListFallback("ItemsG2", l, "en"); + g1items = Util.getStringListFallback("ItemsG1", l, "en"); + metRSEFRLG_00000 = Util.getStringListFallback("rsefrlg_00000", l, "en"); + metGSC_00000 = Util.getStringListFallback("gsc_00000", l, "en"); // Current Generation strings - string l = curlanguage; natures = Util.getStringList("natures", l); types = Util.getStringList("types", l); abilitylist = Util.getAbilitiesList(l); diff --git a/PKHeX/Util/DataUtil.cs b/PKHeX/Util/DataUtil.cs index 86ffbf8cb..2c358d39a 100644 --- a/PKHeX/Util/DataUtil.cs +++ b/PKHeX/Util/DataUtil.cs @@ -55,6 +55,13 @@ public static string[] getStringList(string f, string l) rawlist[i] = rawlist[i].Trim(); return rawlist; } + public static string[] getStringListFallback(string f, string l, string fallback) + { + string[] text = getStringList(f, l); + if (text.Length == 0) + text = getStringList(f, fallback); + return text; + } internal static string[] getNulledStringArray(string[] SimpleStringList) { try From da8a538c7372ade39f859f66e6bc026f3dd4dbaf Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sat, 10 Sep 2016 14:31:03 -0700 Subject: [PATCH 3/8] Mono fix getLocationList Fix verified in #229 , still other mono related issues to sort out. --- PKHeX/MainWindow/Main.cs | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index 52420e86d..34c22f173 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -2142,7 +2142,7 @@ private void updateSpecies(object sender, EventArgs e) updateLegality(); } - private IEnumerable getLocationList(GameVersion Version, int SaveFormat, bool egg) + private List getLocationList(GameVersion Version, int SaveFormat, bool egg) { if (egg) { @@ -2167,33 +2167,33 @@ private IEnumerable getLocationList(GameVersion Version, int SaveForm case GameVersion.R: case GameVersion.S: if (SaveFormat == 3) - return metGen3.OrderByDescending(loc => loc.Value <= 87); // Ferry + return metGen3.OrderByDescending(loc => loc.Value <= 87).ToList(); // Ferry break; case GameVersion.E: if (SaveFormat == 3) - return metGen3.OrderByDescending(loc => loc.Value <= 87 || (loc.Value >= 196 && loc.Value <= 212)); // Trainer Hill + return metGen3.OrderByDescending(loc => loc.Value <= 87 || (loc.Value >= 196 && loc.Value <= 212)).ToList(); // Trainer Hill break; case GameVersion.FR: case GameVersion.LG: if (SaveFormat == 3) - return metGen3.OrderByDescending(loc => loc.Value > 87 && loc.Value < 197); // Celadon Dept. + return metGen3.OrderByDescending(loc => loc.Value > 87 && loc.Value < 197).ToList(); // Celadon Dept. break; case GameVersion.D: case GameVersion.P: if (SaveFormat == 4 || (SaveFormat >= 5 && egg)) - return metGen4.Take(4).Concat(metGen4.Skip(4).OrderByDescending(loc => loc.Value <= 111)); // Battle Park + return metGen4.Take(4).Concat(metGen4.Skip(4).OrderByDescending(loc => loc.Value <= 111)).ToList(); // Battle Park break; case GameVersion.Pt: if (SaveFormat == 4 || (SaveFormat >= 5 && egg)) - return metGen4.Take(4).Concat(metGen4.Skip(4).OrderByDescending(loc => loc.Value <= 125)); // Rock Peak Ruins + return metGen4.Take(4).Concat(metGen4.Skip(4).OrderByDescending(loc => loc.Value <= 125)).ToList(); // Rock Peak Ruins break; case GameVersion.HG: case GameVersion.SS: if (SaveFormat == 4 || (SaveFormat >= 5 && egg)) - return metGen4.Take(4).Concat(metGen4.Skip(4).OrderByDescending(loc => loc.Value > 125 && loc.Value < 234)); // Celadon Dept. + return metGen4.Take(4).Concat(metGen4.Skip(4).OrderByDescending(loc => loc.Value > 125 && loc.Value < 234)).ToList(); // Celadon Dept. break; case GameVersion.B: @@ -2202,27 +2202,27 @@ private IEnumerable getLocationList(GameVersion Version, int SaveForm case GameVersion.B2: case GameVersion.W2: - return metGen5.Take(3).Concat(metGen5.Skip(3).OrderByDescending(loc => loc.Value <= 116)); // Abyssal Ruins + return metGen5.Take(3).Concat(metGen5.Skip(3).OrderByDescending(loc => loc.Value <= 116)).ToList(); // Abyssal Ruins case GameVersion.X: case GameVersion.Y: - return metGen6.Take(3).Concat(metGen6.Skip(3).OrderByDescending(loc => loc.Value <= 168)); // Unknown Dungeon + return metGen6.Take(3).Concat(metGen6.Skip(3).OrderByDescending(loc => loc.Value <= 168)).ToList(); // Unknown Dungeon case GameVersion.OR: case GameVersion.AS: - return metGen6.Take(3).Concat(metGen6.Skip(3).OrderByDescending(loc => loc.Value > 168 && loc.Value <= 354)); // Secret Base + return metGen6.Take(3).Concat(metGen6.Skip(3).OrderByDescending(loc => loc.Value > 168 && loc.Value <= 354)).ToList(); // Secret Base } // Currently on a future game, return corresponding list for generation if (Version <= GameVersion.CXD && SaveFormat == 4) return metGen4.Where(loc => loc.Value == 0x37) // Pal Park to front .Concat(metGen4.Take(4)) - .Concat(metGen4.Skip(4).Where(loc => loc.Value != 0x37)); + .Concat(metGen4.Skip(4).Where(loc => loc.Value != 0x37)).ToList(); if (Version < GameVersion.X && SaveFormat >= 5) // PokéTransfer to front return metGen5.Where(loc => loc.Value == 30001) .Concat(metGen5.Take(3)) - .Concat(metGen5.Skip(3).Where(loc => loc.Value != 30001)); + .Concat(metGen5.Skip(3).Where(loc => loc.Value != 30001)).ToList(); return metGen6; } From cd0f04eadd8dc5abf49d67c10959697bd694bdfd Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sat, 10 Sep 2016 14:43:51 -0700 Subject: [PATCH 4/8] Fix IV/DV label gen2 #240 Gen3 onward = IV Gen1/2 = DV --- PKHeX/MainWindow/Main.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index 34c22f173..0f76d5c2a 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -898,13 +898,13 @@ private void loadSAV(SaveFile sav, string path) BTN_Ribbons.Visible = SAV.Generation >= 3; CB_HPType.Enabled = CB_Form.Enabled = SAV.Generation >= 3; BTN_RerollPID.Visible = Label_PID.Visible = TB_PID.Visible = Label_SID.Visible = TB_SID.Visible = SAV.Generation >= 3; + Label_IVs.Visible = SAV.Generation >= 3; // DVs appears instead FLP_FriendshipForm.Visible = SAV.Generation >= 2; FLP_HeldItem.Visible = SAV.Generation >= 2; 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; From 0a1fc199ba2734fb09240e00554e0a535c4219eb Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sat, 10 Sep 2016 17:14:25 -0700 Subject: [PATCH 5/8] Remove DVs label, readonly->enable IV We're gonna call them IVs for gen1/2 because this is {CURRENT YEAR}. Too much of a hassle to have multiple controls hidden just for generation specific nomenclature differences. Change the Readonly for HP & SpD to Enabled (and flip bool states); mask now appears to enforce non-centering, no need to pad with 0 to fake that it's centered. Closes #255, 8 bits down. --- PKHeX/MainWindow/Main.Designer.cs | 53 +- PKHeX/MainWindow/Main.cs | 13 +- PKHeX/MainWindow/Main.resx | 734 +--------------------------- PKHeX/Resources/text/en/lang_en.txt | 1 - 4 files changed, 20 insertions(+), 781 deletions(-) diff --git a/PKHeX/MainWindow/Main.Designer.cs b/PKHeX/MainWindow/Main.Designer.cs index ccd735cad..b3436b74b 100644 --- a/PKHeX/MainWindow/Main.Designer.cs +++ b/PKHeX/MainWindow/Main.Designer.cs @@ -157,9 +157,6 @@ 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(); @@ -429,6 +426,7 @@ public void InitializeComponent() this.mnuLSave = new System.Windows.Forms.ToolStripMenuItem(); this.PB_Legal = new System.Windows.Forms.PictureBox(); this.L_UpdateAvailable = new System.Windows.Forms.LinkLabel(); + this.Label_IVs = new System.Windows.Forms.Label(); this.tabMain.SuspendLayout(); this.Tab_Main.SuspendLayout(); this.FLP_Main.SuspendLayout(); @@ -475,7 +473,6 @@ 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(); @@ -2082,7 +2079,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.FLP_IVs); + this.FLP_StatsHeaderRight.Controls.Add(this.Label_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); @@ -2091,37 +2088,6 @@ 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); - this.Label_IVs.Margin = new System.Windows.Forms.Padding(0); - this.Label_IVs.Name = "Label_IVs"; - this.Label_IVs.Size = new System.Drawing.Size(30, 21); - this.Label_IVs.TabIndex = 26; - 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); @@ -5500,6 +5466,16 @@ public void InitializeComponent() this.L_UpdateAvailable.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.L_UpdateAvailable.Visible = false; // + // Label_IVs + // + this.Label_IVs.Location = new System.Drawing.Point(0, 0); + this.Label_IVs.Margin = new System.Windows.Forms.Padding(0); + this.Label_IVs.Name = "Label_IVs"; + this.Label_IVs.Size = new System.Drawing.Size(30, 21); + this.Label_IVs.TabIndex = 29; + this.Label_IVs.Text = "IVs"; + this.Label_IVs.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // // Main // this.AllowDrop = true; @@ -5583,7 +5559,6 @@ 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(); @@ -5781,7 +5756,6 @@ public void InitializeComponent() private System.Windows.Forms.Label Label_HiddenPowerPrefix; private System.Windows.Forms.Label Label_Stats; private System.Windows.Forms.Label Label_EVs; - private System.Windows.Forms.Label Label_IVs; private System.Windows.Forms.Label Label_Total; private System.Windows.Forms.Label Label_SPE; private System.Windows.Forms.Label Label_SPD; @@ -6122,8 +6096,7 @@ 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; + private System.Windows.Forms.Label Label_IVs; } } diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index 0f76d5c2a..a8c11af23 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -898,7 +898,6 @@ private void loadSAV(SaveFile sav, string path) BTN_Ribbons.Visible = SAV.Generation >= 3; CB_HPType.Enabled = CB_Form.Enabled = SAV.Generation >= 3; BTN_RerollPID.Visible = Label_PID.Visible = TB_PID.Visible = Label_SID.Visible = TB_SID.Visible = SAV.Generation >= 3; - Label_IVs.Visible = SAV.Generation >= 3; // DVs appears instead FLP_FriendshipForm.Visible = SAV.Generation >= 2; FLP_HeldItem.Visible = SAV.Generation >= 2; @@ -933,7 +932,7 @@ private void loadSAV(SaveFile sav, string path) FLP_SpD.Visible = false; Label_SPA.Visible = false; Label_SPC.Visible = true; - TB_HPIV.ReadOnly = true; + TB_HPIV.Enabled = false; MaskedTextBox[] evControls = { TB_SPAEV, TB_HPEV, TB_ATKEV, TB_DEFEV, TB_SPEEV, TB_SPDEV }; foreach (var ctrl in evControls) { @@ -946,8 +945,8 @@ private void loadSAV(SaveFile sav, string path) FLP_SpD.Visible = true; Label_SPA.Visible = true; Label_SPC.Visible = false; - TB_SPDEV.ReadOnly = TB_SPDIV.ReadOnly = true; - TB_HPIV.ReadOnly = true; + TB_SPDEV.Enabled = TB_SPDIV.Enabled = false; + TB_HPIV.Enabled = false; MaskedTextBox[] evControls = { TB_SPAEV, TB_HPEV, TB_ATKEV, TB_DEFEV, TB_SPEEV, TB_SPDEV }; foreach (var ctrl in evControls) { @@ -960,8 +959,8 @@ private void loadSAV(SaveFile sav, string path) FLP_SpD.Visible = true; Label_SPA.Visible = true; Label_SPC.Visible = false; - TB_SPDEV.ReadOnly = TB_SPDIV.ReadOnly = false; - TB_HPIV.ReadOnly = false; + TB_SPDEV.Enabled = TB_SPDIV.Enabled = true; + TB_HPIV.Enabled = true; MaskedTextBox[] evControls = { TB_SPAEV, TB_HPEV, TB_ATKEV, TB_DEFEV, TB_SPEEV, TB_SPDEV }; foreach (var ctrl in evControls) { @@ -1789,7 +1788,7 @@ private void updateIVs(object sender, EventArgs e) if (SAV.Generation < 3) { - TB_HPIV.Text = pkm.IV_HP.ToString("00"); + TB_HPIV.Text = pkm.IV_HP.ToString(); TB_SPDIV.Text = TB_SPAIV.Text; if (SAV.Generation == 2) { diff --git a/PKHeX/MainWindow/Main.resx b/PKHeX/MainWindow/Main.resx index e5c0098ac..83c30b379 100644 --- a/PKHeX/MainWindow/Main.resx +++ b/PKHeX/MainWindow/Main.resx @@ -129,15 +129,6 @@ True - - True - - - True - - - True - @@ -164,33 +155,12 @@ True - - True - - - True - - - True - True True - - True - - - True - - - True - - - True - True @@ -200,21 +170,6 @@ True - - True - - - True - - - True - - - True - - - True - True @@ -233,30 +188,12 @@ True - - True - - - True - True True - - True - - - True - - - True - - - True - True @@ -275,33 +212,9 @@ True - - True - - - True - - - True - - - True - True - - True - - - True - - - True - - - True - True @@ -317,15 +230,6 @@ True - - True - - - True - - - True - True @@ -335,27 +239,9 @@ True - - True - - - True - True - - True - - - True - - - True - - - True - True @@ -371,18 +257,6 @@ True - - True - - - True - - - True - - - True - True @@ -395,18 +269,6 @@ True - - True - - - True - - - True - - - True - True @@ -425,36 +287,12 @@ True - - True - - - True - - - True - - - True - True True - - True - - - True - - - True - - - True - True @@ -467,18 +305,6 @@ True - - True - - - True - - - True - - - True - True @@ -491,15 +317,6 @@ True - - True - - - True - - - True - True @@ -509,57 +326,6 @@ True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - True @@ -602,10 +368,7 @@ True - - True - - + True @@ -614,30 +377,6 @@ True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - True @@ -650,30 +389,9 @@ True - - True - - - True - - - True - True - - True - - - True - - - True - - - True - True @@ -686,9 +404,6 @@ True - - True - True @@ -698,18 +413,6 @@ True - - True - - - True - - - True - - - True - True @@ -722,30 +425,9 @@ True - - True - - - True - - - True - True - - True - - - True - - - True - - - True - True @@ -758,18 +440,6 @@ True - - True - - - True - - - True - - - True - True @@ -782,18 +452,6 @@ True - - True - - - True - - - True - - - True - True @@ -809,18 +467,6 @@ True - - True - - - True - - - True - - - True - True @@ -836,24 +482,6 @@ True - - True - - - True - - - True - - - True - - - True - - - True - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAeZJREFUOE+1 @@ -925,30 +553,6 @@ True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAeZJREFUOE+1 @@ -1071,57 +675,6 @@ True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - True @@ -1134,27 +687,9 @@ True - - True - - - True - - - True - True - - True - - - True - - - True - iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -1312,33 +847,6 @@ True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - True @@ -1375,108 +883,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 @@ -1582,42 +988,6 @@ True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - iVBORw0KGgoAAAANSUhEUgAAAG8AAACgCAYAAAACezIBAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -1731,24 +1101,6 @@ True - - True - - - True - - - True - - - True - - - True - - - True - iVBORw0KGgoAAAANSUhEUgAAAG8AAACgCAYAAAACezIBAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -1819,54 +1171,6 @@ True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - True @@ -1906,18 +1210,12 @@ True - - True - True True - - True - True @@ -1927,36 +1225,6 @@ 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 633fe5432..2da4c4a78 100644 --- a/PKHeX/Resources/text/en/lang_en.txt +++ b/PKHeX/Resources/text/en/lang_en.txt @@ -96,7 +96,6 @@ Label_EggDate = Date: Tab_Stats = Stats CHK_HackedStats = Hacked Stats Label_IVs = IVs -Label_DVs = DVs Label_EVs = EVs Label_Stats = Stats Label_HP = HP: From 946a475e68e98b148bfb0ebf5444dd9471175a2e Mon Sep 17 00:00:00 2001 From: easyworld Date: Sun, 11 Sep 2016 11:15:50 +0800 Subject: [PATCH 6/8] Chinese translations for Gen 1-3 --- PKHeX/PKHeX.csproj | 5 + PKHeX/Resources/text/gen3/text_ItemsG1_zh.txt | Bin 0 -> 1690 bytes PKHeX/Resources/text/gen3/text_ItemsG2_zh.txt | 255 ++++++++++++++++++ PKHeX/Resources/text/gen3/text_ItemsG3_zh.txt | Bin 0 -> 3552 bytes .../Resources/text/gen3/text_gsc_00000_zh.txt | Bin 0 -> 956 bytes .../text/gen3/text_rsefrlg_00000_zh.txt | Bin 0 -> 2688 bytes 6 files changed, 260 insertions(+) create mode 100644 PKHeX/Resources/text/gen3/text_ItemsG1_zh.txt create mode 100644 PKHeX/Resources/text/gen3/text_ItemsG2_zh.txt create mode 100644 PKHeX/Resources/text/gen3/text_ItemsG3_zh.txt create mode 100644 PKHeX/Resources/text/gen3/text_gsc_00000_zh.txt create mode 100644 PKHeX/Resources/text/gen3/text_rsefrlg_00000_zh.txt diff --git a/PKHeX/PKHeX.csproj b/PKHeX/PKHeX.csproj index 78abf06ba..261a58160 100644 --- a/PKHeX/PKHeX.csproj +++ b/PKHeX/PKHeX.csproj @@ -454,6 +454,11 @@ + + + + + diff --git a/PKHeX/Resources/text/gen3/text_ItemsG1_zh.txt b/PKHeX/Resources/text/gen3/text_ItemsG1_zh.txt new file mode 100644 index 0000000000000000000000000000000000000000..4dc19307a591592458aba0139ad1e0d540217910 GIT binary patch literal 1690 zcmds%OHWfl6o8L0Mw~?18I4g`U_=uW?xXTrn7AnkTH4+M#YV_B$##iedhB;0A3Fa>5o0)s&JLlX-I+YJ= zuH!&pxc<}l&Nc$8cV|O%92{Ze^I*G|&R*o3hi0sK8=Pc2N1Z^D@X=y|-BE>WlPqdTb|6)7BCvflYtEBeH)EDr z=@ahWiv0FHX##VBxxiz8z)WDb>CZL#EWS15wA0))-)x98t%O#fn*y6-yfaIQWQ=oP zbY7*k>(AJ(>5ZGIDh;(m`tAQ>~O=gr}O(Olyr zaL@WWmax+*@+#)l@EtKuAZK*OLAyosx!%ZjsbM8RV3+bE!rlN{ErD*wRcH3-aLXwdTI@vIS5shF(BN)*LMwy6HxK@Z% zgjBpuf}RbF6}GaXrwG6u0&s_*e>eO-?ht@G1pSZ3cez6V?hw%-qC-T7hz=1QB5;R@ z4iOz9aEFKv2^|tTBy>pVkkBEaLqdmy4hbC+I%IUn=#bGNql5lqST|&J$mo#KA)`Y^ ThXEZ1bQsWKK!*Vx2Ho)&6M}l= literal 0 HcmV?d00001 diff --git a/PKHeX/Resources/text/gen3/text_ItemsG2_zh.txt b/PKHeX/Resources/text/gen3/text_ItemsG2_zh.txt new file mode 100644 index 000000000..2a78584d7 --- /dev/null +++ b/PKHeX/Resources/text/gen3/text_ItemsG2_zh.txt @@ -0,0 +1,255 @@ +(无) +掌门球 +高级球 +亮光之粉 +超级球 +精灵球 +卡比丘 (0) +自行车 +月之石 +解毒剂 +灼伤药 +解冻药 +解眠药 +解麻药 +回复药水 +全满药水 +超高级药水 +超级药水 +药水 +脱离洞穴的绳子 +除虫喷雾器 +PP全补剂 +火之石 +雷之石 +水之石 +卡比丘 (1) +HP提升剂 +攻击牛磺剂 +防御提升剂 +效果防护 +幸运之拳 +特攻增加剂 +神奇糖果 +命中加强 +叶之石 +金属粉 +金色珠 +皮皮玩偶 +万能药 +更生剂 +特级更生剂 +防御效果 +白银喷雾器 +黄金喷雾器 +要害攻击 +卡比丘 (2) +美味之水 +塞可汽水 +综合调味乳 +力量增强 +卡比丘 (3) +伤害预防 +速度增加 +特殊增强 +代币盒 +蓝色卡片 +卡比丘 (4) +学习装置 +破烂钓竿 +优秀钓竿 +银叶 +超强钓竿 +PP提升剂 +PP小补剂 +PP单补剂 +PP大补剂 +红色的鳞片 +秘传之药 +船票 +神奇之蛋 +透明铃铛 +银色之翼 +摩摩牛奶 +先攻之爪 +解毒的果实 +金叶 +柔软的沙子 +尖锐的鸟嘴 +消除麻痹的果实 +烧烤的果实 +冰冻的果实 +毒针 +王者之证 +苦涩的果实 +薄荷的果实 +红色圆柑果实 +小蘑菇 +大蘑菇 +银色的粉 +蓝色圆柑果实 +卡比丘 (5) +护身金币 +黄色圆柑果实 +绿色圆柑果实 +净身的护身符 +神秘的水滴 +弯曲的汤匙 +白色圆柑果实 +黑色带子 +黑色圆柑果实 +卡比丘 (6) +桃色圆柑果实 +黑色的眼镜 +美味尾巴 +粉红色丝带 +大葱 +烟雾球 +融化不了的冰块 +磁铁 +奇迹的果实 +珍珠 +大珍珠 +不变之石 +诅咒护身符 +愤怒馒头 +GS球* +蓝色卡片* +奇迹种子 +胖骨头 +振奋精神的头布 +卡比丘 (7) +元气之粉 +元气之根 +万能之粉 +复活草 +硬石头 +幸运蛋 +卡片钥匙 +机械的零件 +神奇宝贝蛋兑换券 +掉落的东西 +星星的沙子 +星星的碎片 +地下室钥匙 +定期月票 +卡比丘 (8) +卡比丘 (9) +卡比丘 (10) +木灰 +树果汁 +对焦镜片 +卡比丘 (11) +卡比丘 (12) +金属涂层 +龙之牙 +卡比丘 (13) +吃剩下的东西 +卡比丘 (14) +卡比丘 (15) +卡比丘 (16) +神奇的果实 +龙之鳞片 +破坏性的遗传因子 +卡比丘 (17) +卡比丘 (18) +卡比丘 (19) +神圣之灰 +重量球 +花案邮件 +等级球 +诱饵球 +速度球 +卡比丘 (20) +电气球 +友友球 +月亮球 +爱心球 +木箱 +桐木箱 +太阳之石 +水玉色之带 +卡比丘 (21) +升级 +树果 +黄金的果实 +杰尼龟喷壶 +卡比丘 (22) +公园球 +彩虹之翼 +卡比丘 (23) +砖瓦碎片 +冲浪邮件 +海洋邮件 +肖像邮件 +可爱邮件 +伊布邮件 +变身邮件 +蓝天邮件 +音符邮件 +梦幻邮件 +卡比丘 (24) +TM01 +TM02 +TM03 +TM04 +TM04 (未使用) +TM05 +TM06 +TM07 +TM08 +TM09 +TM10 +TM11 +TM12 +TM13 +TM14 +TM15 +TM16 +TM17 +TM18 +TM19 +TM20 +TM21 +TM22 +TM23 +TM24 +TM25 +TM26 +TM27 +TM28 +TM28 (未使用) +TM29 +TM30 +TM31 +TM32 +TM33 +TM34 +TM35 +TM36 +TM37 +TM38 +TM39 +TM40 +TM41 +TM42 +TM43 +TM44 +TM45 +TM46 +TM47 +TM48 +TM49 +TM50 +HM01 +HM02 +HM03 +HM04 +HM05 +HM06 +HM07 +HM08 (未使用) +HM09 (未使用) +HM10 (未使用) +HM11 (未使用) +HM12 (未使用) \ No newline at end of file diff --git a/PKHeX/Resources/text/gen3/text_ItemsG3_zh.txt b/PKHeX/Resources/text/gen3/text_ItemsG3_zh.txt new file mode 100644 index 0000000000000000000000000000000000000000..33a4521df05f600fd4b70c181ecdfed047ecd7c1 GIT binary patch literal 3552 zcmds3du&rx7(Y6Vdd-|ff~dops0<;7_4W=OLyQ_zNcFC-ZN1*wYPYVPYqzeYw=H%T zD0i?rx>4CWH%12)L1LUFYLsXU2+kOTGBk<`h-i$O_#Bx|bn|>WI|oBzG||7zP0sf_ zukUxx`CfNwasfK!xdm}(Q{7j+1*$XAMe7|R$ZY?uPLM6@1wV&APaSQ#+rptl@TRJk_0WICOymvG znSKuB$(llm?C_aCYbK~Y4QHd6qD#cz*TRl74J8rK91rbQDehVmwi!j>b=tqTw)p}5 zre10**c7&fMGiIAH`dD`MdHvs=GlIum`YGo;o}f!CS!$CWnd-dFyXJr;pqS#z}41s zxKuiaeP)7>XS#wPiSyDNI-!M%2%483vvUY^bj1uI!axu(5H!VR??mu%)9rsLSKwDTQfIKji&T2fn&r^1 zF~EFwhl`G{@C`ph>rqYwMZ@0h-XWSrtkQnrmm!xasAwJ7T#_aTk>1uj@&Lv6NO#qAcDjfWmz>?ZMoycYE4=0IP>7S*J)G6dtR!Z%=&7;UZWX`b?aV!p`_0m#jz-dF7*=G6eRNJnQ;MoB+QRniTpdwMUGh;-o##7DiKN79}b@i!zhs@ z4J8el((i}!6HI(%G!sg~x`QsGcybUtithinQhFqm9Ns*R<85*C=T?Hg=^YjcTI${F zBWQtlpGwea|JDFOr^4H0f?8ds8T4&%zLSjY@~yWMWRNDh2`ZGnnBjP`TlWZu_5`lR zv0NOv2e)4)x8V1QWuC@3uTCT(YV3GTabya6)Ra0RfoJvie~jBFyUQA(cS5_+WtbkH z8+jb>m{LvRvslJ53%tj1UdyXjwS(3Z8nmgz%61M}`hek3?pF_CdZ7{KD|~0$L1QYh z(Hq6`P%h&s-UvFt#~#*z^CGNcQQP4hoT=3@u^RY3X{x|)7t5TQK9xx{;C!{Htqkid zj==6OlSR0d`+(mdz2%<1!%(;iWGqu0ft7i+e+c@PzAD`2RXvW8DYc{lUZr@`>6$@r z4*SDjS$bGpX(pKv@>9!t$c0N?ODvVWuLdDT8svw>H#(ZvaA<|O(qj}CV(&@G18$>u zum?OU5+r*}*#Y?zcacj|1Zfh-TW9!UoM8`iVju4bB{c=|?@sqKU89)`oE+M3ex^%P zpg;dn;+KN|Of!dm3`7G)QNkPqogC!Qr@_fARGC8Y*i5u6t}{xnC7f~KD!|%e&LiD# zZ{W~`Jipb^3;sQtaXONLyB!=Vur*pP7d53=T$94~AEFUZ9+^E|GSUI%73;7?;1-G6j{-U0#f%h|5cdNLMD*<`w zXrQ^JyS2ZcL)#zvsh1$QH_jh8`@((Ug+EyP^Z?wTRBFXO_g6Omzl=kLB;E!!n4nZ5 zuMz|mk|3y>1o;P=(%-DRucM(G|DT8#IFBk2y`kj8R`41j_Ihwj&lHZ#xmEk)1huD^ zx(KRB`r_o@r&N;D*KWSA1H7BQ=eAVT~7a~(U~-znguzARJ~9s1dtm+y3I3gP0<>kH@gmz>vsPu$|9duRD7d~>Xz zb&g|Uh#pMD5EzHRI0VKaFb;un2#iBu90KDgpXOM>Y)%l^ zgCMX6L0}Jpz#asFJqQAO5Crz1aYW_C)(IRj@F%%Vo|iU?*Wo%rGA{9Hv)NsDy9F|z zNq)ejDFzed&tvfs`Q}yoahyOzla=L>=X}(gK@;)ep`kH5L616HT}7KmQsBunH@s78 z=q;oH! zDEJem_k+8T*k0#dX(lL@Sma&e8Oe_0YL{2H$q;oXG$NaVdmNYeKE(gJUsx9=qk+kq FKLCM4`6d7W literal 0 HcmV?d00001 diff --git a/PKHeX/Resources/text/gen3/text_gsc_00000_zh.txt b/PKHeX/Resources/text/gen3/text_gsc_00000_zh.txt new file mode 100644 index 0000000000000000000000000000000000000000..d609b839a94a161e74d9835e39b23d7189ccd083 GIT binary patch literal 956 zcmezWPlLgaA)g_SA(cUsfs5g3)3;#vsay<343-SvgWvaZF>r=#Y+{PzVlZYffQlG1 z7(!Vg8PhXBa_ymSgZDOh`-Mb+)EPl#?WY+{@2?D>@Ux$bVUpjyez{zbtT9wJJ!4%N z$R@WCw~*REZ@;O2Tnqsjf*I4(L8?rksvhQDoCva^K5lJ_X(_~fQ>fglMzg}4z_(!_ z^=42pV+M05i!IzR9i;Q{l-pB4`koi46+-k|z}3S1=$dy$#En#5qv5RlJI;C@v}6iV>+3(EtE!F;wM z@YOV_37`65F#lbgH$4p^0`pyM*|#Zjx$}XlQMU3F~!t6H)51zmU583tU--1CV8iXs% z2gM{ToME8}3(J);g)z&gfpi+e!|y@rF29SxrlmK5F4wNT*aUJph(^R}W_)EE$n=X7 zAu(YH_n9HwPlj;c7{Xm`2zRw1+@*$aw;3|PT<4m*s19VlAv|3h!CiMII3OAnw~OjF zHG^m)xZOr@yB7q`2BuL^Y#G5_@wxnC(~Vj4gF#}j7&3y}{ddB-aKQp*pq)l=SG-`|EW-CPXae&756dPFfS literal 0 HcmV?d00001 diff --git a/PKHeX/Resources/text/gen3/text_rsefrlg_00000_zh.txt b/PKHeX/Resources/text/gen3/text_rsefrlg_00000_zh.txt new file mode 100644 index 0000000000000000000000000000000000000000..6a766defee3c4390958f75e7485dfbdfc7b3c586 GIT binary patch literal 2688 zcmb_eUrbw77(ZJd=I%6;nBZQdRii7g#r{LUkPsgxiB0ZyxrEZ(+6uE2))sCjZEZ=f zgBB75Y;mqc7-NBj$qa%nF+rb}nI+3~j?4#)ZZn%E`k;hh_+z5=d_6s!!?H(1$oD(n z`SbhE`M%$GoBOxSmx$Dz5zsI4LK1r;+znus34sGT5BvPlEll)fNEjJR!=v z-2z&XrZZs66MLG#Hp|nQm;|UIc_lw%3pht%oYUr9VE1+U_O$47_UX`Vo7i^E}(mAPdwxj(9IEjcv8MO@``LgMl_|}N#(Q&Wi1M; zx0C}d4NcTfyax0VGUR8F=XML(#dbi2{@FI_gPP1~7qfCkKsrx#uYeZ3P^|)bHK=bb zQgyfnDLRjN%Y5%1HHLw6SH`bGT+6X*%AVsd9RCfUa3uJ9M@g^?M;#5Gag+GTtI#p* zJTHw)c5!8x#>=9bY3p{6<1?=hd@%B6Y&VX=AuoF0Qo#3zY6|Ulr92G5ehbRqU)q#H zF1W*10kJuq`}Kyk=mmx4hh`CWmO59xFNS9E`TJetuCfyl`$qvorz5kK2HigpJ&w~j zj)TLk={^b8$K!T!6~7zY`)`NIA)seF9>@aHM;G$Fp~`*h9Z+tK>w7;~QNEJ`Tb@|z zh2AjlThI4~c2BGy{6~UQ8rUiA^CaAJExOvfJT{3>TpIcM9Lx}n!Rt>bEAmX+VezU5 zVy9|-)C^HERV`I4RV!60RVh^{RVPy>-w$YKpr`VkfS$~E0eU*$0Vo4gKhr)_KGQu@ zJyn{3b57%jw5sd6&Xzj^(k5miS+QgGof_p&aL4ML6UsBg4X5r!1T^ak zxrpYzk&or8o1Bq~gw>D78gRWq)e!ys?EO+)k}JYL;L1dzU4$ALD%iaR`(q>Ve^?mn z3O0y!2J8K*FGTe5?b{Pd6suG~KL7ndG^kOA3ap2`6+8cGgtx!cQ90z5Kw&y@LV=NhYP0j+X8E#4R7#?RnxPRx)i7+s zc|p2Xt Date: Sat, 10 Sep 2016 23:12:22 -0700 Subject: [PATCH 7/8] Fix gen3 ability dupe Thanks @ricksee ! Gen3 second ability for same-ability mons is stored as 0, same deal for gen4. MainPK4 alteration is an unneeded-code removal, gen4 only has abil0&1, not 2 (hidden) like gen5. Closes #256 --- PKHeX/MainWindow/Main.cs | 2 +- PKHeX/MainWindow/MainPK4.cs | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index a8c11af23..a57a53091 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -1460,7 +1460,7 @@ private void setAbilityList() formnum = CB_Form.SelectedIndex; int[] abils = SAV.Personal.getAbilities(species, formnum); - if (abils[1] == 0) + if (abils[1] == 0 && SAV.Generation != 3) abils[1] = abils[0]; string[] abilIdentifier = {" (1)", " (2)", " (H)"}; List ability_list = abils.Where(a => a != 0).Select((t, i) => abilitylist[t] + abilIdentifier[i]).ToList(); diff --git a/PKHeX/MainWindow/MainPK4.cs b/PKHeX/MainWindow/MainPK4.cs index fef518fd0..ca7c299ad 100644 --- a/PKHeX/MainWindow/MainPK4.cs +++ b/PKHeX/MainWindow/MainPK4.cs @@ -137,8 +137,6 @@ private void populateFieldsPK4() if (abil < 0) CB_Ability.SelectedIndex = 0; - else if (abil == 2) - CB_Ability.SelectedIndex = 2; else if (abils[0] == abils[1] || abils[1] == 0) CB_Ability.SelectedIndex = pk4.PIDAbility; else From f7afb8805259927400213df25e009bc1c5ae729b Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sat, 10 Sep 2016 23:14:52 -0700 Subject: [PATCH 8/8] Fix gen3 inventory bugs Thanks @sora10pls ! Premier Ball already in Balls pocket (remove from General Items list) Hide [Give All] button in Gen3, same treatment as Gen1/2. Closes #257 --- PKHeX/Legality/Tables3.cs | 2 +- PKHeX/Subforms/Save Editors/SAV_Inventory.cs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/PKHeX/Legality/Tables3.cs b/PKHeX/Legality/Tables3.cs index d94fa86f3..41d5b0c59 100644 --- a/PKHeX/Legality/Tables3.cs +++ b/PKHeX/Legality/Tables3.cs @@ -7,7 +7,7 @@ public static partial class Legal // PKHeX Valid Array Storage #region RS internal static readonly ushort[] Pouch_Items_RS = { - 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 63, 64, 65, 66, 67, 68, 69, 70, 71, 73, 74, 75, 76, 77, 78, 79, 80, 81, 83, 84, 85, 86, 93, 94, 95, 96, 97, 98, 103, 104, 106, 107, 108, 109, 110, 111, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 254, 255, 256, 257, 258 + 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 63, 64, 65, 66, 67, 68, 69, 70, 71, 73, 74, 75, 76, 77, 78, 79, 80, 81, 83, 84, 85, 86, 93, 94, 95, 96, 97, 98, 103, 104, 106, 107, 108, 109, 110, 111, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 254, 255, 256, 257, 258 }; internal static readonly ushort[] Pouch_Key_RS = { 259, 260, 261, 262, 263, 264, 265, 266, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288 diff --git a/PKHeX/Subforms/Save Editors/SAV_Inventory.cs b/PKHeX/Subforms/Save Editors/SAV_Inventory.cs index f520a03fa..963b2bedb 100644 --- a/PKHeX/Subforms/Save Editors/SAV_Inventory.cs +++ b/PKHeX/Subforms/Save Editors/SAV_Inventory.cs @@ -23,6 +23,7 @@ public SAV_Inventory() break; case 3: itemlist = Main.g3items; + B_GiveAll.Visible = false; break; default: itemlist = Main.itemlist;