From bdd082f869aaf09e2c9697581ae5495f56ed94a4 Mon Sep 17 00:00:00 2001
From: LOuroboros <lunosouroboros@gmail.com>
Date: Sat, 29 Oct 2022 11:32:44 -0300
Subject: [PATCH] Made Z-Moves unusable without PP

---
 src/battle_z_move.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/battle_z_move.c b/src/battle_z_move.c
index f0d62f7fe1..00c8b066a8 100644
--- a/src/battle_z_move.c
+++ b/src/battle_z_move.c
@@ -166,12 +166,20 @@ bool32 IsViableZMove(u8 battlerId, u16 move)
     u32 item;
     u16 holdEffect;
     u16 species;
+    int moveSlotIndex;
+
+    species = gBattleMons[battlerId].species;
+    item = gBattleMons[battlerId].item;
+
+    for (moveSlotIndex = 0; moveSlotIndex < MAX_MON_MOVES; moveSlotIndex++)
+    {
+        if (gBattleMons[battlerId].moves[moveSlotIndex] == move && gBattleMons[battlerId].pp[moveSlotIndex] == 0)
+            return FALSE;
+    }
 
     if (gBattleStruct->zmove.used[battlerId])
         return FALSE;
 
-    species = gBattleMons[battlerId].species;
-    item = gBattleMons[battlerId].item;
     if (gBattleTypeFlags & (BATTLE_TYPE_SAFARI | BATTLE_TYPE_WALLY_TUTORIAL | BATTLE_TYPE_FRONTIER))
         return FALSE;