diff --git a/Data/Scripts/048_Fusion/PokemonFusion.rb b/Data/Scripts/048_Fusion/PokemonFusion.rb index 1a0e12d79..9ef61464e 100644 --- a/Data/Scripts/048_Fusion/PokemonFusion.rb +++ b/Data/Scripts/048_Fusion/PokemonFusion.rb @@ -730,6 +730,7 @@ class PokemonFusionScene @pokemon1.steps_to_hatch = @pokemon1.species_data.hatch_steps end #@pokemon1.ability = pbChooseAbility(@pokemon1, hiddenAbility1, hiddenAbility2) + # pbChooseAbility(@pokemon1, hiddenAbility1, hiddenAbility2) setFusionMoves(@pokemon1, @pokemon2, firstOptionSelected) if !noMoves diff --git a/Data/Scripts/050_AddOns/DoubleAbilities.rb b/Data/Scripts/050_AddOns/DoubleAbilities.rb index 92cec6dfa..3d9b28838 100644 --- a/Data/Scripts/050_AddOns/DoubleAbilities.rb +++ b/Data/Scripts/050_AddOns/DoubleAbilities.rb @@ -19,10 +19,12 @@ class PokeBattle_Battler #Secondary ability utility methods for battlers class def ability2 + return nil if !$game_switches[SWITCH_DOUBLE_ABILITIES] return GameData::Ability.try_get(@ability2_id) end def ability2=(value) + return if !$game_switches[SWITCH_DOUBLE_ABILITIES] new_ability = GameData::Ability.try_get(value) @ability2_id = (new_ability) ? new_ability.id : nil end @@ -42,6 +44,7 @@ class PokeBattle_Battler end def hasActiveAbilityDouble?(check_ability, ignore_fainted = false) + return false if !$game_switches[SWITCH_DOUBLE_ABILITIES] return false if !abilityActive?(ignore_fainted) if check_ability.is_a?(Array) return check_ability.include?(@ability_id) || check_ability.include?(@ability2_id) @@ -148,15 +151,18 @@ class Pokemon #Secondary ability utility methods for pokemon class def ability2_index + return nil if !$game_switches[SWITCH_DOUBLE_ABILITIES] @ability2_index = (@personalID & 1) if !@ability2_index return @ability2_index end def ability2 + return nil if !$game_switches[SWITCH_DOUBLE_ABILITIES] return GameData::Ability.try_get(ability2_id()) end def ability2=(value) + return if !$game_switches[SWITCH_DOUBLE_ABILITIES] return if value && !GameData::Ability.exists?(value) @ability2 = (value) ? GameData::Ability.get(value).id : value end @@ -183,6 +189,7 @@ class Pokemon end def ability2_id + return nil if !$game_switches[SWITCH_DOUBLE_ABILITIES] if !@ability2 sp_data = species_data abil_index = ability_index @@ -244,10 +251,6 @@ class PokemonFusionScene if scene.hasNickname @pokemon1.name = scene.nickname end - - p @pokemon1.ability.real_name - p @pokemon1.ability2.real_name - end end