From cf9b933a5fc355c6f89eac9554d512ad6082bbbd Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Thu, 6 Jul 2023 21:08:28 +0200
Subject: [PATCH] Fix Z-Moves softlocking when the z move effect was not used
 (#3108)

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

diff --git a/src/battle_z_move.c b/src/battle_z_move.c
index 2e06323ba..dec3701c0 100644
--- a/src/battle_z_move.c
+++ b/src/battle_z_move.c
@@ -628,6 +628,10 @@ void SetZEffect(void)
             BattleScriptPush(gBattlescriptCurrInstr + Z_EFFECT_BS_LENGTH);
             gBattlescriptCurrInstr = BattleScript_ZEffectPrintString;
         }
+        else
+        {
+            gBattlescriptCurrInstr += Z_EFFECT_BS_LENGTH;
+        }
         break;
     case Z_EFFECT_BOOST_CRITS:
         if (!(gBattleMons[gBattlerAttacker].status2 & STATUS2_FOCUS_ENERGY))
@@ -637,6 +641,10 @@ void SetZEffect(void)
             BattleScriptPush(gBattlescriptCurrInstr + Z_EFFECT_BS_LENGTH);
             gBattlescriptCurrInstr = BattleScript_ZEffectPrintString;
         }
+        else
+        {
+            gBattlescriptCurrInstr += Z_EFFECT_BS_LENGTH;
+        }
         break;
     case Z_EFFECT_FOLLOW_ME:
         gSideTimers[GetBattlerSide(gBattlerAttacker)].followmeTimer = 1;
@@ -653,6 +661,10 @@ void SetZEffect(void)
             BattleScriptPush(gBattlescriptCurrInstr + Z_EFFECT_BS_LENGTH);
             gBattlescriptCurrInstr = BattleScript_RecoverHPZMove;
         }
+        else
+        {
+            gBattlescriptCurrInstr += Z_EFFECT_BS_LENGTH;
+        }
         break;
     case Z_EFFECT_RESTORE_REPLACEMENT_HP:
         gBattleStruct->zmove.healReplacement = TRUE;