Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-05-09 04:24:36 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Mirror order of operations from pb7

Browse Source 
see prior commit; this doesn't make any difference since
CurrentFriendship isn't being called; but we're just matching the flow.
Closes #2235
This commit is contained in:
Kurt 2019-01-08 18:35:26 -08:00
parent fef80d5a05
commit d85bb76208
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PKHeX.Core/PKM/PK6.cs
View File

@ -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;

2
PKHeX.Core/PKM/PK7.cs
View File

@ -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;