Held item feature, alphablend, pk2pk fixes

Misc/Util.cs

@@ -16,9 +16,12 @@ namespace PKHeX
             for (int i = 0; i < (overlayImage.Width * overlayImage.Height); i++)
             {
                 Color newColor = overlayImage.GetPixel(i % (overlayImage.Width), i / (overlayImage.Width));
+                Color oldColor = newImage.GetPixel(i % (overlayImage.Width) + x, i / (overlayImage.Width) + y);
                 newColor = Color.FromArgb((int)((double)(newColor.A) * trans), newColor.R, newColor.G, newColor.B); // Apply transparency change
-                if (newColor.A != 0) // If Pixel isn't transparent, we'll overwrite the color.
+                // if (newColor.A != 0) // If Pixel isn't transparent, we'll overwrite the color.
                 {
+                    // if (newColor.A < 100) 
+                    newColor = AlphaBlend(newColor, oldColor);
                     newImage.SetPixel(
                         i % (overlayImage.Width) + x,
                         i / (overlayImage.Width) + y,
@@ -36,5 +39,31 @@ namespace PKHeX
             // Directory.CreateDirectory(tempPath);
             return (tempPath + "/");
         }
+
+        public static Color AlphaBlend(Color ForeGround, Color BackGround)
+        {
+            if (ForeGround.A == 0)
+                return BackGround;
+            if (BackGround.A == 0)
+                return ForeGround;
+            if (ForeGround.A == 255)
+                return ForeGround;
+            int Alpha = Convert.ToInt32(ForeGround.A) + 1;
+            int B = Alpha * ForeGround.B + (255 - Alpha) * BackGround.B >> 8;
+            int G = Alpha * ForeGround.G + (255 - Alpha) * BackGround.G >> 8;
+            int R = Alpha * ForeGround.R + (255 - Alpha) * BackGround.R >> 8;
+            int A = ForeGround.A;
+            if (BackGround.A == 255)
+                A = 255;
+            if (A > 255)
+                A = 255;
+            if (R > 255)
+                R = 255;
+            if (G > 255)
+                G = 255;
+            if (B > 255)
+                B = 255;
+            return Color.FromArgb(Math.Abs(A), Math.Abs(R), Math.Abs(G), Math.Abs(B));
+        }
     }
 }

Misc/pk2pk.cs

@@ -645,6 +645,17 @@ namespace PKHeX
             pk6[0xE1] = (byte)subreg;   
             pk6[0xE2] = (byte)_3DSreg;
 
+            // Antishiny Mechanism
+            ushort TID = BitConverter.ToUInt16(pk6, 0x0C);
+            ushort SID = BitConverter.ToUInt16(pk6, 0x0E);
+            uint PID = BitConverter.ToUInt32(pk6, 0x18);
+            ushort LID = (ushort)(PID & 0xFFFF);
+            ushort HID = (ushort)(PID >> 0x10);
+
+            int XOR = TID ^ SID ^ LID ^ HID;
+            if (XOR >= 8 && XOR < 16) // If we get an illegal collision...
+                Array.Copy(BitConverter.GetBytes(PID ^ 0x80000000), 0, pk6, 0x18, 4);
+
             // Fix Checksum
             uint chk = 0;
             for (int i = 8; i < 232; i += 2) // Loop through the entire PKX

PKHeX.csproj

