From 3b66cd007bccbdf6151d84303b1027ef291be4d5 Mon Sep 17 00:00:00 2001
From: FosterProgramming <jamiefosterandco@gmail.com>
Date: Tue, 28 Oct 2025 17:19:52 +0100
Subject: [PATCH] Fix target cancelling not working properly with z-move
 (#8067)

---
 src/battle_controller_player.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index 856bf5d30b..b76a72af9b 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -454,6 +454,12 @@ void HandleInputChooseTarget(u32 battler)
         PlaySE(SE_SELECT);
         gSprites[gBattlerSpriteIds[gMultiUsePlayerCursor]].callback = SpriteCB_HideAsMoveTarget;
         gBattlerControllerFuncs[battler] = HandleInputChooseMove;
+        if (gBattleStruct->gimmick.playerSelect == 1 && gBattleStruct->gimmick.usableGimmick[battler] == GIMMICK_Z_MOVE)
+        {
+            gBattleStruct->gimmick.playerSelect = 0;
+            gBattleStruct->zmove.viewing = TRUE;
+            ReloadMoveNames(battler);
+        }
         DoBounceEffect(battler, BOUNCE_HEALTHBOX, 7, 1);
         DoBounceEffect(battler, BOUNCE_MON, 7, 1);
         EndBounceEffect(gMultiUsePlayerCursor, BOUNCE_HEALTHBOX);