Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-10 14:44:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

gender check update

Browse source 
check gender correctly for transferred species
This commit is contained in:
Kurt 2017-03-25 00:01:02 -07:00
parent 047d7a0ae5
commit 13965d2766
9 changed files with 20 additions and 129 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
PKHeX/PKM/BK4.cs
View file

@ -403,24 +403,6 @@ namespace PKHeX.Core
}
// Methods
public override bool getGenderIsValid()
{
int gv = PersonalTable.HGSS[Species].Gender;
if (gv == 255)
return Gender == 2;
if (gv == 254)
return Gender == 0;
if (gv == 0)
return Gender == 1;
if (gv <= (PID & 0xFF))
return Gender == 0;
if ((PID & 0xFF) < gv)
return Gender == 1;
return false;
}
protected override ushort CalculateChecksum()
{
ushort chk = 0;

17
PKHeX/PKM/CK3.cs
View file

@ -187,22 +187,5 @@ namespace PKHeX.Core
{
return (byte[])Data.Clone();
}
public override bool getGenderIsValid()
{
int gv = PersonalTable.RS[Species].Gender;
if (gv == 255)
return Gender == 2;
if (gv == 254)
return Gender == 0;
if (gv == 0)
return Gender == 1;
if (gv <= (PID & 0xFF))
return Gender == 0;
if ((PID & 0xFF) < gv)
return Gender == 1;
return false;
}
}
}

18
PKHeX/PKM/PK3.cs
View file

@ -169,24 +169,6 @@ namespace PKHeX.Core
{
return PKX.encryptArray3(Data);
}
public override bool getGenderIsValid()
{
int gv = PersonalInfo.Gender;
if (gv == 255)
return Gender == 2;
if (gv == 254)
return Gender == 1;
if (gv == 0)
return Gender == 0;
if ((PID & 0xFF) <= gv)
return Gender == 1;
if (gv < (PID & 0xFF))
return Gender == 0;
return false;
}
public PK4 convertToPK4()
{
DateTime moment = DateTime.Now;

17
PKHeX/PKM/PK4.cs
View file

@ -385,23 +385,6 @@ namespace PKHeX.Core
}
// Methods
public override bool getGenderIsValid()
{
int gv = PersonalInfo.Gender;
if (gv == 255)
return Gender == 2;
if (gv == 254)
return Gender == 1;
if (gv == 0)
return Gender == 0;
if ((PID & 0xFF) <= gv)
return Gender == 1;
if (gv < (PID & 0xFF))
return Gender == 0;
return false;
}
public override byte[] Encrypt()
{
RefreshChecksum();

17
PKHeX/PKM/PK5.cs
View file

@ -301,23 +301,6 @@ namespace PKHeX.Core
}
// Methods
public override bool getGenderIsValid()
{
int gv = PersonalInfo.Gender;
if (gv == 255)
return Gender == 2;
if (gv == 254)
return Gender == 1;
if (gv == 0)
return Gender == 0;
if ((PID & 0xFF) <= gv)
return Gender == 1;
if (gv < (PID & 0xFF))
return Gender == 0;
return false;
}
public override byte[] Encrypt()
{
RefreshChecksum();

12
PKHeX/PKM/PK6.cs
View file

@ -411,18 +411,6 @@ namespace PKHeX.Core
Checksum = CalculateChecksum();
return PKX.encryptArray(Data);
}
public override bool getGenderIsValid()
{
int gv = PersonalInfo.Gender;
if (gv == 255)
return Gender == 2;
if (gv == 254)
return Gender == 1;
if (gv == 0)
return Gender == 0;
return true;
}
// General User-error Fixes
public void FixRelearn()

12
PKHeX/PKM/PK7.cs
View file

@ -445,18 +445,6 @@ namespace PKHeX.Core
Checksum = CalculateChecksum();
return PKX.encryptArray(Data);
}
public override bool getGenderIsValid()
{
int gv = PersonalInfo.Gender;
if (gv == 255)
return Gender == 2;
if (gv == 254)
return Gender == 1;
if (gv == 0)
return Gender == 0;
return true;
}
// General User-error Fixes
public void FixRelearn()

21
PKHeX/PKM/PKM.cs
View file

@ -512,7 +512,26 @@ namespace PKHeX.Core
/// Checks if the current <see cref="Gender"/> is valid.
/// </summary>
/// <returns>True if valid, False if invalid.</returns>
public abstract bool getGenderIsValid();
public virtual bool getGenderIsValid()
{
int gv = PersonalInfo.Gender;
if (gv == 255)
return Gender == 2;
if (gv == 254)
return Gender == 1;
if (gv == 0)
return Gender == 0;
if (GenNumber >= 6)
return true;
if ((PID & 0xFF) < gv)
return Gender == 1;
if (gv <= (PID & 0xFF))
return Gender == 0;
return false;
}
/// <summary>
/// Updates the checksum of the <see cref="PKM"/>.

17
PKHeX/PKM/XK3.cs
View file

@ -193,22 +193,5 @@ namespace PKHeX.Core
{
return (byte[])Data.Clone();
}
public override bool getGenderIsValid()
{
int gv = PersonalTable.RS[Species].Gender;
if (gv == 255)
return Gender == 2;
if (gv == 254)
return Gender == 0;
if (gv == 0)
return Gender == 1;
if (gv <= (PID & 0xFF))
return Gender == 0;
if ((PID & 0xFF) < gv)
return Gender == 1;
return false;
}
}
}