From f82e545ab02ed5bd484d036dee2623edc699a620 Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Thu, 10 May 2018 20:22:32 -0700
Subject: [PATCH] Update gender handling

Closes #1934 , unrelated tho
---
 PKHeX.Core/PKM/Editing/CommonEdits.cs | 15 ++++-----------
 PKHeX.Core/PKM/PKX.cs                 |  2 --
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/PKHeX.Core/PKM/Editing/CommonEdits.cs b/PKHeX.Core/PKM/Editing/CommonEdits.cs
index 0b4812593..d212939a4 100644
--- a/PKHeX.Core/PKM/Editing/CommonEdits.cs
+++ b/PKHeX.Core/PKM/Editing/CommonEdits.cs
@@ -208,17 +208,10 @@ public static void SetMaximumPPCurrent(this PKM pk, int[] Moves = null)
         /// <param name="gender">Desired <see cref="PKM.Gender"/> value to set.</param>
         public static void SetGender(this PKM pk, string gender)
         {
-            if (gender == null)
-            {
-                int cg = pk.Gender;
-                int sane = pk.GetSaneGender();
-                if (cg != sane)
-                    pk.Gender = sane;
-                return;
-            }
-
-            int Gender = PKX.GetGenderFromString(gender);
-            pk.SetGender(Gender);
+            int g = gender == null
+                ? pk.GetSaneGender()
+                : PKX.GetGenderFromString(gender);
+            pk.SetGender(g);
         }
 
         /// <summary>
diff --git a/PKHeX.Core/PKM/PKX.cs b/PKHeX.Core/PKM/PKX.cs
index cf9e47e11..b74fdb258 100644
--- a/PKHeX.Core/PKM/PKX.cs
+++ b/PKHeX.Core/PKM/PKX.cs
@@ -345,8 +345,6 @@ public static uint GetEXP(int level, int species)
         /// <returns>Gender integer</returns>
         public static int GetGenderFromString(string s)
         {
-            if (s == null) 
-                return -1;
             if (s == "♂" || s == "M")
                 return 0;
             if (s == "♀" || s == "F")