Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-10-02 14:07:05 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #940 from wwwwwwzx/master

Browse Source 
Fix WC to PKM Converter
This commit is contained in:
Kurt
2017-03-16 09:17:52 -07:00
committed by GitHub
parent cf29c912be c5cde538a6
commit b0bbbbadac
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
PKHeX/MysteryGifts/WC6.cs
View File

@@ -381,11 +381,10 @@ public override PKM convertToPKM(SaveFile SAV)
switch (IVs[0])
{
case 0xFE:
finalIVs[0] = 31;
do { // 31 HP IV, 2 other 31s
for (int i = 1; i < 6; i++)
do { // 3 Perfect IVs
for (int i = 0; i < 6; i++)
finalIVs[i] = IVs[i] > 31 ? (int)(Util.rnd32() & 0x1F) : IVs[i];
} while (finalIVs.Count(r => r == 31) < 3); // 31 + 2*31
} while (finalIVs.Count(r => r == 31) < 3); // 3*31
break;
case 0xFD:
do { // 2 other 31s
@@ -429,7 +428,8 @@ public override PKM convertToPKM(SaveFile SAV)
pk.PID = (uint)(((TID ^ SID ^ (pk.PID & 0xFFFF)) << 16) + (pk.PID & 0xFFFF));
break;
case 03: // Random Nonshiny
do { pk.PID = Util.rnd32(); } while ((uint)(((TID ^ SID ^ (pk.PID & 0xFFFF)) << 16) + (pk.PID & 0xFFFF)) < 16);
pk.PID = Util.rnd32();
if ((uint)(((TID ^ SID ^ (pk.PID & 0xFFFF)) << 16) + (pk.PID & 0xFFFF)) < 16) pk.PID ^= 0x10000000;
break;
}

10
PKHeX/MysteryGifts/WC7.cs
View File

@@ -408,11 +408,10 @@ public override PKM convertToPKM(SaveFile SAV)
switch (IVs[0])
{
case 0xFE:
finalIVs[0] = 31;
do { // 31 HP IV, 2 other 31s
for (int i = 1; i < 6; i++)
do { // 3 Perfect IVs
for (int i = 0; i < 6; i++)
finalIVs[i] = IVs[i] > 31 ? (int)(Util.rnd32() & 0x1F) : IVs[i];
} while (finalIVs.Count(r => r == 31) < 3); // 31 + 2*31
} while (finalIVs.Count(r => r == 31) < 3); // 3*31
break;
case 0xFD:
do { // 2 other 31s
@@ -456,7 +455,8 @@ public override PKM convertToPKM(SaveFile SAV)
pk.PID = (uint)(((TID ^ SID ^ (pk.PID & 0xFFFF)) << 16) + (pk.PID & 0xFFFF));
break;
case 03: // Random Nonshiny
do { pk.PID = Util.rnd32(); } while ((uint)(((TID ^ SID ^ (pk.PID & 0xFFFF)) << 16) + (pk.PID & 0xFFFF)) < 16);
pk.PID = Util.rnd32();
if ((uint)(((TID ^ SID ^ (pk.PID & 0xFFFF)) << 16) + (pk.PID & 0xFFFF)) < 16) pk.PID ^= 0x10000000;
break;
}