ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 20:24:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Heal Pulse and Pollen Puff

Browse Source
This commit is contained in:
sneed 2022-05-05 13:56:59 +03:00
parent b17d1f7816
commit 6c23eb431d
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/battle_scripts_1.s
View File

@ -2410,6 +2410,8 @@ BattleScript_EffectHealPulse:
attackcanceler attackcanceler
attackstring attackstring
ppreduce 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 accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
jumpifsubstituteblocks BattleScript_ButItFailed jumpifsubstituteblocks BattleScript_ButItFailed
tryhealpulse BS_TARGET, BattleScript_AlreadyAtFullHp tryhealpulse BS_TARGET, BattleScript_AlreadyAtFullHp

1
src/battle_util.c
View File

@ -1692,6 +1692,7 @@ bool32 IsHealBlockPreventingMove(u32 battler, u32 move)
case EFFECT_ROOST: case EFFECT_ROOST:
case EFFECT_HEALING_WISH: case EFFECT_HEALING_WISH:
case EFFECT_WISH: case EFFECT_WISH:
case EFFECT_HEAL_PULSE:
return TRUE; return TRUE;
default: default:
return FALSE; return FALSE;