ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-03-19 12:08:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rocky Helmet softlock fix

Browse Source
This commit is contained in:
DizzyEggg 2020-06-26 21:56:18 +02:00
parent 5698af3742
commit 59ddebd727
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/battle_util.c
View File

@ -4891,6 +4891,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
case HOLD_EFFECT_ROCKY_HELMET: case HOLD_EFFECT_ROCKY_HELMET:
if (TARGET_TURN_DAMAGED if (TARGET_TURN_DAMAGED
&& IsMoveMakingContact(gCurrentMove, gBattlerAttacker) && IsMoveMakingContact(gCurrentMove, gBattlerAttacker)
&& IsBattlerAlive(gBattlerAttacker)
&& GetBattlerAbility(gBattlerAttacker) != ABILITY_MAGIC_GUARD) && GetBattlerAbility(gBattlerAttacker) != ABILITY_MAGIC_GUARD)
{ {
gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 6; gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 6;