From 392dfbbb4e85b9b2b516fcc4eded9572506ab831 Mon Sep 17 00:00:00 2001 From: Kurt Date: Thu, 17 Aug 2023 10:23:29 -0700 Subject: [PATCH] Gen4 trade gift nickname --- .../Legality/Encounters/Templates/Gen4/EncounterTrade4PID.cs | 2 +- .../Encounters/Templates/Gen4/EncounterTrade4RanchGift.cs | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/PKHeX.Core/Legality/Encounters/Templates/Gen4/EncounterTrade4PID.cs b/PKHeX.Core/Legality/Encounters/Templates/Gen4/EncounterTrade4PID.cs index ee8507000..ce3b344f6 100644 --- a/PKHeX.Core/Legality/Encounters/Templates/Gen4/EncounterTrade4PID.cs +++ b/PKHeX.Core/Legality/Encounters/Templates/Gen4/EncounterTrade4PID.cs @@ -112,7 +112,7 @@ public PK4 ConvertToPKM(ITrainerInfo tr, EncounterCriteria criteria) OT_Friendship = PersonalTable.DP[Species, Form].BaseFriendship, IsNicknamed = true, - Nickname = SpeciesName.GetSpeciesNameGeneration(Species, lang, Generation), + Nickname = Nicknames[lang], HT_Name = tr.OT, HT_Gender = tr.Gender, diff --git a/PKHeX.Core/Legality/Encounters/Templates/Gen4/EncounterTrade4RanchGift.cs b/PKHeX.Core/Legality/Encounters/Templates/Gen4/EncounterTrade4RanchGift.cs index d057bf17c..bacc7f072 100644 --- a/PKHeX.Core/Legality/Encounters/Templates/Gen4/EncounterTrade4RanchGift.cs +++ b/PKHeX.Core/Legality/Encounters/Templates/Gen4/EncounterTrade4RanchGift.cs @@ -95,7 +95,6 @@ public PK4 ConvertToPKM(ITrainerInfo tr, EncounterCriteria criteria) OT_Friendship = PersonalTable.DP[Species, Form].BaseFriendship, - IsNicknamed = true, Nickname = SpeciesName.GetSpeciesNameGeneration(Species, lang, Generation), HT_Name = tr.OT,