From 370a947cea5a822889149840214c4067b1db0aba Mon Sep 17 00:00:00 2001 From: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Sat, 22 Nov 2025 22:17:04 +0100 Subject: [PATCH] Documentation clean up for MoveCanceler (#8297) --- src/battle_util.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/battle_util.c b/src/battle_util.c index aac4f253d4..2380b1d27f 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -2019,7 +2019,7 @@ static enum MoveCanceler CancelerAsleepOrFrozen(struct BattleContext *ctx) gProtectStructs[ctx->battlerAtk].nonVolatileStatusImmobility = TRUE; gBattlescriptCurrInstr = BattleScript_MoveUsedIsAsleep; gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE; - return MOVE_STEP_REMOVES_STATUS; + return MOVE_STEP_FAILURE; } } else @@ -2250,18 +2250,20 @@ static enum MoveCanceler CancelerConfused(struct BattleContext *ctx) gProtectStructs[ctx->battlerAtk].confusionSelfDmg = TRUE; gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE; gBattlescriptCurrInstr = BattleScript_MoveUsedIsConfused; + return MOVE_STEP_FAILURE; } else { gBattleCommunication[MULTISTRING_CHOOSER] = FALSE; BattleScriptCall(BattleScript_MoveUsedIsConfused); + return MOVE_STEP_BREAK; } } else // snapped out of confusion { BattleScriptCall(BattleScript_MoveUsedIsConfusedNoMore); + return MOVE_STEP_BREAK; } - return MOVE_STEP_BREAK; } return MOVE_STEP_SUCCESS; } @@ -2730,7 +2732,7 @@ static enum MoveCanceler CancelerPowderStatus(struct BattleContext *ctx) || HasTrainerUsedGimmick(ctx->battlerAtk, GIMMICK_Z_MOVE)) gBattlescriptCurrInstr = BattleScript_MoveUsedPowder; gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE; - return MOVE_STEP_BREAK; + return MOVE_STEP_FAILURE; } return MOVE_STEP_SUCCESS; }