diff --git a/PKHeX/Legality/Checks.cs b/PKHeX/Legality/Checks.cs index 5c293e490..75b31c3f1 100644 --- a/PKHeX/Legality/Checks.cs +++ b/PKHeX/Legality/Checks.cs @@ -367,6 +367,10 @@ private LegalityCheck verifyRibbons() if (!Encounter.Valid) return new LegalityCheck(Severity.Valid, "Skipped Ribbon check due to other check being invalid."); + var TrainNames = ReflectUtil.getPropertiesStartWithPrefix(pk6.GetType(), "SuperTrain").ToArray(); + if (TrainNames.Count(MissionName => ReflectUtil.GetValue(pk6, MissionName) as bool? == true) == 30 ^ pk6.SecretSuperTrainingComplete) + return new LegalityCheck(Severity.Invalid, "Super Training complete flag mismatch."); + List missingRibbons = new List(); List invalidRibbons = new List(); @@ -385,9 +389,8 @@ private LegalityCheck verifyRibbons() if (DistNames.Select(MissionName => ReflectUtil.GetValue(pk6, MissionName)).Any(Flag => Flag as bool? == true)) return new LegalityCheck(Severity.Invalid, "Distribution Super Training missions on Egg."); - var TrainNames = ReflectUtil.getPropertiesStartWithPrefix(pk6.GetType(), "SuperTrain"); if (TrainNames.Select(MissionName => ReflectUtil.GetValue(pk6, MissionName)).Any(Flag => Flag as bool? == true)) - return new LegalityCheck(Severity.Fishy, "Super Training missions on Egg."); + return new LegalityCheck(Severity.Invalid, "Super Training missions on Egg."); return new LegalityCheck(); } diff --git a/PKHeX/Resources/byte/wc6.pkl b/PKHeX/Resources/byte/wc6.pkl index 8d99c4601..f5d52005e 100644 Binary files a/PKHeX/Resources/byte/wc6.pkl and b/PKHeX/Resources/byte/wc6.pkl differ diff --git a/PKHeX/Resources/byte/wc6full.pkl b/PKHeX/Resources/byte/wc6full.pkl index dc1dfdc01..eed83d2fb 100644 Binary files a/PKHeX/Resources/byte/wc6full.pkl and b/PKHeX/Resources/byte/wc6full.pkl differ diff --git a/PKHeX/Resources/text/changelog.txt b/PKHeX/Resources/text/changelog.txt index 71d162829..e5e87b109 100644 --- a/PKHeX/Resources/text/changelog.txt +++ b/PKHeX/Resources/text/changelog.txt @@ -776,7 +776,7 @@ http://projectpokemon.org/forums/showthread.php?36986 - Added: Cleaner 'delete' command to batch editor (set species to 0 to clear data). - Added: Specifying output folder when modifying a folder in the Batch Editor. Thanks \! -08/22/16 - New Update: +08/22/16 - New Update: (53700) - Changed: Drag&Drop now replaces the cursor with the sprite to better simulate moving a Pokémon. - Added: FBI homebrew save file detection. Thanks poutros! - Fixed: Program now indicates the type of blank save file loaded if none is detected on startup. @@ -788,4 +788,38 @@ http://projectpokemon.org/forums/showthread.php?36986 - Fixed: Legality indication persists when loading a save file. - Fixed: Hyperspace Fury legality. Thanks RanEncounter! - Changed: Batch Editor improvements for PID/EC writing. Thanks JSS & Pokegeo! - - Changed: Updated Spanish and Chinese translation. Thanks ajtudela & easyworld! \ No newline at end of file + - Changed: Updated Spanish and Chinese translation. Thanks ajtudela & easyworld! + +09/18/16 - New Update: + - Added: Gen 1 & 2 support. Thanks SciresM, and all those who tested! + - Added: Gen 1<->2 conversion. Thanks SciresM! + - Added: Super Secret Training Completed flag. Thanks SciresM! + - Added: Program will now check for updates when the program starts. If an update is available, a URL label will appear. + - Added: Mystery Gift event database browser. Currently only views wc6, can be loaded to tabs! Hotkey is CTRL-G. + - Added: Gen 4 & 5 Pokedex form flags will be set when the Pokémon is set to the save file. + - Added: Hall of Fame time in Trainer editor. Thanks ricksee! + - Added: Gen 1/2/3 Met Location and Item strings for Spanish and Chinese games. Thanks ajtudela & easyworld! + - Added: Spiky Eared Pichu sprite. + - Added: MetDate/EggMetDate property setting in the Batch Editor (refer to FAQ, yyyyMMdd format). Thanks AvantGourd! + - Added: Box Viewer popup for easier box management. Doubleclick the "Box" tab. To open more than one, hold Shift while double clicking. + - Fixed: Non-box drag&drop slots will set the cursor to the slot's sprite while dragging, just like Box Slots. + - Fixed: O-Power editing saving will now save back to the save file. + - Fixed: Improved save detection for gen4/5 games, including saves that were just (re)started. + - Fixed: Gen4 ribbon editor give-all no longer throws an exception. + - Fixed: Changed event constants from signed to unsigned. Thanks evandixon! + - Fixed: Changing Unown's form as a pk3 will now update the PID. Thanks NinFanBoyFTW! + - Fixed: EncounterType dropdown now appears at the correct time. Thanks JSS! + - Fixed: HM07/HM08 inventory editing for gen4/5. Thanks msbhvn & Liger0! + - Fixed: Setting gen4 HGSS balls corrected. Thanks theSLAYER! + - Fixed: Gen3 inventory editor give-all disabled, as Bag is too small to give all items for a given pouch. Thanks Liger0! + - Fixed: Gen1/2/3 sub-editors erasing changes made to box Pokémon. Thanks SciresM, MichiS97! + - Fixed: Tangled Feet Rayquaza in Gen3. Thanks Delta Blast Burn! + - Legality: Level 20 Gallade is now recognized as legal. Thanks Rohul1997! + - Legality: Gen4 starters disallowed from having Gen3/4 balls. Thanks /u/Subject21_J + - Legality: Added Super Training legality checks. Thanks sora10pls! + - Changed: Inventory Editing now uses prettier sprites for each tab. + - Changed: Showdown Set parsing updated to account for user error when manually typing a set instead of exporting from Showdown as intended. + - Changed: Backed up save file names are now easier on the eye. Gen 1-5 saves will use played time, Gen 6 use the last saved datetime. + - Changed: First 3 tabs of PKM editor (left side) redesigned to fit and collapse controls for all the different games that are supported. + - Changed: Tabs with no controls visible will be hidden. Example: Hiding Box Tab with ORAS Demo save loaded. + - Changed: Met locations are now top-sorted with the locations available to the Origin Game. \ No newline at end of file diff --git a/PKHeX/Resources/text/shortcuts.txt b/PKHeX/Resources/text/shortcuts.txt index c15e811ee..1739f33a1 100644 --- a/PKHeX/Resources/text/shortcuts.txt +++ b/PKHeX/Resources/text/shortcuts.txt @@ -1,6 +1,5 @@ If you are having issues viewing certain symbols/text: Options -> Toggle Font. - // Main Window CTRL-O: Open @@ -10,6 +9,7 @@ CTRL-B: Export BAK CTRL-Q: Quit CTRL-D: Open Database +CTRL-G: Open Mystery Gift Database CTRL-R: Open Box Report CTRL-P: Open About PKHeX CTRL-T: Import Showdown Set @@ -41,17 +41,16 @@ Click on the OT label to set relevant details to that of the save file. Drop WC6/PGF/PCD/PGT to convert to PK6 in the main tabs. - Hold CTRL to open the Wonder Card interface when opening a WC6. -// Party / Battle Box -- Double click to export team to Showdown set format. - // Save File -Click on the Save File path (above Boxes): Auto-detect/Reload save. - - Shift skips SaveDataFiler +Doubleclick on the SAV Tab: Auto-detect/Reload latest save. // Boxes -Control-Click Box Tab: Sort Boxes. +Control-Click Box Tab: Sort Current Box contents. +Control-Shift-Click Box Tab: Sort All Boxes. +Alt-Click Box Tab: Delete Current Box contents. +Alt-Shift-Click Box Tab: Delete All Boxes. Control-Drag a Box Slot to Copy-Overwrite Alt-Drag a Box Slot to Delete-Overwrite @@ -61,17 +60,20 @@ Control-Click a slot to load slot to tabs. Shift-Click a slot to set tabs to slot. Alt-Click a slot to delete the data in slot. -Doubleclick on the Party or Battle Box label to export Showdown/Smogon Set (Team) to Clipboard. +Doubleclick the Box tab to open up a new Box Viewer. Only one is allowed at a time, unless you hold shift when doubleclicking. +- Note: Having multiple instances of the same box open and making changes to that box will not re-sync the box sprites until the box is reloaded. +// Party / Battle Box +Doubleclick on the Party or Battle Box label to export Showdown/Smogon Set (Team) to Clipboard. // Misc Editors INVENTORY: -- Alt-Click loading a pouch will give all items with quantity x995. *1 for TMHM/Key. +- Holding ALT when clicking Give All will clear all items for that pouch. POKEPUFF: - Control Click the All Button to give un-exceptional Pokepuffs. - Control Click the Sort Button to sort in reverse. -WONDERCARD: +MYSTERY GIFT: - Alt-Click QR to import from QR image. \ No newline at end of file diff --git a/PKHeX/Resources/text/version.txt b/PKHeX/Resources/text/version.txt index 9477a5f07..ebc887977 100644 --- a/PKHeX/Resources/text/version.txt +++ b/PKHeX/Resources/text/version.txt @@ -1 +1 @@ -20160830 \ No newline at end of file +20160918 \ No newline at end of file