diff --git a/Data/Scripts/011_Battle/001_Battler/003_Battler_ChangeSelf.rb b/Data/Scripts/011_Battle/001_Battler/003_Battler_ChangeSelf.rb index ad2706216..ba8f420f2 100644 --- a/Data/Scripts/011_Battle/001_Battler/003_Battler_ChangeSelf.rb +++ b/Data/Scripts/011_Battle/001_Battler/003_Battler_ChangeSelf.rb @@ -30,7 +30,7 @@ class PokeBattle_Battler end def pbRecoverHPFromDrain(amt,target,msg=nil) - if target.hasActiveAbility?(:LIQUIDOOZE) + if target.hasActiveAbility?(:LIQUIDOOZE, true) @battle.pbShowAbilitySplash(target) pbReduceHP(amt) @battle.pbDisplay(_INTL("{1} sucked up the liquid ooze!",pbThis)) diff --git a/Data/Scripts/011_Battle/002_Move/005_Move_Effects_000-07F.rb b/Data/Scripts/011_Battle/002_Move/005_Move_Effects_000-07F.rb index e957e22b9..ed6194b61 100644 --- a/Data/Scripts/011_Battle/002_Move/005_Move_Effects_000-07F.rb +++ b/Data/Scripts/011_Battle/002_Move/005_Move_Effects_000-07F.rb @@ -396,12 +396,10 @@ class PokeBattle_Move_019 < PokeBattle_Move failed = false break end - if !failed - @battle.pbParty(user.index).each do |pkmn| - next if !pkmn || !pkmn.able? || pkmn.status == :NONE - failed = false - break - end + @battle.pbParty(user.index).each do |pkmn| + next if !pkmn || !pkmn.able? || pkmn.status == :NONE + failed = false + break end if failed @battle.pbDisplay(_INTL("But it failed!")) diff --git a/Data/Scripts/016_UI/017_UI_PokemonStorage.rb b/Data/Scripts/016_UI/017_UI_PokemonStorage.rb index 556ec0b08..6fa951f52 100644 --- a/Data/Scripts/016_UI/017_UI_PokemonStorage.rb +++ b/Data/Scripts/016_UI/017_UI_PokemonStorage.rb @@ -2376,8 +2376,8 @@ class PokemonStorageScreen end if Kernel.pbConfirmMessageSerious(_INTL("Should {1} be reversed?", pokemon.name)) reverseFusion(pokemon) + $PokemonBag.pbDeleteItem(:DNAREVERSER) if $PokemonBag.pbQuantity(:INFINITEREVERSERS) <= 0 end - $PokemonBag.pbDeleteItem(:DNAREVERSER) if $PokemonBag.pbQuantity(:INFINITEREVERSERS) <= 0 end def pbUnfuseFromPC(selected) diff --git a/Data/Scripts/048_Fusion/SplitNames.rb b/Data/Scripts/048_Fusion/SplitNames.rb index d3e4cef42..1eea1df53 100644 --- a/Data/Scripts/048_Fusion/SplitNames.rb +++ b/Data/Scripts/048_Fusion/SplitNames.rb @@ -387,7 +387,7 @@ module GameData ["Ray", "quaza"], ["Ji", "rachi"], ["Deo", "xys"], - ["Tur", "wig"], + ["Tur", "twig"], ["Gro", "tle"], ["Tor", "terra"], ["Chim", "char"],