From 0b2d167465c630141fe874c003c6bf91c61072d7 Mon Sep 17 00:00:00 2001 From: Kurt Date: Fri, 18 Aug 2023 08:38:00 -0700 Subject: [PATCH] Update EncounterStatic8a.cs --- .../Encounters/Templates/Gen8a/EncounterStatic8a.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/PKHeX.Core/Legality/Encounters/Templates/Gen8a/EncounterStatic8a.cs b/PKHeX.Core/Legality/Encounters/Templates/Gen8a/EncounterStatic8a.cs index 40b6a1ba2..9dfe3aa32 100644 --- a/PKHeX.Core/Legality/Encounters/Templates/Gen8a/EncounterStatic8a.cs +++ b/PKHeX.Core/Legality/Encounters/Templates/Gen8a/EncounterStatic8a.cs @@ -69,13 +69,9 @@ public PA8 ConvertToPKM(ITrainerInfo tr, EncounterCriteria criteria) Version = (int)Version, IsAlpha = IsAlpha, Ball = (byte)(FixedBall == Ball.None ? Ball.LAPoke : FixedBall), - - HeightScalar = HasFixedHeight ? HeightScalar : PokeSizeUtil.GetRandomScalar(), - WeightScalar = HasFixedWeight ? WeightScalar : PokeSizeUtil.GetRandomScalar(), Nickname = SpeciesName.GetSpeciesNameGeneration(Species, lang, Generation), }; SetPINGA(pk, criteria); - pk.Scale = pk.HeightScalar; pk.ResetHeight(); pk.ResetWeight(); SetEncounterMoves(pk, (byte)pk.Met_Level); @@ -97,6 +93,12 @@ private void SetPINGA(PA8 pk, EncounterCriteria criteria) if (Method == EncounterStatic8aCorrelation.Fixed) pk.EncryptionConstant = Util.Rand32(); + + if (HasFixedHeight) + pk.HeightScalar = HeightScalar; + if (HasFixedWeight) + pk.WeightScalar = WeightScalar; + pk.Scale = pk.HeightScalar; } private void SetEncounterMoves(PA8 pk, int level)