diff --git a/Data/Scripts/012_Overworld/002_Battle triggering/002_Overworld_BattleIntroAnim.rb b/Data/Scripts/012_Overworld/002_Battle triggering/002_Overworld_BattleIntroAnim.rb
index 83bfd466f..b5df67016 100644
--- a/Data/Scripts/012_Overworld/002_Battle triggering/002_Overworld_BattleIntroAnim.rb	
+++ b/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
diff --git a/Data/Scripts/012_Overworld/007_Overworld_DayCare.rb b/Data/Scripts/012_Overworld/007_Overworld_DayCare.rb
index a3a79b328..974f94f12 100644
--- a/Data/Scripts/012_Overworld/007_Overworld_DayCare.rb
+++ b/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
diff --git a/Data/Scripts/016_UI/003_UI_Pokedex_Main.rb b/Data/Scripts/016_UI/003_UI_Pokedex_Main.rb
index 70c5a3071..d71909165 100644
--- a/Data/Scripts/016_UI/003_UI_Pokedex_Main.rb
+++ b/Data/Scripts/016_UI/003_UI_Pokedex_Main.rb
@@ -140,7 +140,7 @@ class PokedexSearchSelectionSprite < SpriteWrapper
         self.src_rect.y = 88; self.src_rect.height = 44
       when 3,4   # Height, weight
         self.src_rect.y = 132; self.src_rect.height = 44
-      when 6     # Form
+      when 6     # Shape
         self.src_rect.y = 176; self.src_rect.height = 68
       else       # Reset/start/cancel
         self.src_rect.y = 244; self.src_rect.height = 40
@@ -325,7 +325,8 @@ class PokemonPokedex_Scene
     regionalSpecies.each_with_index do |species, i|
       next if !species
       next if !pbCanAddForModeList?($PokemonGlobal.pokedexMode, species)
-      species_data = GameData::Species.get(species)
+      _gender, form = $Trainer.pokedex.last_form_seen(species)
+      species_data = GameData::Species.get_species_form(species, form)
       color  = species_data.color
       type1  = species_data.type1
       type2  = species_data.type2 || type1
@@ -1106,7 +1107,7 @@ class PokemonPokedex_Scene
           newparam = pbDexSearchCommands(5,[params[8]],index)
           params[8] = newparam[0] if newparam!=nil
           pbRefreshDexSearch(params,index)
-        when 6   # Filter by form
+        when 6   # Filter by shape
           newparam = pbDexSearchCommands(6,[params[9]],index)
           params[9] = newparam[0] if newparam!=nil
           pbRefreshDexSearch(params,index)