From 7c3e5aa83c8e9c85a2f0ac5cdec5e51573f4e74e Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Sun, 17 Feb 2019 22:13:40 -0800
Subject: [PATCH] Make RandomGender a method instead of property

See pkNX for similar change; the functionality is really *method*
---
 .../Legality/Encounters/Generator/EncounterCriteria.cs   | 2 +-
 PKHeX.Core/MysteryGifts/PGF.cs                           | 2 +-
 PKHeX.Core/PersonalInfo/PersonalInfo.cs                  | 9 +++------
 PKHeX.Core/Saves/Substructures/PokeDex/Zukan.cs          | 2 +-
 PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_Misc5.cs   | 2 +-
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/PKHeX.Core/Legality/Encounters/Generator/EncounterCriteria.cs b/PKHeX.Core/Legality/Encounters/Generator/EncounterCriteria.cs
index beab09572..df60f97b7 100644
--- a/PKHeX.Core/Legality/Encounters/Generator/EncounterCriteria.cs
+++ b/PKHeX.Core/Legality/Encounters/Generator/EncounterCriteria.cs
@@ -80,7 +80,7 @@ public int GetGender(int gender, PersonalInfo pkPersonalInfo)
                 return pkPersonalInfo.FixedGender;
             if (Gender >= 0)
                 return Gender;
-            return pkPersonalInfo.RandomGender;
+            return pkPersonalInfo.RandomGender();
         }
 
         public int GetAbility(int abilityType, PersonalInfo pkPersonalInfo)
diff --git a/PKHeX.Core/MysteryGifts/PGF.cs b/PKHeX.Core/MysteryGifts/PGF.cs
index dbe30bea9..18fbf170a 100644
--- a/PKHeX.Core/MysteryGifts/PGF.cs
+++ b/PKHeX.Core/MysteryGifts/PGF.cs
@@ -183,7 +183,7 @@ public override PKM ConvertToPKM(ITrainerInfo SAV, EncounterCriteria criteria)
                 HeldItem = HeldItem,
                 Met_Level = currentLevel,
                 Nature = Nature != -1 ? Nature : Util.Rand.Next(25),
-                Gender = pi.Gender == 255 ? 2 : (Gender != 2 ? Gender : pi.RandomGender),
+                Gender = pi.Gender == 255 ? 2 : (Gender != 2 ? Gender : pi.RandomGender()),
                 AltForm = Form,
                 Version = OriginGame == 0 ? SAV.Game : OriginGame,
                 Language = Language == 0 ? SAV.Language : Language,
diff --git a/PKHeX.Core/PersonalInfo/PersonalInfo.cs b/PKHeX.Core/PersonalInfo/PersonalInfo.cs
index 1d1787b32..383611c11 100644
--- a/PKHeX.Core/PersonalInfo/PersonalInfo.cs
+++ b/PKHeX.Core/PersonalInfo/PersonalInfo.cs
@@ -293,13 +293,10 @@ public int FormeIndex(int species, int forme)
         /// <summary>
         /// Gets a random valid gender for the entry.
         /// </summary>
-        public int RandomGender
+        public int RandomGender()
         {
-            get
-            {
-                var fix = FixedGender;
-                return fix >= 0 ? fix : Util.Rand.Next(2);
-            }
+            var fix = FixedGender;
+            return fix >= 0 ? fix : Util.Rand.Next(2);
         }
 
         public bool IsDualGender => FixedGender < 0;
diff --git a/PKHeX.Core/Saves/Substructures/PokeDex/Zukan.cs b/PKHeX.Core/Saves/Substructures/PokeDex/Zukan.cs
index cc8415c82..001c9a130 100644
--- a/PKHeX.Core/Saves/Substructures/PokeDex/Zukan.cs
+++ b/PKHeX.Core/Saves/Substructures/PokeDex/Zukan.cs
@@ -68,7 +68,7 @@ public virtual void SetSeen(int species, bool value = true)
                 if (GetFlag(OFS_SEEN + (i * BitSeenSize), species - 1))
                     return;
             }
-            var gender = SAV.Personal[species].RandomGender & 1;
+            var gender = SAV.Personal[species].RandomGender() & 1;
             SetAllDexSeenFlags(species - 1, 0, gender, false);
         }
 
diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_Misc5.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_Misc5.cs
index f5fe2cec4..92dcc21cd 100644
--- a/PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_Misc5.cs	
+++ b/PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_Misc5.cs	
@@ -666,7 +666,7 @@ private void B_RandForest_Click(object sender, EventArgs e)
                 s.Species = slot.Species;
                 s.Form = slot.Form;
                 s.Move = slot.Moves?[Util.Rand.Next(slot.Moves.Length)] ?? 0;
-                s.Gender = slot.Gender == -1 ? PersonalTable.B2W2[slot.Species].RandomGender : slot.Gender;
+                s.Gender = slot.Gender == -1 ? PersonalTable.B2W2[slot.Species].RandomGender() : slot.Gender;
             }
             ChangeArea(null, EventArgs.Empty); // refresh
             NUD_Unlocked.Value = 8;