@@ -301,6 +301,398 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Resources\icon.ico" />
+    <None Include="Resources\img\item\item_670.png" />
+    <None Include="Resources\img\item\item_669.png" />
+    <None Include="Resources\img\item\item_668.png" />
+    <None Include="Resources\img\item\item_667.png" />
+    <None Include="Resources\img\item\item_666.png" />
+    <None Include="Resources\img\item\item_665.png" />
+    <None Include="Resources\img\item\item_664.png" />
+    <None Include="Resources\img\item\item_663.png" />
+    <None Include="Resources\img\item\item_662.png" />
+    <None Include="Resources\img\item\item_661.png" />
+    <None Include="Resources\img\item\item_660.png" />
+    <None Include="Resources\img\item\item_659.png" />
+    <None Include="Resources\img\item\item_658.png" />
+    <None Include="Resources\img\item\item_657.png" />
+    <None Include="Resources\img\item\item_656.png" />
+    <None Include="Resources\img\item\item_655.png" />
+    <None Include="Resources\img\item\item_654.png" />
+    <None Include="Resources\img\item\item_653.png" />
+    <None Include="Resources\img\item\item_652.png" />
+    <None Include="Resources\img\item\item_649.png" />
+    <None Include="Resources\img\item\item_648.png" />
+    <None Include="Resources\img\item\item_647.png" />
+    <None Include="Resources\img\item\item_646.png" />
+    <None Include="Resources\img\item\item_645.png" />
+    <None Include="Resources\img\item\item_644.png" />
+    <None Include="Resources\img\item\item_640.png" />
+    <None Include="Resources\img\item\item_639.png" />
+    <None Include="Resources\img\item\item_591.png" />
+    <None Include="Resources\img\item\item_590.png" />
+    <None Include="Resources\img\item\item_589.png" />
+    <None Include="Resources\img\item\item_588.png" />
+    <None Include="Resources\img\item\item_587.png" />
+    <None Include="Resources\img\item\item_586.png" />
+    <None Include="Resources\img\item\item_585.png" />
+    <None Include="Resources\img\item\item_584.png" />
+    <None Include="Resources\img\item\item_583.png" />
+    <None Include="Resources\img\item\item_582.png" />
+    <None Include="Resources\img\item\item_581.png" />
+    <None Include="Resources\img\item\item_580.png" />
+    <None Include="Resources\img\item\item_577.png" />
+    <None Include="Resources\img\item\item_573.png" />
+    <None Include="Resources\img\item\item_572.png" />
+    <None Include="Resources\img\item\item_564.png" />
+    <None Include="Resources\img\item\item_563.png" />
+    <None Include="Resources\img\item\item_562.png" />
+    <None Include="Resources\img\item\item_561.png" />
+    <None Include="Resources\img\item\item_560.png" />
+    <None Include="Resources\img\item\item_559.png" />
+    <None Include="Resources\img\item\item_558.png" />
+    <None Include="Resources\img\item\item_557.png" />
+    <None Include="Resources\img\item\item_556.png" />
+    <None Include="Resources\img\item\item_555.png" />
+    <None Include="Resources\img\item\item_554.png" />
+    <None Include="Resources\img\item\item_553.png" />
+    <None Include="Resources\img\item\item_552.png" />
+    <None Include="Resources\img\item\item_551.png" />
+    <None Include="Resources\img\item\item_550.png" />
+    <None Include="Resources\img\item\item_549.png" />
+    <None Include="Resources\img\item\item_548.png" />
+    <None Include="Resources\img\item\item_547.png" />
+    <None Include="Resources\img\item\item_546.png" />
+    <None Include="Resources\img\item\item_545.png" />
+    <None Include="Resources\img\item\item_544.png" />
+    <None Include="Resources\img\item\item_543.png" />
+    <None Include="Resources\img\item\item_542.png" />
+    <None Include="Resources\img\item\item_541.png" />
+    <None Include="Resources\img\item\item_540.png" />
+    <None Include="Resources\img\item\item_539.png" />
+    <None Include="Resources\img\item\item_538.png" />
+    <None Include="Resources\img\item\item_537.png" />
+    <None Include="Resources\img\item\item_504.png" />
+    <None Include="Resources\img\item\item_327.png" />
+    <None Include="Resources\img\item\item_326.png" />
+    <None Include="Resources\img\item\item_325.png" />
+    <None Include="Resources\img\item\item_324.png" />
+    <None Include="Resources\img\item\item_323.png" />
+    <None Include="Resources\img\item\item_322.png" />
+    <None Include="Resources\img\item\item_321.png" />
+    <None Include="Resources\img\item\item_320.png" />
+    <None Include="Resources\img\item\item_319.png" />
+    <None Include="Resources\img\item\item_318.png" />
+    <None Include="Resources\img\item\item_317.png" />
+    <None Include="Resources\img\item\item_316.png" />
+    <None Include="Resources\img\item\item_315.png" />
+    <None Include="Resources\img\item\item_314.png" />
+    <None Include="Resources\img\item\item_313.png" />
+    <None Include="Resources\img\item\item_312.png" />
+    <None Include="Resources\img\item\item_311.png" />
+    <None Include="Resources\img\item\item_310.png" />
+    <None Include="Resources\img\item\item_309.png" />
+    <None Include="Resources\img\item\item_308.png" />
+    <None Include="Resources\img\item\item_307.png" />
+    <None Include="Resources\img\item\item_306.png" />
+    <None Include="Resources\img\item\item_305.png" />
+    <None Include="Resources\img\item\item_304.png" />
+    <None Include="Resources\img\item\item_303.png" />
+    <None Include="Resources\img\item\item_302.png" />
+    <None Include="Resources\img\item\item_301.png" />
+    <None Include="Resources\img\item\item_300.png" />
+    <None Include="Resources\img\item\item_299.png" />
+    <None Include="Resources\img\item\item_298.png" />
+    <None Include="Resources\img\item\item_297.png" />
+    <None Include="Resources\img\item\item_296.png" />
+    <None Include="Resources\img\item\item_295.png" />
+    <None Include="Resources\img\item\item_294.png" />
+    <None Include="Resources\img\item\item_293.png" />
+    <None Include="Resources\img\item\item_292.png" />
+    <None Include="Resources\img\item\item_291.png" />
+    <None Include="Resources\img\item\item_290.png" />
+    <None Include="Resources\img\item\item_289.png" />
+    <None Include="Resources\img\item\item_288.png" />
+    <None Include="Resources\img\item\item_287.png" />
+    <None Include="Resources\img\item\item_286.png" />
+    <None Include="Resources\img\item\item_285.png" />
+    <None Include="Resources\img\item\item_284.png" />
+    <None Include="Resources\img\item\item_283.png" />
+    <None Include="Resources\img\item\item_282.png" />
+    <None Include="Resources\img\item\item_281.png" />
+    <None Include="Resources\img\item\item_280.png" />
+    <None Include="Resources\img\item\item_279.png" />
+    <None Include="Resources\img\item\item_278.png" />
+    <None Include="Resources\img\item\item_277.png" />
+    <None Include="Resources\img\item\item_276.png" />
+    <None Include="Resources\img\item\item_275.png" />
+    <None Include="Resources\img\item\item_274.png" />
+    <None Include="Resources\img\item\item_273.png" />
+    <None Include="Resources\img\item\item_272.png" />
+    <None Include="Resources\img\item\item_271.png" />
+    <None Include="Resources\img\item\item_270.png" />
+    <None Include="Resources\img\item\item_269.png" />
+    <None Include="Resources\img\item\item_268.png" />
+    <None Include="Resources\img\item\item_267.png" />
+    <None Include="Resources\img\item\item_266.png" />
+    <None Include="Resources\img\item\item_265.png" />
+    <None Include="Resources\img\item\item_264.png" />
+    <None Include="Resources\img\item\item_263.png" />
+    <None Include="Resources\img\item\item_262.png" />
+    <None Include="Resources\img\item\item_261.png" />
+    <None Include="Resources\img\item\item_260.png" />
+    <None Include="Resources\img\item\item_259.png" />
+    <None Include="Resources\img\item\item_258.png" />
+    <None Include="Resources\img\item\item_257.png" />
+    <None Include="Resources\img\item\item_256.png" />
+    <None Include="Resources\img\item\item_255.png" />
+    <None Include="Resources\img\item\item_254.png" />
+    <None Include="Resources\img\item\item_253.png" />
+    <None Include="Resources\img\item\item_252.png" />
+    <None Include="Resources\img\item\item_251.png" />
+    <None Include="Resources\img\item\item_250.png" />
+    <None Include="Resources\img\item\item_249.png" />
+    <None Include="Resources\img\item\item_248.png" />
+    <None Include="Resources\img\item\item_247.png" />
+    <None Include="Resources\img\item\item_246.png" />
+    <None Include="Resources\img\item\item_245.png" />
+    <None Include="Resources\img\item\item_244.png" />
+    <None Include="Resources\img\item\item_243.png" />
+    <None Include="Resources\img\item\item_242.png" />
+    <None Include="Resources\img\item\item_241.png" />
+    <None Include="Resources\img\item\item_240.png" />
+    <None Include="Resources\img\item\item_239.png" />
+    <None Include="Resources\img\item\item_238.png" />
+    <None Include="Resources\img\item\item_237.png" />
+    <None Include="Resources\img\item\item_236.png" />
+    <None Include="Resources\img\item\item_235.png" />
+    <None Include="Resources\img\item\item_234.png" />
+    <None Include="Resources\img\item\item_233.png" />
+    <None Include="Resources\img\item\item_232.png" />
+    <None Include="Resources\img\item\item_231.png" />
+    <None Include="Resources\img\item\item_230.png" />
+    <None Include="Resources\img\item\item_229.png" />
+    <None Include="Resources\img\item\item_228.png" />
+    <None Include="Resources\img\item\item_227.png" />
+    <None Include="Resources\img\item\item_226.png" />
+    <None Include="Resources\img\item\item_225.png" />
+    <None Include="Resources\img\item\item_224.png" />
+    <None Include="Resources\img\item\item_223.png" />
+    <None Include="Resources\img\item\item_222.png" />
+    <None Include="Resources\img\item\item_221.png" />
+    <None Include="Resources\img\item\item_220.png" />
+    <None Include="Resources\img\item\item_219.png" />
+    <None Include="Resources\img\item\item_218.png" />
+    <None Include="Resources\img\item\item_217.png" />
+    <None Include="Resources\img\item\item_215.png" />
+    <None Include="Resources\img\item\item_214.png" />
+    <None Include="Resources\img\item\item_213.png" />
+    <None Include="Resources\img\item\item_212.png" />
+    <None Include="Resources\img\item\item_211.png" />
+    <None Include="Resources\img\item\item_210.png" />
+    <None Include="Resources\img\item\item_209.png" />
+    <None Include="Resources\img\item\item_208.png" />
+    <None Include="Resources\img\item\item_207.png" />
+    <None Include="Resources\img\item\item_206.png" />
+    <None Include="Resources\img\item\item_205.png" />
+    <None Include="Resources\img\item\item_204.png" />
+    <None Include="Resources\img\item\item_203.png" />
+    <None Include="Resources\img\item\item_202.png" />
+    <None Include="Resources\img\item\item_201.png" />
+    <None Include="Resources\img\item\item_200.png" />
+    <None Include="Resources\img\item\item_199.png" />
+    <None Include="Resources\img\item\item_198.png" />
+    <None Include="Resources\img\item\item_197.png" />
+    <None Include="Resources\img\item\item_196.png" />
+    <None Include="Resources\img\item\item_195.png" />
+    <None Include="Resources\img\item\item_194.png" />
+    <None Include="Resources\img\item\item_193.png" />
+    <None Include="Resources\img\item\item_192.png" />
+    <None Include="Resources\img\item\item_191.png" />
+    <None Include="Resources\img\item\item_190.png" />
+    <None Include="Resources\img\item\item_189.png" />
+    <None Include="Resources\img\item\item_188.png" />
+    <None Include="Resources\img\item\item_187.png" />
+    <None Include="Resources\img\item\item_186.png" />
+    <None Include="Resources\img\item\item_185.png" />
+    <None Include="Resources\img\item\item_184.png" />
+    <None Include="Resources\img\item\item_183.png" />
+    <None Include="Resources\img\item\item_182.png" />
+    <None Include="Resources\img\item\item_181.png" />
+    <None Include="Resources\img\item\item_180.png" />
+    <None Include="Resources\img\item\item_179.png" />
+    <None Include="Resources\img\item\item_178.png" />
+    <None Include="Resources\img\item\item_177.png" />
+    <None Include="Resources\img\item\item_176.png" />
+    <None Include="Resources\img\item\item_175.png" />
+    <None Include="Resources\img\item\item_174.png" />
+    <None Include="Resources\img\item\item_173.png" />
+    <None Include="Resources\img\item\item_172.png" />
+    <None Include="Resources\img\item\item_171.png" />
+    <None Include="Resources\img\item\item_170.png" />
+    <None Include="Resources\img\item\item_169.png" />
+    <None Include="Resources\img\item\item_168.png" />
+    <None Include="Resources\img\item\item_167.png" />
+    <None Include="Resources\img\item\item_166.png" />
+    <None Include="Resources\img\item\item_165.png" />
+    <None Include="Resources\img\item\item_164.png" />
+    <None Include="Resources\img\item\item_163.png" />
+    <None Include="Resources\img\item\item_162.png" />
+    <None Include="Resources\img\item\item_161.png" />
+    <None Include="Resources\img\item\item_160.png" />
+    <None Include="Resources\img\item\item_159.png" />
+    <None Include="Resources\img\item\item_158.png" />
+    <None Include="Resources\img\item\item_157.png" />
+    <None Include="Resources\img\item\item_156.png" />
+    <None Include="Resources\img\item\item_155.png" />
+    <None Include="Resources\img\item\item_154.png" />
+    <None Include="Resources\img\item\item_153.png" />
+    <None Include="Resources\img\item\item_152.png" />
+    <None Include="Resources\img\item\item_151.png" />
+    <None Include="Resources\img\item\item_150.png" />
+    <None Include="Resources\img\item\item_149.png" />
+    <None Include="Resources\img\item\item_136.png" />
+    <None Include="Resources\img\item\item_135.png" />
+    <None Include="Resources\img\item\item_134.png" />
+    <None Include="Resources\img\item\item_119.png" />
+    <None Include="Resources\img\item\item_118.png" />
+    <None Include="Resources\img\item\item_117.png" />
+    <None Include="Resources\img\item\item_116.png" />
+    <None Include="Resources\img\item\item_112.png" />
+    <None Include="Resources\img\item\item_110.png" />
+    <None Include="Resources\img\item\item_109.png" />
+    <None Include="Resources\img\item\item_108.png" />
+    <None Include="Resources\img\item\item_107.png" />
+    <None Include="Resources\img\item\item_106.png" />
+    <None Include="Resources\img\item\item_105.png" />
+    <None Include="Resources\img\item\item_104.png" />
+    <None Include="Resources\img\item\item_103.png" />
+    <None Include="Resources\img\item\item_102.png" />
+    <None Include="Resources\img\item\item_101.png" />
+    <None Include="Resources\img\item\item_100.png" />
+    <None Include="Resources\img\item\item_99.png" />
+    <None Include="Resources\img\item\item_98.png" />
+    <None Include="Resources\img\item\item_97.png" />
+    <None Include="Resources\img\item\item_96.png" />
+    <None Include="Resources\img\item\item_95.png" />
+    <None Include="Resources\img\item\item_94.png" />
+    <None Include="Resources\img\item\item_93.png" />
+    <None Include="Resources\img\item\item_92.png" />
+    <None Include="Resources\img\item\item_91.png" />
+    <None Include="Resources\img\item\item_90.png" />
+    <None Include="Resources\img\item\item_89.png" />
+    <None Include="Resources\img\item\item_88.png" />
+    <None Include="Resources\img\item\item_87.png" />
+    <None Include="Resources\img\item\item_86.png" />
+    <None Include="Resources\img\item\item_85.png" />
+    <None Include="Resources\img\item\item_84.png" />
+    <None Include="Resources\img\item\item_83.png" />
+    <None Include="Resources\img\item\item_82.png" />
+    <None Include="Resources\img\item\item_81.png" />
+    <None Include="Resources\img\item\item_80.png" />
+    <None Include="Resources\img\item\item_79.png" />
+    <None Include="Resources\img\item\item_78.png" />
+    <None Include="Resources\img\item\item_77.png" />
+    <None Include="Resources\img\item\item_76.png" />
+    <None Include="Resources\img\item\item_75.png" />
+    <None Include="Resources\img\item\item_74.png" />
+    <None Include="Resources\img\item\item_73.png" />
+    <None Include="Resources\img\item\item_72.png" />
+    <None Include="Resources\img\item\item_71.png" />
+    <None Include="Resources\img\item\item_70.png" />
+    <None Include="Resources\img\item\item_69.png" />
+    <None Include="Resources\img\item\item_68.png" />
+    <None Include="Resources\img\item\item_67.png" />
+    <None Include="Resources\img\item\item_66.png" />
+    <None Include="Resources\img\item\item_65.png" />
+    <None Include="Resources\img\item\item_64.png" />
+    <None Include="Resources\img\item\item_63.png" />
+    <None Include="Resources\img\item\item_62.png" />
+    <None Include="Resources\img\item\item_61.png" />
+    <None Include="Resources\img\item\item_60.png" />
+    <None Include="Resources\img\item\item_59.png" />
+    <None Include="Resources\img\item\item_58.png" />
+    <None Include="Resources\img\item\item_57.png" />
+    <None Include="Resources\img\item\item_56.png" />
+    <None Include="Resources\img\item\item_55.png" />
+    <None Include="Resources\img\item\item_54.png" />
+    <None Include="Resources\img\item\item_53.png" />
+    <None Include="Resources\img\item\item_52.png" />
+    <None Include="Resources\img\item\item_51.png" />
+    <None Include="Resources\img\item\item_50.png" />
+    <None Include="Resources\img\item\item_49.png" />
+    <None Include="Resources\img\item\item_48.png" />
+    <None Include="Resources\img\item\item_47.png" />
+    <None Include="Resources\img\item\item_46.png" />
+    <None Include="Resources\img\item\item_45.png" />
+    <None Include="Resources\img\item\item_44.png" />
+    <None Include="Resources\img\item\item_43.png" />
+    <None Include="Resources\img\item\item_42.png" />
+    <None Include="Resources\img\item\item_41.png" />
+    <None Include="Resources\img\item\item_40.png" />
+    <None Include="Resources\img\item\item_39.png" />
+    <None Include="Resources\img\item\item_38.png" />
+    <None Include="Resources\img\item\item_37.png" />
+    <None Include="Resources\img\item\item_36.png" />
+    <None Include="Resources\img\item\item_35.png" />
+    <None Include="Resources\img\item\item_34.png" />
+    <None Include="Resources\img\item\item_33.png" />
+    <None Include="Resources\img\item\item_32.png" />
+    <None Include="Resources\img\item\item_31.png" />
+    <None Include="Resources\img\item\item_30.png" />
+    <None Include="Resources\img\item\item_29.png" />
+    <None Include="Resources\img\item\item_28.png" />
+    <None Include="Resources\img\item\item_27.png" />
+    <None Include="Resources\img\item\item_26.png" />
+    <None Include="Resources\img\item\item_25.png" />
+    <None Include="Resources\img\item\item_24.png" />
+    <None Include="Resources\img\item\item_23.png" />
+    <None Include="Resources\img\item\item_22.png" />
+    <None Include="Resources\img\item\item_21.png" />
+    <None Include="Resources\img\item\item_20.png" />
+    <None Include="Resources\img\item\item_19.png" />
+    <None Include="Resources\img\item\item_18.png" />
+    <None Include="Resources\img\item\item_17.png" />
+    <None Include="Resources\img\item\item_16.png" />
+    <None Include="Resources\img\item\item_15.png" />
+    <None Include="Resources\img\item\item_14.png" />
+    <None Include="Resources\img\item\item_13.png" />
+    <None Include="Resources\img\item\item_12.png" />
+    <None Include="Resources\img\item\item_11.png" />
+    <None Include="Resources\img\item\item_10.png" />
+    <None Include="Resources\img\item\item_9.png" />
+    <None Include="Resources\img\item\item_8.png" />
+    <None Include="Resources\img\item\item_7.png" />
+    <None Include="Resources\img\item\item_6.png" />
+    <None Include="Resources\img\item\item_5.png" />
+    <None Include="Resources\img\item\item_4.png" />
+    <None Include="Resources\img\item\item_3.png" />
+    <None Include="Resources\img\item\item_2.png" />
+    <None Include="Resources\img\item\item_1.png" />
+    <None Include="Resources\img\item\item_715.png" />
+    <None Include="Resources\img\item\item_711.png" />
+    <None Include="Resources\img\item\item_710.png" />
+    <None Include="Resources\img\item\item_709.png" />
+    <None Include="Resources\img\item\item_708.png" />
+    <None Include="Resources\img\item\item_704.png" />
+    <None Include="Resources\img\item\item_699.png" />
+    <None Include="Resources\img\item\item_688.png" />
+    <None Include="Resources\img\item\item_687.png" />
+    <None Include="Resources\img\item\item_686.png" />
+    <None Include="Resources\img\item\item_685.png" />
+    <None Include="Resources\img\item\item_684.png" />
+    <None Include="Resources\img\item\item_683.png" />
+    <None Include="Resources\img\item\item_682.png" />
+    <None Include="Resources\img\item\item_681.png" />
+    <None Include="Resources\img\item\item_680.png" />
+    <None Include="Resources\img\item\item_679.png" />
+    <None Include="Resources\img\item\item_678.png" />
+    <None Include="Resources\img\item\item_677.png" />
+    <None Include="Resources\img\item\item_676.png" />
+    <None Include="Resources\img\item\item_675.png" />
+    <None Include="Resources\img\item\item_674.png" />
+    <None Include="Resources\img\item\item_673.png" />
+    <None Include="Resources\img\item\item_672.png" />
+    <None Include="Resources\img\item\item_671.png" />
     <None Include="Resources\text\ko\text_Wallpaper_ko.txt" />
     <None Include="Resources\text\ja\text_Wallpaper_ja.txt" />
     <None Include="Resources\text\it\text_Wallpaper_it.txt" />

