From 9c5c3c77ed10613e0667716bc3f903db92c4667e Mon Sep 17 00:00:00 2001
From: Maruno17 <serialcolour@hotmail.com>
Date: Thu, 19 Aug 2021 18:29:53 +0100
Subject: [PATCH] =?UTF-8?q?Fixed=20changing=20a=20Pok=C3=A9mon's=20species?=
 =?UTF-8?q?=20to=20a=20single=20gendered/non-gendered=20one=20not=20updati?=
 =?UTF-8?q?ng=20its=20gender,=20enabled=20a=20bred=20Mr.=20Mime/Meowth=20t?=
 =?UTF-8?q?o=20inherit=20Galarian=20forms?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Data/Scripts/012_Overworld/007_Overworld_DayCare.rb | 13 +++++++------
 Data/Scripts/014_Pokemon/001_Pokemon.rb             |  1 +
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Data/Scripts/012_Overworld/007_Overworld_DayCare.rb b/Data/Scripts/012_Overworld/007_Overworld_DayCare.rb
index 4f541d39b..a3a79b328 100644
--- a/Data/Scripts/012_Overworld/007_Overworld_DayCare.rb
+++ b/Data/Scripts/012_Overworld/007_Overworld_DayCare.rb
@@ -199,12 +199,13 @@ def pbDayCareGenerateEgg
   end
   # Inheriting regional form
   if [:RATTATA, :SANDSHREW, :VULPIX, :DIGLETT, :MEOWTH, :GEODUDE, :GRIMER,
-      :PONYTA, :SLOWPOKE, :FARFETCHD, :ARTICUNO, :ZAPDOS, :MOLTRES, :CORSOLA,
-      :ZIGZAGOON, :DARUMAKA, :YAMASK, :STUNFISK].include?(babyspecies)
-    if mother.form==1
-      egg.form = 1 if mother.hasItem?(:EVERSTONE)
-    elsif father.species_data.get_baby_species(true, mother.item_id, father.item_id) == babyspecies
-      egg.form = 1 if father.form==1 && father.hasItem?(:EVERSTONE)
+      :PONYTA, :SLOWPOKE, :FARFETCHD, :MRMINE, :ARTICUNO, :ZAPDOS, :MOLTRES,
+      :CORSOLA, :ZIGZAGOON, :DARUMAKA, :YAMASK, :STUNFISK].include?(babyspecies)
+    if mother.form > 0
+      egg.form = mother.form if mother.hasItem?(:EVERSTONE)
+    elsif father.form > 0 &&
+       father.species_data.get_baby_species(true, mother.item_id, father.item_id) == babyspecies
+      egg.form = father.form if father.hasItem?(:EVERSTONE)
     end
   end
   # Inheriting Moves
diff --git a/Data/Scripts/014_Pokemon/001_Pokemon.rb b/Data/Scripts/014_Pokemon/001_Pokemon.rb
index 61e694df2..47064672c 100644
--- a/Data/Scripts/014_Pokemon/001_Pokemon.rb
+++ b/Data/Scripts/014_Pokemon/001_Pokemon.rb
@@ -122,6 +122,7 @@ class Pokemon
     @species     = new_species_data.species
     @form        = new_species_data.form if new_species_data.form != 0
     @forced_form = nil
+    @gender      = nil if singleGendered?
     @level       = nil   # In case growth rate is different for the new species
     @ability     = nil
     calc_stats