From 22280b47788d0e2bef9b8953cbab298c45f4256f Mon Sep 17 00:00:00 2001
From: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Mon, 11 Dec 2023 19:20:14 +0100
Subject: [PATCH] Fixes z-move priority (#3690)

* Fixes z-move priority

* consider prankster affected z moves

* consider only damaging moves
---
 src/battle_main.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/battle_main.c b/src/battle_main.c
index 514b69fd68..4dac65df90 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -4691,6 +4691,9 @@ s8 GetMovePriority(u32 battler, u16 move)
     s8 priority;
     u16 ability = GetBattlerAbility(battler);
 
+    if (gBattleStruct->zmove.toBeUsed[battler] && gBattleMoves[move].power != 0)
+        move = gBattleStruct->zmove.toBeUsed[battler];
+
     priority = gBattleMoves[move].priority;
     if (ability == ABILITY_GALE_WINGS
     #if B_GALE_WINGS >= GEN_7