From 6c23eb431de0f3f6538d49c1e8a98fe835feedb4 Mon Sep 17 00:00:00 2001 From: sneed Date: Thu, 5 May 2022 13:56:59 +0300 Subject: [PATCH] Heal Pulse and Pollen Puff --- data/battle_scripts_1.s | 2 ++ src/battle_util.c | 1 + 2 files changed, 3 insertions(+) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index a58dc13395..132a8ea35f 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -2410,6 +2410,8 @@ BattleScript_EffectHealPulse: attackcanceler attackstring ppreduce + jumpifstatus3 BS_ATTACKER, STATUS3_HEAL_BLOCK, BattleScript_MoveUsedHealBlockPrevents @ stops pollen puff + jumpifstatus3 BS_TARGET, STATUS3_HEAL_BLOCK, BattleScript_MoveUsedHealBlockPrevents accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON jumpifsubstituteblocks BattleScript_ButItFailed tryhealpulse BS_TARGET, BattleScript_AlreadyAtFullHp diff --git a/src/battle_util.c b/src/battle_util.c index 1aa917f822..6569c6a1b2 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -1692,6 +1692,7 @@ bool32 IsHealBlockPreventingMove(u32 battler, u32 move) case EFFECT_ROOST: case EFFECT_HEALING_WISH: case EFFECT_WISH: + case EFFECT_HEAL_PULSE: return TRUE; default: return FALSE;