From 56a343b4df14d9f035613cc858004b2eef37947a Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Fri, 24 Feb 2017 12:52:44 -0800 Subject: [PATCH 1/4] Remove Normal Box from Ball Pouch Closes #886, had removed incorrect item ID (items are sorted alphabetically, actual ID was 167). Closes #884 --- PKHeX/Legality/Tables2.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKHeX/Legality/Tables2.cs b/PKHeX/Legality/Tables2.cs index 9e860c674..1fa38b361 100644 --- a/PKHeX/Legality/Tables2.cs +++ b/PKHeX/Legality/Tables2.cs @@ -13,7 +13,7 @@ public static partial class Legal 3, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 46, 47, 48, 49, 51, 52, 53, 57, 60, 62, 63, 64, 65, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 91, 92, 93, 94, 95, 96, 97, 98, 99, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 117, 118, 119, 121, 122, 123, 124, 125, 126, 131, 132, 138, 139, 140, 143, 144, 146, 150, 151, 152, 156, 158, 163, 168, 169, 170, 172, 173, 174, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189 }; internal static readonly ushort[] Pouch_Ball_GSC = { - 1, 2, 4, 5, 157, 159, 160, 161, 164, 165, 166, 167 + 1, 2, 4, 5, 157, 159, 160, 161, 164, 165, 166 }; internal static readonly ushort[] Pouch_Key_GS = { 7, 54, 55, 58, 59, 61, 66, 67, 68 , 69, 71, 127, 128, 130, 133, 134, 175, 178 From 82de3e5d1272f0ae19089f05deacb29d506e9ac7 Mon Sep 17 00:00:00 2001 From: Kurt Date: Fri, 24 Feb 2017 18:45:50 -0800 Subject: [PATCH 2/4] Set max entry to count textbox Converting to string be lazy instead of computing log10 for digits :) #884 --- PKHeX.WinForms/Subforms/Save Editors/SAV_Inventory.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/PKHeX.WinForms/Subforms/Save Editors/SAV_Inventory.cs b/PKHeX.WinForms/Subforms/Save Editors/SAV_Inventory.cs index 503e99f88..93d853990 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/SAV_Inventory.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/SAV_Inventory.cs @@ -104,6 +104,7 @@ private DataGridView getDGV(InventoryPouch pouch) dgvIndex.DisplayIndex = c++; dgvIndex.Width = 45; dgvIndex.DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter; + ((DataGridViewTextBoxColumn) dgvIndex).MaxInputLength = (int)(Math.Log10(Math.Max(1, pouch.MaxCount)) + 1); } dgv.Columns.Add(dgvItemVal); From 6ddcdee9cfbc957a57abd05233ecddd82d617970 Mon Sep 17 00:00:00 2001 From: Kurt Date: Fri, 24 Feb 2017 20:26:28 -0800 Subject: [PATCH 3/4] Fix dragging battle team slot sprite refresh Refresh the image if the team slot indication needs updating (true->false, false->true), else stay lazy and just set the image. Could just refresh the image regardless but muh negligible speed --- PKHeX.WinForms/MainWindow/Main.cs | 7 ++++++- PKHeX.WinForms/Subforms/Save Editors/SAV_BoxViewer.cs | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/PKHeX.WinForms/MainWindow/Main.cs b/PKHeX.WinForms/MainWindow/Main.cs index c32d81cdd..8ce6ecc74 100644 --- a/PKHeX.WinForms/MainWindow/Main.cs +++ b/PKHeX.WinForms/MainWindow/Main.cs @@ -4121,7 +4121,12 @@ private void pbBoxSlot_MouseMove(object sender, MouseEventArgs e) pb.BackgroundImage = null; if (DragInfo.SameBox && DragInfo.DestinationValid) - SlotPictureBoxes[DragInfo.slotDestinationSlotNumber].Image = img; + { + if (SAV.getIsTeamSet(box, DragInfo.slotDestinationSlotNumber) ^ SAV.getIsTeamSet(box, DragInfo.slotSourceSlotNumber)) + getQuickFiller(SlotPictureBoxes[DragInfo.slotDestinationSlotNumber], SAV.getStoredSlot(DragInfo.slotDestinationOffset)); + else + SlotPictureBoxes[DragInfo.slotDestinationSlotNumber].Image = img; + } if (result == DragDropEffects.Copy) // viewed in tabs, apply 'view' highlight getSlotColor(DragInfo.slotSourceSlotNumber, Resources.slotView); diff --git a/PKHeX.WinForms/Subforms/Save Editors/SAV_BoxViewer.cs b/PKHeX.WinForms/Subforms/Save Editors/SAV_BoxViewer.cs index e8549ffa1..f161b6847 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/SAV_BoxViewer.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/SAV_BoxViewer.cs @@ -203,7 +203,12 @@ private void pbBoxSlot_MouseMove(object sender, MouseEventArgs e) pb.BackgroundImage = null; if (DragInfo.SameBox && DragInfo.DestinationValid) - SlotPictureBoxes[DragInfo.slotDestinationSlotNumber].Image = img; + { + if (SAV.getIsTeamSet(box, DragInfo.slotDestinationSlotNumber) ^ SAV.getIsTeamSet(box, DragInfo.slotSourceSlotNumber)) + getQuickFiller(SlotPictureBoxes[DragInfo.slotDestinationSlotNumber], SAV.getStoredSlot(DragInfo.slotDestinationOffset)); + else + SlotPictureBoxes[DragInfo.slotDestinationSlotNumber].Image = img; + } } catch (Exception x) { From fb2f8f322e4ef7e1625f7c60e5cec514787aa057 Mon Sep 17 00:00:00 2001 From: Kurt Date: Fri, 24 Feb 2017 20:53:28 -0800 Subject: [PATCH 4/4] Update 170225 Update changelog & update shortcuts list. Update event wc7 binaries. --- PKHeX/Resources/byte/wc7.pkl | Bin 30096 -> 37752 bytes PKHeX/Resources/byte/wc7full.pkl | Bin 29792 -> 39984 bytes PKHeX/Resources/text/changelog.txt | 19 ++++++++++++++++++- PKHeX/Resources/text/shortcuts.txt | 2 +- PKHeX/Resources/text/version.txt | 2 +- 5 files changed, 20 insertions(+), 3 deletions(-) diff --git a/PKHeX/Resources/byte/wc7.pkl b/PKHeX/Resources/byte/wc7.pkl index 38f7a111c0e19893aa5457f37b2b97768316e300..d51ad833f0d93a3b783007686b32b74af95c55b4 100644 GIT binary patch delta 1707 zcmcIi&ubGw6n-;lVi2RLHKa{qx?7<(24z|gD)kZ*D+a19RZ=h2#FREoNJ5e#cn|}M zKMvCET%r_35Dyi>5Yz3PQr0&9-H?!aS-uJ%Qh0o;I zb6UQcw-Oq%@Ht!9{G~+UIG0a4cGO`A%&?BRlP}O)0+8En0Jz`TE?{x50mJn@27pIh z?E;n^1`JIBIBaoNWS3cpCD;fXq&`YF7m8z$unJroY_8xGo!fUq7KCv_! z{enHi>?Nz=f9F@e?IItPQMdbn*KTW=OhA}C0u$s1>4y-G>ZSzH|I*|O@DAHgxr7E9@(5DcD45T3s37CO-m<9=B8lt!cVHVe{nvX#W*8+ZzLL8#J z=e##C-^L2AR{#J2 delta 39 tcmeydjA_Da#?2q(1ei8+C~+`uUJwQ(1e7NkZ(bFC&Uyoo^FfY-5dbt54s!qi diff --git a/PKHeX/Resources/byte/wc7full.pkl b/PKHeX/Resources/byte/wc7full.pkl index 9519975928bddf27e4da6a6f1e81c3721e46e5ea..fb5bad744b2df192217b705489bbff568fe0e800 100644 GIT binary patch delta 2470 zcmai0U2IfU5T09X-CmWJkRojZoNIeX=rb85P(Zjp$%(k(F=k(4BgEp6e9DA_D&$;u$aX-Qy9$u=3qDkV9{peX6m zl1RiU&g==jd0wQqx4Xu3tDdcLoML%t?OjBl zAf|z&BqK@SC#6lsBri9BpMcc*OhZ0|T}XUyTSBkA>U-;aprW^@9^ABA0c99g?z}vd z^aF1Ke@V%f>LOi;es?JIrH|LQxFQ~+kDSwg=pS_#>{D9wumJzWP)^EX zrhr`K&@kLPTK9aoDnx zZX&cCY$)fx)uyfMb#yc=QL#6#*` zVC9h=aohZ((-tcYeA^8?^hS`gLWFrdGw^N4AZhFpUR~sR+tpCOAGQA{Z&<7ixGHQ1 z8yt|JsAQqbus#8Q>@>@K1n~sSlOOgpZ6;w)CR{%c_GHeFo|a)?L`YcfC4^S30j16^udu42un)dD{F^`!39(dKYFi+W zB4@^z#2#;=EaJ8$w{o^B_p_#ji1hC^nm>Kv`5blw&Q6@Y>e$np*z7X3G^6`+ac67_yyFCD33a!+h6;DP1O|vRn3O*+(FDb@P5IM4gci3 W2eNc{?-+t?5A9m#W3CNV!u$t9HZEEK delta 16 Ycmdn6gXzHw#?243#8Nj;llI~V07fteDF6Tf diff --git a/PKHeX/Resources/text/changelog.txt b/PKHeX/Resources/text/changelog.txt index d9690b60a..6da456c9c 100644 --- a/PKHeX/Resources/text/changelog.txt +++ b/PKHeX/Resources/text/changelog.txt @@ -1,7 +1,24 @@ PKHeX - By Kaphotics http://projectpokemon.org/pkhex -17/02/07 - New Update: +17/02/25 - New Update: + - Legality: + - - Added: Legality checking for RBY Pokémon as pk1 and pk7+. + - - Fixed: More edge cases for legality checks. + - Batch Editor: + - - Added: Nickname clearing to batch editor (via .IsNicknamed=False). + - - Added: Legality filtering and bulk suggestions for Met Location, Current Moves & Relearn Moves. + - - - Use $suggest to use suggested result from the legality analysis. + - - Changed: Properties are now sorted alphabetically. + - Added: WC7 parsing for multiple-item gifts. Thanks SciresM! + - Added: X/Y Trainer Nickname editing (via Current Appearance tab). + - Added: S/M Festival Plaza name editing. + - Fixed: Gen4 Pokédex bitflag setting no longer sets invalid data for single-gender species. + - Fixed: wc7->pk7 base friendship fixed. Thanks T.O.R.N.A.D.O & Odaxis! + - Fixed: Gen1/2 Money/Coin editing & inventory editing edge cases. + - Updated: Menu sprites to use Sun/Moon sprites for some species (like Steelix). + +17/02/07 - New Update: (64480) [360228] - Legality: - - Added: Legality indication for exported QR images (if legality check is available for origin). - - Added: Legality indication for Box/Party pkm slots (^ + opt-in via Options->Set to SAV). diff --git a/PKHeX/Resources/text/shortcuts.txt b/PKHeX/Resources/text/shortcuts.txt index 1ed513eef..46c582466 100644 --- a/PKHeX/Resources/text/shortcuts.txt +++ b/PKHeX/Resources/text/shortcuts.txt @@ -38,7 +38,7 @@ Hold Control when dragging to save encrypted (ekx). Click on... - OT label: Set save file details to relevant properties. -- Met Location label: Suggest encounter information for relevant properties. +- Level / Met Location label: Suggest encounter information for relevant properties. - Moves groupbox: Suggest legal moves. - Relearn Moves groupbox: Suggest legal relearn moves. diff --git a/PKHeX/Resources/text/version.txt b/PKHeX/Resources/text/version.txt index 0722a4787..94f7526e1 100644 --- a/PKHeX/Resources/text/version.txt +++ b/PKHeX/Resources/text/version.txt @@ -1 +1 @@ -20170207 \ No newline at end of file +20170225 \ No newline at end of file