From 042e5176a64d5a6fb697063b8b32a02dd78998c2 Mon Sep 17 00:00:00 2001 From: Kurt Date: Tue, 30 Apr 2019 17:03:12 -0700 Subject: [PATCH] Remove hardy shuckie & version split Not version specific; I'm assuming the 00020003 PID is a result of hacking the save file to change OT gender. Legitimate saves haven't yielded the Hardy PID. Changing gender probably results in a bad pointer, fetching the wrong value. Closes #2290 --- PKHeX.Core/Legality/Encounters/Data/Encounters4.cs | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/PKHeX.Core/Legality/Encounters/Data/Encounters4.cs b/PKHeX.Core/Legality/Encounters/Data/Encounters4.cs index 452bdb785..830b42e4c 100644 --- a/PKHeX.Core/Legality/Encounters/Data/Encounters4.cs +++ b/PKHeX.Core/Legality/Encounters/Data/Encounters4.cs @@ -81,12 +81,6 @@ namespace PKHeX.Core MarkEncounterTradeStrings(TradeGift_DPPt, TradeDPPt); MarkEncounterTradeStrings(TradeGift_HGSS, TradeHGSS); - // divergent version trade fix - var shuckie1 = TradeGift_HGSS[TradeGift_HGSS.Length - 2]; - var shuckie2 = TradeGift_HGSS[TradeGift_HGSS.Length - 1]; - shuckie2.TrainerNames = shuckie1.TrainerNames; - shuckie2.Nicknames = shuckie1.Nicknames; - foreach (var t in RanchGifts) t.TrainerNames = RanchOTNames; @@ -1042,8 +1036,7 @@ namespace PKHeX.Core new EncounterTradePID { Species = 208, Ability = 1, TID = 26491, SID = 00000, OTGender = 1, Gender = 0, IVs = new[] {08,30,28,06,18,20}, PID = 0x00101596}, // Steelix //Gift new EncounterTradePID { Species = 021, Ability = 1, TID = 01001, SID = 00000, OTGender = 0, Gender = 1, IVs = new[] {15,20,15,20,20,20}, PID = 0x00006B5E, Level = 20, Location = 183, Moves = new[]{043,031,228,332} },// Webster's Spearow - new EncounterTradePID { Species = 213, Ability = 2, TID = 04336, SID = 00001, OTGender = 0, Gender = 0, IVs = new[] {15,20,15,20,20,20}, PID = 0x000214D7, Level = 20, Location = 130, Moves = new[]{132,117,227,219}, Version = GameVersion.HG },// Kirk's Shuckle - new EncounterTradePID { Species = 213, Ability = 2, TID = 04336, SID = 00001, OTGender = 0, Gender = 1, IVs = new[] {15,20,15,20,20,20}, PID = 0x00020003, Level = 20, Location = 130, Moves = new[]{132,117,227,219}, Version = GameVersion.SS },// Kirk's Shuckle + new EncounterTradePID { Species = 213, Ability = 2, TID = 04336, SID = 00001, OTGender = 0, Gender = 0, IVs = new[] {15,20,15,20,20,20}, PID = 0x000214D7, Level = 20, Location = 130, Moves = new[]{132,117,227,219} },// Kirk's Shuckle }; private static readonly string[][] TradeDPPt =