From 43e2a973fcbe5a279aadd5c269d4aa01df708382 Mon Sep 17 00:00:00 2001 From: Isaac Rivera <40581123+iriv24@users.noreply.github.com> Date: Sat, 1 Jun 2024 19:00:17 -0400 Subject: [PATCH] add check for held item before using poltergeist and a check that it is the first turn for moves that are first turn only (#4693) --- src/battle_ai_util.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c index 489588c33a..4524e3b25b 100644 --- a/src/battle_ai_util.c +++ b/src/battle_ai_util.c @@ -446,6 +446,14 @@ bool32 IsDamageMoveUnusable(u32 move, u32 battlerAtk, u32 battlerDef) if (!(gFieldStatuses & STATUS_FIELD_TERRAIN_ANY) && gMovesInfo[move].argument == ARG_TRY_REMOVE_TERRAIN_FAIL) return TRUE; break; + case EFFECT_POLTERGEIST: + if (AI_DATA->items[battlerDef] == ITEM_NONE) + return TRUE; + break; + case EFFECT_FIRST_TURN_ONLY: + if (!gDisableStructs[battlerAtk].isFirstTurn) + return TRUE; + break; } return FALSE;