From 10b158f82b3af2c05b4e32b41ff2543e02f39496 Mon Sep 17 00:00:00 2001 From: Kurt Date: Mon, 18 Dec 2023 10:36:39 -0800 Subject: [PATCH] Update EncounterTrade9.cs Update EncounterTrade9.cs --- .../Legality/Encounters/Templates/Gen9/EncounterTrade9.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PKHeX.Core/Legality/Encounters/Templates/Gen9/EncounterTrade9.cs b/PKHeX.Core/Legality/Encounters/Templates/Gen9/EncounterTrade9.cs index 656e4a989..b2106e75d 100644 --- a/PKHeX.Core/Legality/Encounters/Templates/Gen9/EncounterTrade9.cs +++ b/PKHeX.Core/Legality/Encounters/Templates/Gen9/EncounterTrade9.cs @@ -92,8 +92,8 @@ public PK9 ConvertToPKM(ITrainerInfo tr, EncounterCriteria criteria) OT_Friendship = pi.BaseFriendship, - IsNicknamed = true, - Nickname = Nicknames[lang], + IsNicknamed = IsFixedNickname, + Nickname = IsFixedNickname ? Nicknames[lang] : SpeciesName.GetSpeciesNameGeneration(Species, lang, Generation), HeightScalar = PokeSizeUtil.GetRandomScalar(), WeightScalar = Weight.GetSizeValue(Weight != SizeType9.RANDOM ? FixedValueScale : default, ref rnd),