mirror of
https://github.com/kwsch/PKHeX
synced 2024-09-21 23:02:00 +00:00
Fix pb7 trade logic
Update handler after friendship update (CurrentHandler needs to update afterwards) Fix argument order (gender & nonpresent region data) #2235 side effect
This commit is contained in:
parent
bc8b48eb88
commit
fef80d5a05
2 changed files with 2 additions and 2 deletions
|
@ -335,12 +335,12 @@ namespace PKHeX.Core
|
|||
|
||||
protected override void TradeHT(string SAV_Trainer, int SAV_COUNTRY, int SAV_REGION, int SAV_GENDER, bool Bank)
|
||||
{
|
||||
CurrentHandler = 1;
|
||||
if (HT_Name != SAV_Trainer)
|
||||
{
|
||||
HT_Friendship = CurrentFriendship; // PersonalInfo.BaseFriendship;
|
||||
HT_Affection = 0;
|
||||
}
|
||||
CurrentHandler = 1;
|
||||
HT_Name = SAV_Trainer;
|
||||
HT_Gender = SAV_GENDER;
|
||||
}
|
||||
|
|
|
@ -151,7 +151,7 @@ namespace PKHeX.Core
|
|||
// Apply to this Save File
|
||||
int CT = pk.CurrentHandler;
|
||||
var Date = DateTime.Now;
|
||||
pk.Trade(OT, TID, SID, Gender, Date.Day, Date.Month, false, Date.Year);
|
||||
pk.Trade(OT, TID, SID, 0, 0, Gender, false, Date.Day, Date.Month, Date.Year);
|
||||
if (CT != pk.CurrentHandler) // Logic updated Friendship
|
||||
{
|
||||
// Copy over the Friendship Value only under certain circumstances
|
||||
|
|
Loading…
Reference in a new issue