non custom finals export + random changes

Data/Scripts/048_Fusion/FusionPreviewScreen.rb

@@ -0,0 +1,38 @@
+class FusionPreviewScreen < DoublePreviewScreen
+  attr_reader :poke1
+  attr_reader :poke2
+  attr_reader :fusedPokemon
+  attr_reader :fusedPokemon
+
+  attr_writer :draw_types
+  attr_writer :draw_level
+
+  BACKGROUND_PATH = "Graphics/Pictures/DNAbg"
+
+
+  def initialize(poke1,poke2, usingSuperSplicers=false)
+    super(poke1,poke2)
+    @draw_types = true
+    @draw_level = true
+
+    #@viewport = viewport
+    @poke1 = poke1
+    @poke2 = poke2
+    @fusedPokemon=nil
+    new_level = calculateFusedPokemonLevel(poke1.level, poke2.level, usingSuperSplicers)
+
+    fusion_left = (poke1.species_data.id_number) * NB_POKEMON + poke2.species_data.id_number
+    fusion_right = (poke2.species_data.id_number) * NB_POKEMON + poke1.species_data.id_number
+
+    @picture1 = draw_window(fusion_left,new_level,20,30)
+    @picture2 = draw_window(fusion_right,new_level,270,30)
+
+    @sprites["picture1"] = @picture1
+    @sprites["picture2"] = @picture2
+
+  end
+
+  def getBackgroundPicture
+    super
+  end
+end

Data/Scripts/048_Fusion/PokemonFusion.rb

@@ -734,6 +734,9 @@ class PokemonFusionScene
 
       #change species
       @pokemon1.species = newSpecies
+      if @pokemon2.egg? || @pokemon1.egg?
+        @pokemon1.steps_to_hatch = @pokemon1.species_data.hatch_steps
+      end
       #@pokemon1.ability = pbChooseAbility(@pokemon1, hiddenAbility1, hiddenAbility2)
       pbChooseAbility(@pokemon1, hiddenAbility1, hiddenAbility2)