From 41d6969dea90b84ab530888dbc0eca614599ef4f Mon Sep 17 00:00:00 2001 From: BuffelSaft Date: Sat, 9 Oct 2021 12:49:37 +1300 Subject: [PATCH] Fix Sturdy/Sash/Band Make these effects endure one hit of a multi strike move, not all of them. --- src/battle_script_commands.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index aa85b5d30..c4c29304b 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -5185,6 +5185,9 @@ static void Cmd_moveend(void) gHitMarker |= (HITMARKER_NO_PPDEDUCT | HITMARKER_NO_ATTACKSTRING); gBattleScripting.animTargetsHit = 0; gBattleScripting.moveendState = 0; + gSpecialStatuses[gBattlerTarget].sturdied = 0; + gSpecialStatuses[gBattlerTarget].focusBanded = 0; // Delete this line to make Focus Band last for the duration of the whole move turn. + gSpecialStatuses[gBattlerTarget].focusSashed = 0; // Delete this line to make Focus Sash last for the duration of the whole move turn. gSpecialStatuses[gBattlerAttacker].multiHitOn = TRUE; MoveValuesCleanUp(); BattleScriptPush(gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect]);