Merge pull request #4 from kwsch/master

Update from upstream repo kwsch/PKHeX

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);

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)
             {

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);

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

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).

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.
 

PKHeX/Resources/text/version.txt

@@ -1 +1 @@
-20170207
+20170225