From c5cde538a6f4bbac173085bbe252d25345f94605 Mon Sep 17 00:00:00 2001 From: wwwwwwzx Date: Thu, 16 Mar 2017 03:02:54 -0700 Subject: [PATCH] Actual Shiny Lock Mechanics --- PKHeX/MysteryGifts/WC6.cs | 3 ++- PKHeX/MysteryGifts/WC7.cs | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/PKHeX/MysteryGifts/WC6.cs b/PKHeX/MysteryGifts/WC6.cs index 0a07e96ee..82d0ef872 100644 --- a/PKHeX/MysteryGifts/WC6.cs +++ b/PKHeX/MysteryGifts/WC6.cs @@ -428,7 +428,8 @@ namespace PKHeX.Core 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; } diff --git a/PKHeX/MysteryGifts/WC7.cs b/PKHeX/MysteryGifts/WC7.cs index 18173f598..8d75b1e12 100644 --- a/PKHeX/MysteryGifts/WC7.cs +++ b/PKHeX/MysteryGifts/WC7.cs @@ -455,7 +455,8 @@ namespace PKHeX.Core 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; }