From 068f6e2f5fb4ef2d45570238f9a7065ac15ea6d1 Mon Sep 17 00:00:00 2001
From: Matt <sorafanatic10@gmail.com>
Date: Sat, 25 Apr 2020 14:05:12 -0400
Subject: [PATCH] Fix Big Sprite ItemShiftY (#2816)

Strange Souvenir and Room Service would get cut off since they're tall.
Also remove Adventure Guide from resources, and add Discount Coupon to Gen 7 unreleased items.
---
 PKHeX.Core/Legality/Tables/Tables7.cs             |   1 +
 PKHeX.Drawing/Properties/Resources.Designer.cs    |  10 ----------
 PKHeX.Drawing/Properties/Resources.resx           |   3 ---
 .../Resources/img/Big Items/bitem_703.png         | Bin 927 -> 0 bytes
 PKHeX.Drawing/Sprites/SpriteBuilder.cs            |   2 +-
 5 files changed, 2 insertions(+), 14 deletions(-)
 delete mode 100644 PKHeX.Drawing/Resources/img/Big Items/bitem_703.png

diff --git a/PKHeX.Core/Legality/Tables/Tables7.cs b/PKHeX.Core/Legality/Tables/Tables7.cs
index c61665db4..a4fc54f5a 100644
--- a/PKHeX.Core/Legality/Tables/Tables7.cs
+++ b/PKHeX.Core/Legality/Tables/Tables7.cs
@@ -640,6 +640,7 @@ public static partial class Legal
             588, // Relic Band
             589, // Relic Statue
             590, // Relic Crown
+            699, // Discount Coupon
             715, // Fairy Gem
         };
         #endregion
diff --git a/PKHeX.Drawing/Properties/Resources.Designer.cs b/PKHeX.Drawing/Properties/Resources.Designer.cs
index 5154587c1..72a64dbc7 100644
--- a/PKHeX.Drawing/Properties/Resources.Designer.cs
+++ b/PKHeX.Drawing/Properties/Resources.Designer.cs
@@ -51300,16 +51300,6 @@ public class Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        public static System.Drawing.Bitmap bitem_703 {
-            get {
-                object obj = ResourceManager.GetObject("bitem_703", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
diff --git a/PKHeX.Drawing/Properties/Resources.resx b/PKHeX.Drawing/Properties/Resources.resx
index 6ffebaf48..97647c479 100644
--- a/PKHeX.Drawing/Properties/Resources.resx
+++ b/PKHeX.Drawing/Properties/Resources.resx
@@ -1141,9 +1141,6 @@
   <data name="bitem_7" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\img\Big Items\bitem_7.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="bitem_703" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img\Big Items\bitem_703.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="bitem_708" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\img\Big Items\bitem_708.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_703.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_703.png
deleted file mode 100644
index 094a2a0120e1c0c34b4135760e8cde24f95ec7f3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 927
zcmV;Q17Q4#P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000AKNkl<Zc%1E*
zPiWg#9LGPh?BL=ibExZ0&D!DAaV?DwGU&gMcBPPH<gi0}Dx;TOw^J!Ol(kUEG1tOQ
z*=b}j(iPJB5K3tpT3R#a%W!BiVnUK7by6^0%|ea*dXTJ1mK?`oqdnvY0{Q8^_xpUm
zzuyxw?8Q3{$?rlTgm7#mNxt?9_)T7-gwm^^ozSeYdZ_;epq51KRT&x>0zf;Vq4oF!
zY00*la<x|_aix>;-4NlF4uC9GDNO<i$j{{eP0*w?y9TJKQhF7J28PHj=Ln^AJ~?@e
z)$DU*sR}^pskxv4`NifSy8`f3o;H*#W)CD|DdsY_tu-?2%8{l3jg-q~_sGIfuAB4E
z4v#RGxs7c8_Hx7yv11e3yFGEGliYHS@UbegB!Mt49U0wBcXoKhTHE*42;2Lh{Y-%N
zGXWTYWJ+`8Xy`yg<&s3~VB9fxYqMzcz=)4ORY@FGnVY@?z~7ry-rR>j7o0A50(jLt
za<oFE%SasQibK%se!Y#-UqxQ87fngd6IcmWVKu;ZwuAA}KCa%#kYCJO0Im|$pY!tF
z5TTS#q$_R#6tjO&DU_%bN`yNiL=VMXu2``efNUG%qkYUgUU5Bk0C?6sZ8Th4RfeF>
zk#w3)ML|ic=psP48YH^^1J}ltV3o=SY-c+d8@)hgw!mQj;l==slsAgi`RBaaddWt9
zaaYQR&nNiq<^#vO0c<@Wgb-SfM)Vq#ro*%!f8&_g5swk+iW7|-aEz}l%u`+~(y1tH
zZ5FA7bVtoIvjv9FC%Ae&<9Q5&cJ*K+4=HZt<u#+p^drvkT3>9vDDJ3y$s@VtfDl4-
z_h{Vvb)2s+e-FSvr^*2A|0o1Nz(kD2K6JtPQSNY{7C-$w!_?#$02ePAAg@jvAklcp
zO6D0YDt7^dgV5jqCATIX0=PjMI8uMk?aG@a2U`gMG}R~rz^#c#0DSw+IR{9&&XLLn
zkZogZ^a3-FR~YO+Y$%`qy=ig_zyV=?SlpZ58Kl-D(z63C)x05q9ikNwzsfxUJVB0|
zAivaue8z9Nb!KOu_)@+jfG0?uBR@<$0N{(y@uj?_5Vla0s!)@vSYMnHlRw@NYEreH
z`PsYWkJ8$`rgj66pI<UI@~Pa{qW|ho$zHq{@fI)0|8|I@4d4I(002ovPDHLkV1n}w
By7d46

diff --git a/PKHeX.Drawing/Sprites/SpriteBuilder.cs b/PKHeX.Drawing/Sprites/SpriteBuilder.cs
index 442f77155..80011e6c9 100644
--- a/PKHeX.Drawing/Sprites/SpriteBuilder.cs
+++ b/PKHeX.Drawing/Sprites/SpriteBuilder.cs
@@ -200,7 +200,7 @@ public class SpriteBuilder5668 : SpriteBuilder
         public override int Width => 68;
 
         protected override int ItemShiftX => 52;
-        protected override int ItemShiftY => 28;
+        protected override int ItemShiftY => 24;
         protected override int ItemMaxSize => 32;
         protected override int EggItemShiftX => 32;
         protected override int EggItemShiftY => 26;