Merge branch 'master' into dev

Data/Scripts/012_Overworld/002_Battle triggering/002_Overworld_BattleIntroAnim.rb

@@ -88,9 +88,8 @@ def pbBattleAnimation(bgm=nil,battletype=0,foe=nil)
     end
     # Play main animation
     Graphics.freeze
-    anim = "battle4"
-    Graphics.transition(25, sprintf("Graphics/Transitions/%s", anim))
     viewport.color = Color.new(0,0,0,255)   # Ensure screen is black
+    Graphics.transition(25, sprintf("Graphics/Transitions/%s", anim))
     # Slight pause after animation before starting up the battle scene
     (Graphics.frame_rate/10).times do
       Graphics.update

Data/Scripts/012_Overworld/007_Overworld_DayCare.rb

@@ -193,8 +193,9 @@ def pbDayCareGenerateEgg
   egg.personalID = pid
   # Inheriting form
   if [:BURMY, :SHELLOS, :BASCULIN, :FLABEBE, :PUMPKABOO, :ORICORIO, :ROCKRUFF, :MINIOR].include?(babyspecies)
-    newForm = mother.form
-    newForm = 0 if mother.isSpecies?(:MOTHIM)
+    parent = (ditto0 || (!pkmn0.female? && ditto1)) ? father : mother
+    newForm = parent.form
+    newForm = 0 if parent.isSpecies?(:MOTHIM)
     egg.form = newForm
   end
   # Inheriting regional form