diff --git a/src/battle_ai_main.c b/src/battle_ai_main.c index 1cab6e6eb2..edfd764645 100644 --- a/src/battle_ai_main.c +++ b/src/battle_ai_main.c @@ -209,7 +209,11 @@ u8 BattleAI_ChooseMoveOrAction(void) ret = ChooseMoveOrAction_Singles(); else ret = ChooseMoveOrAction_Doubles(); - + + // Clear protect structures, some flags may be set during AI calcs + // e.g. pranksterElevated from GetMovePriority + memset(&gProtectStructs[gActiveBattler], 0, sizeof(struct ProtectStruct)); + gCurrentMove = savedCurrentMove; return ret; } diff --git a/src/battle_main.c b/src/battle_main.c index 055ec9bbe8..a304defee9 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -3097,6 +3097,7 @@ void FaintClearSetData(void) gProtectStructs[gActiveBattler].usedThroatChopPreventedMove = 0; gProtectStructs[gActiveBattler].statRaised = 0; gProtectStructs[gActiveBattler].statFell = 0; + gProtectStructs[gActiveBattler].pranksterElevated = 0; gDisableStructs[gActiveBattler].isFirstTurn = 2;