Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-23 20:43:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix PGF antishiny generation and nonshiny abils

Browse source 
Move PID modification for ability after all other PID modification methods
Update antishiny xor to match the games
This commit is contained in:
Kurt 2017-04-11 14:16:28 -07:00 committed by GitHub
parent b3118afa3b
commit 30706835ad
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
PKHeX/MysteryGifts/PGF.cs
View file

@ -258,8 +258,6 @@ namespace PKHeX.Core
else
{
pk.PID = Util.rnd32();
// Force Ability
if (av == 0) pk.PID &= 0xFFFEFFFF; else pk.PID |= 0x10000;
// Force Gender
do { pk.PID = (pk.PID & 0xFFFFFF00) | Util.rnd32() & 0xFF; } while (!pk.getGenderIsValid());
@ -267,16 +265,16 @@ namespace PKHeX.Core
if (PIDType == 2) // Force Shiny
{
uint gb = pk.PID & 0xFF;
pk.PID = (uint)((gb ^ pk.TID ^ pk.SID) << 16) | gb;
if (av == 1) pk.PID |= 0x10000; else pk.PID &= 0xFFFEFFFF;
}
else if (PIDType != 1) // Force Not Shiny
{
if (((pk.PID >> 16) ^ (pk.PID & 0xffff) ^ pk.SID ^ pk.TID) < 8)
pk.PID ^= 0x80000000;
pk.PID ^= 0x10000000;
}
// Force Ability
if (av == 1) pk.PID |= 0x10000; else pk.PID &= 0xFFFEFFFF;
}
if (IsEgg)