release 6.2

Data/Scripts/048_Fusion/FusedSpecies.rb

@@ -44,8 +44,8 @@ module GameData
       @egg_moves = calculate_egg_moves() # hash[:egg_moves] || []
 
       #Abilities
-      @abilities = calculate_abilities(@body_pokemon, @head_pokemon) # hash[:abilities] || []
-      @hidden_abilities = calculate_hidden_abilities(@body_pokemon, @head_pokemon) # hash[:hidden_abilities] || []
+      @abilities = calculate_abilities() # hash[:abilities] || []
+      @hidden_abilities = calculate_hidden_abilities() # hash[:hidden_abilities] || []
 
       #wild held items
       @wild_item_common = get_wild_item(@head_pokemon.wild_item_common, @body_pokemon.wild_item_common) # hash[:wild_item_common]
@@ -104,7 +104,6 @@ module GameData
       return @head_pokemon
     end
 
-
     def adjust_stats_with_evs
       GameData::Stat.each_main do |s|
         @base_stats[s.id] = 1 if !@base_stats[s.id] || @base_stats[s.id] <= 0
@@ -181,25 +180,50 @@ module GameData
       end
     end
 
-    def calculate_abilities(pokemon1, pokemon2)
+    def calculate_abilities()
       abilities_hash = []
 
-      ability1 = pokemon1.abilities[0]
-      ability2 = pokemon2.abilities[1]
-      if !ability2
-        ability2 = pokemon2.abilities[0]
-      end
+      ability1 = @body_pokemon.abilities[0]
+      ability2 = @head_pokemon.abilities[0]
       abilities_hash << ability1
       abilities_hash << ability2
       return abilities_hash
     end
 
-    def calculate_hidden_abilities(pokemon1, pokemon2)
+    # def calculate_abilities(pokemon1, pokemon2)
+    #   abilities_hash = []
+    #
+    #   ability1 = pokemon1.abilities[0]
+    #   ability2 = pokemon2.abilities[1]
+    #   if !ability2
+    #     ability2 = pokemon2.abilities[0]
+    #   end
+    #   abilities_hash << ability1
+    #   abilities_hash << ability2
+    #   return abilities_hash
+    # end
+
+    def calculate_hidden_abilities()
+      abilities_hash = []
+
       #First two spots are the other abilities of the two pokemon
-      abilities_hash = calculate_abilities(pokemon2, pokemon1)
+      ability1 = @body_pokemon.abilities[1]
+      ability2 = @head_pokemon.abilities[1]
+      ability1 = @body_pokemon.abilities[0] if !ability1
+      ability2 = @head_pokemon.abilities[0] if !ability2
+
+      abilities_hash << ability1
+      abilities_hash << ability2
+
       #add the hidden ability for the two base pokemon
-      abilities_hash << @body_pokemon.hidden_abilities[0]
-      abilities_hash << @head_pokemon.hidden_abilities[0]
+      hiddenAbility1 = @body_pokemon.hidden_abilities[0]
+      hiddenAbility1 = ability1 if !hiddenAbility1
+
+      hiddenAbility2 = @head_pokemon.hidden_abilities[0]
+      hiddenAbility2 = ability2 if !hiddenAbility2
+
+      abilities_hash << hiddenAbility1
+      abilities_hash << hiddenAbility2
       return abilities_hash
     end
 
@@ -288,7 +312,7 @@ module GameData
       growth_rate_priority = [:Slow, :Erratic, :Fluctuating, :Parabolic, :Medium, :Fast] #todo rearrange order for balance?
       body_growth_rate = @body_pokemon.growth_rate
       head_growth_rate = @head_pokemon.growth_rate
-      base_growth_rates =[body_growth_rate,head_growth_rate]
+      base_growth_rates = [body_growth_rate, head_growth_rate]
       for rate in growth_rate_priority
         return rate if base_growth_rates.include?(rate)
       end

Data/Scripts/048_Fusion/FusionMovesMenu.rb

@@ -41,8 +41,8 @@ class FusionMovesOptionsScene < PokemonOption_Scene
     @sprites["overlay"].z = 9999
     pbSetSystemFont(@sprites["overlay"].bitmap)
 
-    @sprites["option"].nameBaseColor = Color.new(35, 130, 200)
-    @sprites["option"].nameShadowColor = Color.new(20, 75, 115)
+    @sprites["option"].nameBaseColor = MessageConfig::BLUE_TEXT_MAIN_COLOR
+    @sprites["option"].nameShadowColor = MessageConfig::BLUE_TEXT_SHADOW_COLOR
     @changedColor = true
     for i in 0...@PokemonOptions.length
       @sprites["option"][i] = (@PokemonOptions[i].get || 0)

Data/Scripts/048_Fusion/PokemonFusion.rb

@@ -869,17 +869,23 @@ class PokemonFusionScene
       overlay.dispose
       #first check if hidden ability
       # getAbilityList format: [[:ABILITY, index],...]
-      hiddenAbility1 = @pokemon1.ability == @pokemon1.getAbilityList[-1][0]
-      hiddenAbility2 = @pokemon2.ability == @pokemon2.getAbilityList[-1][0]
+      # hiddenAbility1 = @pokemon1.ability == @pokemon1.getAbilityList[-1][0]
+      # hiddenAbility2 = @pokemon2.ability == @pokemon2.getAbilityList[-1][0]
+
+      # ability1 = @pokemon1.ability_index
+      # ability2 = @pokemon2.ability_index
 
       #change species
+      ability1 = @pokemon1.ability
+      ability2 = @pokemon2.ability
+
       @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)
+      pbChooseAbility(ability1,ability2)
 
       setFusionMoves(@pokemon1, @pokemon2, firstOptionSelected) if !noMoves
 

Data/Scripts/048_Fusion/SplitNames.rb

@@ -196,7 +196,7 @@ module GameData
     ["Yan", "ma"],
     ["Woo", "per"],
     ["Quag", "sire"],
-    ["Es", "peon"],
+    ["Esp", "eon"],
     ["Umb", "reon"],
     ["Mur", "krow"],
     ["Slow", "king"],
@@ -598,7 +598,7 @@ module GameData
     ["Jol", "tik"],
     ["Galvan", "tula"],
     ["Ferro", "seed"],
-    ["Ferron ", "thorn"],
+    ["Ferro", "thorn"],
     ["Kli", "ink"],
     ["Kla", "ang"],
     ["Klink", "klang"],