diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata index 41edc8e26..7967a5432 100644 Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata index 826e1e8a6..8e67182ba 100644 Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata index 901f2bb2b..2249bec14 100644 Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata index 3a99093c5..8af865203 100644 Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata index be622f513..004ee903d 100644 Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ diff --git a/Data/Items.rxdata b/Data/Items.rxdata index fe767fa0b..3e62ba6d2 100644 Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 2648ba4c4..357f61571 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ diff --git a/Data/Scripts/001_Settings.rb b/Data/Scripts/001_Settings.rb index f1578c316..6ae9410b7 100644 --- a/Data/Scripts/001_Settings.rb +++ b/Data/Scripts/001_Settings.rb @@ -6,7 +6,7 @@ module Settings # The version of your game. It has to adhere to the MAJOR.MINOR.PATCH format. GAME_VERSION = '5.0.0' - GAME_VERSION_NUMBER = "5.1.2" + GAME_VERSION_NUMBER = "5.1.3" POKERADAR_LIGHT_ANIMATION_RED_ID = 17 POKERADAR_LIGHT_ANIMATION_GREEN_ID = 18 diff --git a/Data/Scripts/014_Pokemon/001_Pokemon.rb b/Data/Scripts/014_Pokemon/001_Pokemon.rb index 5c7606f9b..e1354b3a8 100644 --- a/Data/Scripts/014_Pokemon/001_Pokemon.rb +++ b/Data/Scripts/014_Pokemon/001_Pokemon.rb @@ -42,6 +42,10 @@ class Pokemon # defined at this index. Is recalculated (as 0 or 1) if made nil. # @param value [Integer, nil] forced ability index (nil if none is set) attr_writer :ability_index + attr_accessor :body_original_ability_index + attr_accessor :head_original_ability_index + + # @return [Array] the moves known by this Pokémon attr_accessor :moves # @return [Array] the IDs of moves known by this Pokémon when it was obtained diff --git a/Data/Scripts/048_Fusion/PokemonFusion.rb b/Data/Scripts/048_Fusion/PokemonFusion.rb index b83a8f75b..a7ea02ada 100644 --- a/Data/Scripts/048_Fusion/PokemonFusion.rb +++ b/Data/Scripts/048_Fusion/PokemonFusion.rb @@ -801,7 +801,12 @@ def setAbilityAndNatureAndNickname(abilitiesList, naturesList) screen = PokemonOptionScreen.new(scene) screen.pbStartScreen + @pokemon1.body_original_ability_index = @pokemon1.ability_index + @pokemon1.head_original_ability_index = @pokemon2.ability_index + + @pokemon1.ability = scene.selectedAbility + @pokemon1.ability_index = locate_ability_index(@pokemon1,scene.selectedAbility) @pokemon1.nature = scene.selectedNature if scene.hasNickname @pokemon1.name = scene.nickname @@ -809,6 +814,17 @@ def setAbilityAndNatureAndNickname(abilitiesList, naturesList) end +def locate_ability_index(pokemon, ability) + abilityList = pokemon.getAbilityList + for possible_ability in abilityList + if possible_ability[0] == ability.id + return possible_ability[1] + end + end + return nil +end + + def setFusionMoves(fusedPoke, poke2, selected2ndOption = false) #NEW METHOD (not ready) diff --git a/Data/Scripts/050_AddOns/New Items effects.rb b/Data/Scripts/050_AddOns/New Items effects.rb index 1482ff0ee..9a707bb69 100644 --- a/Data/Scripts/050_AddOns/New Items effects.rb +++ b/Data/Scripts/050_AddOns/New Items effects.rb @@ -1479,6 +1479,10 @@ def pbUnfuse(pokemon, scene, supersplicers, pcPosition = nil) end end end + + pokemon.ability_index = pokemon.body_original_ability_index if pokemon.body_original_ability_index + poke2.ability_index = pokemon.head_original_ability_index if pokemon.head_original_ability_index + pokemon.debug_shiny=true if pokemon.debug_shiny && pokemon.body_shiny poke2.debug_shiny=true if pokemon.debug_shiny && poke2.head_shiny diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata index a45219f5e..61cba7ea2 100644 Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ diff --git a/Data/States.rxdata b/Data/States.rxdata index 868d49e59..0f9b4ae5d 100644 Binary files a/Data/States.rxdata and b/Data/States.rxdata differ diff --git a/Data/System.rxdata b/Data/System.rxdata index fd5edf602..751c8d403 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata index a2ad9367f..c84114c9c 100644 Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata index c7ea19a7a..d9bd35260 100644 Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