PKX/f1-Main.cs

@@ -3495,14 +3495,14 @@ namespace PKHeX
                                             071,072,073,074,075,076,077,078,079,080,081,082,083,084,085,086,087,088,089,090,091,092,093,094,099,100,101,102,103,104,105,106,107,108,109,
                                             110,112,116,117,118,119,134,135,136,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,
                                             175,176,177,178,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,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,
+                                            210,211,212,213,214,215,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,
                                             245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,
                                             280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,
                                             315,316,317,318,319,320,321,322,323,324,325,326,327,504,537,538,539,540,541,542,543,544,545,546,547,548,549,550,551,552,553,554,555,556,557,
                                             558,559,560,561,562,563,564,565,566,567,568,569,570,571,572,573,577,580,581,582,583,584,585,586,587,588,589,590,591,639,640,644,645,646,647,
                                             648,649,650,652,653,654,655,656,657,658,659,660,661,662,663,664,665,666,667,668,669,670,671,672,673,674,675,676,677,678,679,680,681,682,683,
                                             684,685,686,687,688,699,704,708,709,710,711,715,
-                                      };
+                                  };
 
                 List<cbItem> item_list = new List<cbItem>();
                 // Sort the Rest based on String Name
@@ -4124,7 +4124,7 @@ namespace PKHeX
             uint TSV = ToUInt32(TB_TID.Text) ^ ToUInt32(TB_SID.Text);
             uint XOR = TSV ^ PSV;
             int game = getIndex(CB_GameOrigin);
