From 93ca091eb816637a2c36e05f708bbf43684aa4a3 Mon Sep 17 00:00:00 2001 From: Kurt Date: Mon, 26 Mar 2018 23:22:11 -0700 Subject: [PATCH] Fix gen4 event location string name output legalityanalysis spat out the unshifted value or none at all (bank 3000 was not returned) --- PKHeX.Core/Game/GameInfo.cs | 1 + PKHeX.Core/MysteryGifts/PGT.cs | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/PKHeX.Core/Game/GameInfo.cs b/PKHeX.Core/Game/GameInfo.cs index d8229ea5c..313fe63fb 100644 --- a/PKHeX.Core/Game/GameInfo.cs +++ b/PKHeX.Core/Game/GameInfo.cs @@ -590,6 +590,7 @@ private static string[] GetLocationNames(int gen, int bankID) { case 0: return Strings.metHGSS_00000; case 2: return Strings.metHGSS_02000; + case 3: return Strings.metHGSS_03000; default: return null; } case 5: diff --git a/PKHeX.Core/MysteryGifts/PGT.cs b/PKHeX.Core/MysteryGifts/PGT.cs index 4bb9464f6..b5fd735b9 100644 --- a/PKHeX.Core/MysteryGifts/PGT.cs +++ b/PKHeX.Core/MysteryGifts/PGT.cs @@ -90,8 +90,10 @@ public override string CardTitle public override int TID { get => Gift.TID; set => Gift.TID = value; } public override int SID { get => Gift.SID; set => Gift.SID = value; } public override string OT_Name { get => Gift.OT_Name; set => Gift.OT_Name = value; } - public override int Location { get => Gift.Location; set => Gift.Location = value; } - public override int EggLocation { get => Gift.EggLocation; set => Gift.EggLocation = value; } + + // ILocation overrides + public override int Location { get => IsEgg ? 0 : Gift.EggLocation + 3000; set { } } + public override int EggLocation { get => IsEgg ? Gift.EggLocation + 3000 : 0; set { } } public bool GiftEquals(PGT pgt) {