Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-09-30 05:53:57 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Prankster block check was missng the IsStatusMove check (#6987)

Browse Source
This commit is contained in:
Alex
2025-05-26 13:06:19 +02:00
committed by GitHub
parent 372553b319
commit 803bd2dfbf
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/battle_util.c
View File

@@ -5616,7 +5616,8 @@ u32 AbilityBattleEffects(u32 caseID, u32 battler, u32 ability, u32 special, u32
// prankster check
if (effect == 0
&& GetChosenMovePriority(gBattlerAttacker) > 0
&& IsBattleMoveStatus(move)
&& GetChosenMovePriority(gBattlerAttacker) > 0
&& BlocksPrankster(move, gBattlerAttacker, gBattlerTarget, TRUE)
&& !(IsBattleMoveStatus(move) && (gLastUsedAbility == ABILITY_MAGIC_BOUNCE || gProtectStructs[gBattlerTarget].bounceMove)))
{