Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2025-02-18 14:28:33 +00:00
Code Issues Projects Releases Packages 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
commit b0bbbbadac
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
PKHeX/MysteryGifts/WC6.cs
View file

@ -381,11 +381,10 @@ namespace PKHeX.Core
switch (IVs[0]) switch (IVs[0])
{ {
case 0xFE: case 0xFE:
finalIVs[0] = 31; do { // 3 Perfect IVs
do { // 31 HP IV, 2 other 31s for (int i = 0; i < 6; i++)
for (int i = 1; i < 6; i++)
finalIVs[i] = IVs[i] > 31 ? (int)(Util.rnd32() & 0x1F) : IVs[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; break;
case 0xFD: case 0xFD:
do { // 2 other 31s do { // 2 other 31s
@ -429,7 +428,8 @@ namespace PKHeX.Core
pk.PID = (uint)(((TID ^ SID ^ (pk.PID & 0xFFFF)) << 16) + (pk.PID & 0xFFFF)); pk.PID = (uint)(((TID ^ SID ^ (pk.PID & 0xFFFF)) << 16) + (pk.PID & 0xFFFF));
break; break;
case 03: // Random Nonshiny 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; break;
} }

10
PKHeX/MysteryGifts/WC7.cs
View file

@ -408,11 +408,10 @@ namespace PKHeX.Core
switch (IVs[0]) switch (IVs[0])
{ {
case 0xFE: case 0xFE:
finalIVs[0] = 31; do { // 3 Perfect IVs
do { // 31 HP IV, 2 other 31s for (int i = 0; i < 6; i++)
for (int i = 1; i < 6; i++)
finalIVs[i] = IVs[i] > 31 ? (int)(Util.rnd32() & 0x1F) : IVs[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; break;
case 0xFD: case 0xFD:
do { // 2 other 31s do { // 2 other 31s
@ -456,7 +455,8 @@ namespace PKHeX.Core
pk.PID = (uint)(((TID ^ SID ^ (pk.PID & 0xFFFF)) << 16) + (pk.PID & 0xFFFF)); pk.PID = (uint)(((TID ^ SID ^ (pk.PID & 0xFFFF)) << 16) + (pk.PID & 0xFFFF));
break; break;
case 03: // Random Nonshiny 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; break;
} }