From bd11977c80a20bf7a86488b921549a23568d0728 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Sun, 23 Jul 2023 09:19:00 +0200 Subject: [PATCH 1/4] Make Aromatherapy work when user is not statused --- .../011_Battle/002_Move/005_Move_Effects_000-07F.rb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) 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 3df2f73c5..b8d137092 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 @@ -409,12 +409,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!")) From 2bf0b6d1048670ff4b793fd220beeb587b7c7ed7 Mon Sep 17 00:00:00 2001 From: Edward Perpich Date: Fri, 1 Mar 2024 17:24:27 -0500 Subject: [PATCH 2/4] fix turtwigs name in the split names --- Data/Scripts/048_Fusion/SplitNames.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Data/Scripts/048_Fusion/SplitNames.rb b/Data/Scripts/048_Fusion/SplitNames.rb index 923a4ba59..94536ee89 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"], From 7bb75aaf1df10e7726a30692d70ebf249337e927 Mon Sep 17 00:00:00 2001 From: Simon Fedick <61687127+fellow-dev-simon@users.noreply.github.com> Date: Tue, 20 Aug 2024 19:20:34 +0200 Subject: [PATCH 3/4] Fixed DNAReverser deletion bug --- Data/Scripts/016_UI/017_UI_PokemonStorage.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Data/Scripts/016_UI/017_UI_PokemonStorage.rb b/Data/Scripts/016_UI/017_UI_PokemonStorage.rb index 2e852135e..e1ce3b52e 100644 --- a/Data/Scripts/016_UI/017_UI_PokemonStorage.rb +++ b/Data/Scripts/016_UI/017_UI_PokemonStorage.rb @@ -2368,8 +2368,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) From 256a04560712170e673f80cf97be5ed368bb97fd Mon Sep 17 00:00:00 2001 From: GLugia Date: Wed, 25 Dec 2024 12:11:05 -0500 Subject: [PATCH 4/4] Fix for Drain vs Liquid Ooze When a draining move KOs a Pokemon with Liquid Ooze, the ability would not activate. This fixes that. --- Data/Scripts/011_Battle/001_Battler/003_Battler_ChangeSelf.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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))