Fixed evolution reviving fainted Pokémon, fixed Rare Candy not reviving a fainted Shedinja

This commit is contained in:
Maruno17
2022-07-06 20:02:30 +01:00
parent a85f672c73
commit 8f73319605
2 changed files with 3 additions and 0 deletions

View File

@@ -147,6 +147,7 @@ def pbChangeLevel(pkmn, new_level, scene)
old_speed = pkmn.speed old_speed = pkmn.speed
pkmn.level = new_level pkmn.level = new_level
pkmn.calc_stats pkmn.calc_stats
pkmn.hp = 1 if new_level > old_level && pkmn.species_data.base_stats[:HP] == 1
scene.pbRefresh scene.pbRefresh
if old_level > new_level if old_level > new_level
if scene.is_a?(PokemonPartyScreen) if scene.is_a?(PokemonPartyScreen)

View File

@@ -597,7 +597,9 @@ class PokemonEvolutionScene
# Check for consumed item and check if Pokémon should be duplicated # Check for consumed item and check if Pokémon should be duplicated
pbEvolutionMethodAfterEvolution pbEvolutionMethodAfterEvolution
# Modify Pokémon to make it evolved # Modify Pokémon to make it evolved
was_fainted = @pokemon.fainted?
@pokemon.species = @newspecies @pokemon.species = @newspecies
@pokemon.hp = 0 if was_fainted
@pokemon.calc_stats @pokemon.calc_stats
@pokemon.ready_to_evolve = false @pokemon.ready_to_evolve = false
# See and own evolved species # See and own evolved species