From af553adf2f45c056191db7fa33e82dd4a8dba284 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sat, 22 Oct 2016 20:04:59 -0700 Subject: [PATCH] Fix pgf import while loop hung, fix comparators Thanks Odaxis! --- PKHeX/PKM/PK3.cs | 8 ++++---- PKHeX/PKM/PK4.cs | 10 +++++----- PKHeX/PKM/PK5.cs | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/PKHeX/PKM/PK3.cs b/PKHeX/PKM/PK3.cs index 0a673c8b6..c64bc399b 100644 --- a/PKHeX/PKM/PK3.cs +++ b/PKHeX/PKM/PK3.cs @@ -170,13 +170,13 @@ public override bool getGenderIsValid() if (gv == 255) return Gender == 2; if (gv == 254) - return Gender == 0; + return Gender == 1; if (gv == 0) - return Gender == 1; - if (gv <= (PID & 0xFF)) return Gender == 0; - if ((PID & 0xFF) < gv) + if ((PID & 0xFF) <= gv) return Gender == 1; + if (gv < (PID & 0xFF)) + return Gender == 0; return false; } diff --git a/PKHeX/PKM/PK4.cs b/PKHeX/PKM/PK4.cs index ced698550..baebcb292 100644 --- a/PKHeX/PKM/PK4.cs +++ b/PKHeX/PKM/PK4.cs @@ -385,17 +385,17 @@ public override int Characteristic public override bool getGenderIsValid() { int gv = PersonalTable.HGSS[Species].Gender; - + if (gv == 255) return Gender == 2; if (gv == 254) - return Gender == 0; + return Gender == 1; if (gv == 0) - return Gender == 1; - if (gv <= (PID & 0xFF)) return Gender == 0; - if ((PID & 0xFF) < gv) + if ((PID & 0xFF) <= gv) return Gender == 1; + if (gv < (PID & 0xFF)) + return Gender == 0; return false; } diff --git a/PKHeX/PKM/PK5.cs b/PKHeX/PKM/PK5.cs index 33b198389..3f2cbc39b 100644 --- a/PKHeX/PKM/PK5.cs +++ b/PKHeX/PKM/PK5.cs @@ -305,13 +305,13 @@ public override bool getGenderIsValid() if (gv == 255) return Gender == 2; if (gv == 254) - return Gender == 0; + return Gender == 1; if (gv == 0) - return Gender == 1; - if (gv <= (PID & 0xFF)) return Gender == 0; - if ((PID & 0xFF) < gv) + if ((PID & 0xFF) <= gv) return Gender == 1; + if (gv < (PID & 0xFF)) + return Gender == 0; return false; }