Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-09-21 14:51:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Disable catch rate updating on pk1->pk2 xfr

Browse source 
Closes #1414
This commit is contained in:
Kurt 2017-08-24 10:08:01 -07:00
parent 261349c90f
commit c2124a4bbd
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PKHeX.Core/PKM/PK1.cs
View file

@ -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;

2
PKHeX.Core/PKM/PK2.cs
View file

@ -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;