-            if (((XOR < 8) && (game < 24)) || ((XOR < 16) && (game >= 24)))
+            if (XOR < 16)
             {   // Is Shiny
                 BTN_Shinytize.Visible =
                 BTN_Shinytize.Enabled = false;
@@ -4136,7 +4136,6 @@ namespace PKHeX
                 BTN_Shinytize.Enabled = true;
                 Label_IsShiny.Visible = false;
             }
-
             getMarkings();
         }
         private void getForms(int species)
@@ -4688,7 +4687,6 @@ namespace PKHeX
             uint value = UInt32.Parse(newString.ToString(), NumberStyles.HexNumber);
             tb.Text = value.ToString("X8");
             return newString.ToString();
-
         }
         public void setcountry(object sender)
         {
@@ -5182,6 +5180,7 @@ namespace PKHeX
             }
             updateLocations(gameorigin);
             getMarkings();
+            getIsShiny();
         }
         private void updateLocations(int gameorigin)
         {
@@ -5692,8 +5691,8 @@ namespace PKHeX
             uint TSV = TID ^ SID;
             uint XOR = TSV ^ PSV;
 
-            // Check to see if we actually did it right...
-            if (((XOR > 8) && (CB_GameOrigin.SelectedIndex < 24)) || ((XOR > 16) && (CB_GameOrigin.SelectedIndex >= 24)))
+            // Check to see if we actually did it right... should be 0.
+            if (XOR > 16)
             {
                 TB_PID.Text = ((UID ^ XOR) * 0x10000 + LID).ToString("X8");
             }
@@ -6494,9 +6493,35 @@ namespace PKHeX
             // Stuff the Buff 
             // Create a new storage so we don't muck up things with the original
             byte[] pkx = buff;
-
+            if (getHEXval(TB_EC) == 0) BTN_RerollEC.PerformClick();
             // Repopulate PKX with Edited Stuff
-            if (getHEXval(TB_EC) == 0) BTN_RerollEC.PerformClick(); // Prevent 0 Encryption Constants
+            if (getIndex(CB_GameOrigin) < 24)
+            {
+                uint EC = getHEXval(TB_EC);
+                uint PID = getHEXval(TB_PID);
+                uint SID = ToUInt32(TB_TID.Text);
+                uint TID = ToUInt32(TB_TID.Text);
+                uint LID = PID & 0xFFFF;
+                uint HID = PID >> 16;
+                uint XOR = (TID ^ LID ^ SID ^ HID);
+
+                // Ensure we don't have a shiny.
+                if (XOR < 16 && XOR >= 8) // Illegal, fix.
+                {
+                    // Keep as shiny, so we have to mod the PID
+                    PID = (PID ^ XOR);
+                    TB_PID.Text = PID.ToString("X8");
+                    TB_EC.Text = PID.ToString("X8");
+                }
+                else if ((XOR ^ 0x8000) >= 8 && (XOR ^ 0x8000) < 16 && (PID != EC))
+                {
+                    TB_EC.Text = (PID ^ 0x80000000).ToString("X8");
+                }
+                else // Not Illegal, no fix.
+                {
+                    TB_EC.Text = PID.ToString("X8");
+                }
+            }
             Array.Copy(BitConverter.GetBytes(getHEXval(TB_EC)), 0, pkx, 0, 4);  // EK
 
             Array.Copy(BitConverter.GetBytes(0), 0, pkx, 0x4, 4);  // 0 CHK for now
@@ -6584,7 +6609,7 @@ namespace PKHeX
 
             // Don't allow PP Ups if there is no move.
             for (int i = 0; i < 4; i++)
-                if (pkx[0x62+i] == 0) pkx[0x66+i] = 0;
+                if (pkx[0x62 + i] == 0) pkx[0x66 + i] = 0;
 
             Array.Copy(BitConverter.GetBytes(getIndex(CB_RelearnMove1)), 0, pkx, 0x6A, 2);  // EggMove 1
             Array.Copy(BitConverter.GetBytes(getIndex(CB_RelearnMove2)), 0, pkx, 0x6C, 2);  // EggMove 2
@@ -7707,6 +7732,17 @@ namespace PKHeX
                     savedited = true;
                     getSlotColor(slot, Properties.Resources.slotSet);
                 }
