diff --git a/PKHeX.Core/PKM/PK1.cs b/PKHeX.Core/PKM/PK1.cs index 50ed81ad1..691e766f4 100644 --- a/PKHeX.Core/PKM/PK1.cs +++ b/PKHeX.Core/PKM/PK1.cs @@ -137,7 +137,7 @@ namespace PKHeX.Core Data[0] = (byte)SpeciesConverter.SetG1Species(value); // Before updating catch rate, check if non-standard - if (!CatchRateIsItem) + if (TradebackStatus != TradebackType.WasTradeback && !CatchRateIsItem) { int baseSpecies = Legal.GetBaseSpecies(this); int Rate = Catch_Rate; diff --git a/PKHeX.Core/PKM/PK2.cs b/PKHeX.Core/PKM/PK2.cs index 222f67e47..f166a7dee 100644 --- a/PKHeX.Core/PKM/PK2.cs +++ b/PKHeX.Core/PKM/PK2.cs @@ -348,7 +348,7 @@ namespace PKHeX.Core public PK1 ConvertToPK1() { - PK1 pk1 = new PK1(null, Identifier, Japanese); + PK1 pk1 = new PK1(null, Identifier, Japanese) {TradebackStatus = TradebackType.WasTradeback}; Array.Copy(Data, 0x1, pk1.Data, 0x7, 0x1A); pk1.Species = Species; // This will take care of Typing :) pk1.Stat_HPCurrent = Stat_HPCurrent;