DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-06 06:01:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

release 6.2

Browse Source
This commit is contained in:
infinitefusion
2024-06-28 12:01:39 -04:00
parent 0b9e83f554
commit 3a488c9ba6
7249 changed files with 713866 additions and 136365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Data/Scripts/048_Fusion/PokemonFusion.rb
View File

@@ -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