+                else if (slot < 36)
+                {
+                    if (slot == 30 && (CB_Species.SelectedIndex == 0 || CHK_IsEgg.Checked)) { MessageBox.Show("Can't have empty/egg first slot.", "Alert"); return; }
+                    int offset = SaveGame.Party + 0x7F000 * savindex + (slot-30) * 0x104;
+                    byte[] pkxdata = preparepkx(buff);
+                    byte[] ekxdata = encryptArray(pkxdata);
+                    Array.Copy(ekxdata, 0, savefile, offset, 0x104);
+                    getPKXBoxes();
+                    savedited = true;
+                    getSlotColor(slot, Properties.Resources.slotSet);
+                }
             }
         }
         // Subfunctions // 
@@ -7957,7 +7993,6 @@ namespace PKHeX
             uint PSV = UID ^ LID;
             uint TSV = (uint)(BitConverter.ToUInt16(dslotdata, 0x0C) ^ BitConverter.ToUInt16(dslotdata, 0x0E));
             uint XOR = TSV ^ PSV;
-            int gamevers = dslotdata[0xDF];
 
             Image baseImage = (Image)Properties.Resources.ResourceManager.GetObject(file);
             if (species != 0 && isegg == 1)
@@ -7967,7 +8002,7 @@ namespace PKHeX
                 file = "egg"; // Add the egg layer over-top.
                 baseImage = PKHeX.Util.layerImage(baseImage, (Image)Properties.Resources.ResourceManager.GetObject(file), 0, 0, 1);
             }
