Leahnaya/pokeemerald-expansion
1
0
Fork 0
mirror of https://github.com/rh-hideout/pokeemerald-expansion.git synced 2026-04-26 02:14:22 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Poltergeist Fix: Usable against Klutz targets and while Magic Room is in effect (#9256)

Browse Source 
Co-authored-by: LinathanZel <linathan@DESKTOP-RVGNQ5E.localdomain>
This commit is contained in:
Linathan 2026-02-19 08:22:13 -05:00 committed by GitHub
parent 150241913a
commit 13118676eb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/battle_move_resolution.c
View File

@ -1090,10 +1090,6 @@ static enum CancelerResult CancelerMoveFailure(struct BattleContext *ctx)
battleScript = BattleScript_ButItFailed;
else // set fling item
gBattleStruct->flingItem = gLastUsedItem = gBattleMons[ctx->battlerAtk].item;
break;
case EFFECT_POLTERGEIST:
if (gFieldStatuses & STATUS_FIELD_MAGIC_ROOM)
battleScript = BattleScript_ButItFailed;
break;
case EFFECT_FAIL_IF_NOT_ARG_TYPE:
if (!IS_BATTLER_OF_TYPE(ctx->battlerAtk, GetMoveArgType(ctx->move)))
@ -1274,8 +1270,7 @@ static enum CancelerResult CancelerMoveEffectFailureTarget(struct BattleContext
}
break;
case EFFECT_POLTERGEIST:
if (gBattleMons[battlerDef].item == ITEM_NONE
|| GetBattlerAbility(battlerDef) == ABILITY_KLUTZ)
if (gBattleMons[battlerDef].item == ITEM_NONE)
{
battleScript = BattleScript_ButItFailed;
}