From 63b157d7ec60f17cb0cbbb2f839e0170f60e6292 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Wed, 29 Dec 2021 11:43:24 +0000 Subject: [PATCH] Fixed some bad uses of @battle --- Data/Scripts/011_Battle/001_Battle/001_Battle.rb | 2 +- Data/Scripts/011_Battle/002_Battler/007_Battler_UseMove.rb | 2 +- .../011_Battle/006_Other battle code/009_Battle_ItemEffects.rb | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Data/Scripts/011_Battle/001_Battle/001_Battle.rb b/Data/Scripts/011_Battle/001_Battle/001_Battle.rb index f5970de8a..797673b40 100644 --- a/Data/Scripts/011_Battle/001_Battle/001_Battle.rb +++ b/Data/Scripts/011_Battle/001_Battle/001_Battle.rb @@ -754,7 +754,7 @@ class Battle def pbStartWeatherAbility(new_weather, battler, ignore_primal = false) return if !ignore_primal && [:HarshSun, :HeavyRain, :StrongWinds].include?(@field.weather) return if @field.weather == new_weather - battle.pbShowAbilitySplash(battler) + pbShowAbilitySplash(battler) if !Scene::USE_ABILITY_SPLASH pbDisplay(_INTL("{1}'s {2} activated!", battler.pbThis, battler.abilityName)) end diff --git a/Data/Scripts/011_Battle/002_Battler/007_Battler_UseMove.rb b/Data/Scripts/011_Battle/002_Battler/007_Battler_UseMove.rb index 6ccf2f8a0..a0c1b7c4b 100644 --- a/Data/Scripts/011_Battle/002_Battler/007_Battler_UseMove.rb +++ b/Data/Scripts/011_Battle/002_Battler/007_Battler_UseMove.rb @@ -323,7 +323,7 @@ class Battle::Battler user.lastMoveFailed = true if ![:Rain, :HeavyRain].include?(user.effectiveWeather) && user.takesIndirectDamage? user.pbTakeEffectDamage((user.totalhp / 4.0).round, false) { |hp_lost| - battle.pbDisplay(_INTL("{1} is hurt by its {2}!", battler.pbThis, battler.itemName)) + @battle.pbDisplay(_INTL("{1} is hurt by its {2}!", battler.pbThis, battler.itemName)) } @battle.pbGainExp # In case user is KO'd by this end diff --git a/Data/Scripts/011_Battle/006_Other battle code/009_Battle_ItemEffects.rb b/Data/Scripts/011_Battle/006_Other battle code/009_Battle_ItemEffects.rb index 7adad93b1..62a95cc22 100644 --- a/Data/Scripts/011_Battle/006_Other battle code/009_Battle_ItemEffects.rb +++ b/Data/Scripts/011_Battle/006_Other battle code/009_Battle_ItemEffects.rb @@ -1476,8 +1476,7 @@ Battle::ItemEffects::OnBeingHitPositiveBerry.add(:ENIGMABERRY, if forced battle.pbDisplay(_INTL("{1}'s HP was restored.", battler.pbThis)) else - battle.pbDisplay(_INTL("{1} restored its health using its {2}!", battler.pbThis, - itemName)) + battle.pbDisplay(_INTL("{1} restored its health using its {2}!", battler.pbThis, itemName)) end next true }