-            if (species != 0 && (((XOR < 8) && (gamevers < 24)) || ((XOR < 16) && (gamevers >= 24))))
+            if (species != 0 && XOR < 16)
             {   // Is Shiny
                 // Redraw our image
                 baseImage = PKHeX.Util.layerImage(baseImage, Properties.Resources.rare_icon, 0, 0, 0.7);
@@ -7975,8 +8010,11 @@ namespace PKHeX
             if (species != 0 && BitConverter.ToUInt16(dslotdata, 0xA) > 0)
             {
                 // Has Item
+                int item = BitConverter.ToUInt16(dslotdata, 0xA);
+                Image itemimg = (Image)Properties.Resources.ResourceManager.GetObject("item_"+item.ToString());
+                if (itemimg == null) itemimg = Properties.Resources.helditem;
                 // Redraw
-                baseImage = PKHeX.Util.layerImage(baseImage, Properties.Resources.helditem, 25, 20, 1);
+                baseImage = PKHeX.Util.layerImage(baseImage, itemimg, 22 + (15-itemimg.Width)/2, 15 + (15-itemimg.Height), 1);
             }
 
             pb.Image = baseImage;
@@ -8126,7 +8164,7 @@ namespace PKHeX
                             uint PSV = UID ^ LID;
                             uint TSV = ToUInt32(TB_TID.Text) ^ ToUInt32(TB_SID.Text);
                             uint XOR = TSV ^ PSV;
-                            if (((XOR < 8) && (gamevers < 24)) || ((XOR < 16) && (gamevers >= 24)))
+                            if (XOR < 16)
                             {   // Is Shiny
                                 isshiny = " ★";
                             }