From d85bb7620885fe1ef4d0966a7cbd1528f6bab6b6 Mon Sep 17 00:00:00 2001 From: Kurt Date: Tue, 8 Jan 2019 18:35:26 -0800 Subject: [PATCH] Mirror order of operations from pb7 see prior commit; this doesn't make any difference since CurrentFriendship isn't being called; but we're just matching the flow. Closes #2235 --- PKHeX.Core/PKM/PK6.cs | 2 +- PKHeX.Core/PKM/PK7.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PKHeX.Core/PKM/PK6.cs b/PKHeX.Core/PKM/PK6.cs index 698b6a63b..3fd2a1876 100644 --- a/PKHeX.Core/PKM/PK6.cs +++ b/PKHeX.Core/PKM/PK6.cs @@ -420,12 +420,12 @@ protected override void TradeHT(string SAV_Trainer, int SAV_COUNTRY, int SAV_REG if (SAV_Trainer != HT_Name || SAV_GENDER != HT_Gender || (Geo1_Country == 0 && Geo1_Region == 0 && !IsUntradedEvent6)) this.TradeGeoLocation(SAV_COUNTRY, SAV_REGION); - CurrentHandler = 1; if (HT_Name != SAV_Trainer) { HT_Friendship = PersonalInfo.BaseFriendship; HT_Affection = 0; } + CurrentHandler = 1; HT_Name = SAV_Trainer; HT_Gender = SAV_GENDER; diff --git a/PKHeX.Core/PKM/PK7.cs b/PKHeX.Core/PKM/PK7.cs index daae22064..96eb37909 100644 --- a/PKHeX.Core/PKM/PK7.cs +++ b/PKHeX.Core/PKM/PK7.cs @@ -481,12 +481,12 @@ protected override void TradeHT(string SAV_Trainer, int SAV_COUNTRY, int SAV_REG this.TradeGeoLocation(SAV_COUNTRY, SAV_REGION); } - CurrentHandler = 1; if (HT_Name != SAV_Trainer) { HT_Friendship = PersonalInfo.BaseFriendship; HT_Affection = 0; } + CurrentHandler = 1; HT_Name = SAV_Trainer; HT_Gender = SAV_GENDER;