Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Documentation clean up for MoveCanceler (#8297)

Browse Source
This commit is contained in:
Alex 2025-11-22 22:17:04 +01:00 committed by GitHub
parent 587bcb8985
commit 370a947cea
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/battle_util.c
View File

@ -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;
}