From 4ad4d8e25c263c7758517e82b49ddc4475e642d8 Mon Sep 17 00:00:00 2001 From: Martin Griffin Date: Fri, 27 Jan 2023 16:08:33 +0000 Subject: [PATCH] Encore fails if target has not moved --- src/battle_script_commands.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 1ee899444..b0f9c404b 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -12122,7 +12122,9 @@ static void Cmd_trysetencore(void) break; } - if (gLastMoves[gBattlerTarget] == MOVE_STRUGGLE + if (gLastMoves[gBattlerTarget] == MOVE_NONE + || gLastMoves[gBattlerTarget] == MOVE_UNAVAILABLE + || gLastMoves[gBattlerTarget] == MOVE_STRUGGLE || gLastMoves[gBattlerTarget] == MOVE_ENCORE || gLastMoves[gBattlerTarget] == MOVE_MIRROR_MOVE || gLastMoves[gBattlerTarget] == MOVE_SHELL_TRAP)