From bc18aa95f22d68780647c3b357faf54df9314eb6 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Sun, 10 Sep 2023 16:57:09 +0100 Subject: [PATCH] Fixed Cramorant not reverting form after coughing up a Gulp Missle, fixed crash when a phone contact calls when you're on a map with no metadata --- .../011_Battle/002_Battler/010_Battler_UseMoveTriggerEffects.rb | 1 + Data/Scripts/013_Items/004_Item_Phone.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Data/Scripts/011_Battle/002_Battler/010_Battler_UseMoveTriggerEffects.rb b/Data/Scripts/011_Battle/002_Battler/010_Battler_UseMoveTriggerEffects.rb index 450d61e98..f35de8ff5 100644 --- a/Data/Scripts/011_Battle/002_Battler/010_Battler_UseMoveTriggerEffects.rb +++ b/Data/Scripts/011_Battle/002_Battler/010_Battler_UseMoveTriggerEffects.rb @@ -18,6 +18,7 @@ class Battle::Battler # target Cramorant attacking the user) and the ability splash # shouldn't be shown. @battle.pbShowAbilitySplash(target) + target.pbChangeForm(0, nil) if user.takesIndirectDamage?(Battle::Scene::USE_ABILITY_SPLASH) @battle.scene.pbDamageAnimation(user) user.pbReduceHP(user.totalhp / 4, false) diff --git a/Data/Scripts/013_Items/004_Item_Phone.rb b/Data/Scripts/013_Items/004_Item_Phone.rb index 374c1d87d..e4d4e9a7e 100644 --- a/Data/Scripts/013_Items/004_Item_Phone.rb +++ b/Data/Scripts/013_Items/004_Item_Phone.rb @@ -320,7 +320,7 @@ class Phone module_function def can_make? - return false if $game_map.metadata.has_flag?("NoPhoneSignal") + return false if $game_map.metadata&.has_flag?("NoPhoneSignal") return true end