From dd2d6107bded2f849524cbc5a9981f7027710bb5 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Sun, 16 Oct 2022 09:57:21 -0300 Subject: [PATCH] =?UTF-8?q?Fixed=20Z-Move=20not=20being=20cleared=20if=20P?= =?UTF-8?q?ok=C3=A9mon=20faints?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/battle_main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/battle_main.c b/src/battle_main.c index 385faf2e34..5b6e724c90 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -3303,6 +3303,11 @@ void FaintClearSetData(void) } } } + + // Clear Z-Move data + gBattleStruct->zmove.active = FALSE; + gBattleStruct->zmove.toBeUsed[gActiveBattler] = MOVE_NONE; + gBattleStruct->zmove.effect = EFFECT_HIT; } static void DoBattleIntro(void)