From 872f2a940c04851cdf7344f3d032aaebf857da7d Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Fri, 1 Jan 2016 21:18:23 -0800
Subject: [PATCH] Fix Egg-Set bugs

Thanks StarFisherX!
---
 Misc/PK6.cs    | 2 +-
 PKX/f1-Main.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Misc/PK6.cs b/Misc/PK6.cs
index 6f6b4f6b0..2380fe66f 100644
--- a/Misc/PK6.cs
+++ b/Misc/PK6.cs
@@ -663,7 +663,7 @@ private void UpdateEgg(int Day, int Month, int Year)
             Egg_Location = 30002;
             Egg_Day = Day;
             Egg_Month = Month;
-            Egg_Year = Year;
+            Egg_Year = Year - 2000;
         }
         private void TradeGeoLocation(int GeoCountry, int GeoRegion)
         {
diff --git a/PKX/f1-Main.cs b/PKX/f1-Main.cs
index a1e6931b8..646055d49 100644
--- a/PKX/f1-Main.cs
+++ b/PKX/f1-Main.cs
@@ -2341,7 +2341,7 @@ public byte[] preparepkx(bool click = true)
             pk6.Met_Location = Util.getIndex(CB_MetLocation);
 
             if (pk6.IsEgg && pk6.Met_Location == 0)    // If still an egg, it has no hatch location/date. Zero it!
-                pk6.Egg_Year = pk6.Egg_Month = pk6.Egg_Day = 0;
+                pk6.Met_Year = pk6.Met_Month = pk6.Met_Day = 0;
 
             // 0xD7 Unknown