From 2373f0283bb50b9248cfc8c6c46db4be6b8881dc Mon Sep 17 00:00:00 2001
From: Martin Griffin <martin.griffin@algosport.co.uk>
Date: Tue, 11 Nov 2025 21:01:16 +0000
Subject: [PATCH] moveend: Handle MOVE_UNAVAILABLE in MOVEEND_THIRD_MOVE_BLOCK
 (#8215)

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

diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 79bc2dd2b4..b2712aa587 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -6910,6 +6910,12 @@ static void Cmd_moveend(void)
             gBattleScripting.moveendState++;
             break;
         case MOVEEND_THIRD_MOVE_BLOCK:
+            if (gChosenMove == MOVE_UNAVAILABLE)
+            {
+                gBattleScripting.moveendState++;
+                break;
+            }
+
             // Special case for Steel Roller since it has to check the chosen move
             if (GetMoveEffect(gChosenMove) == EFFECT_STEEL_ROLLER && IsBattlerTurnDamaged(gBattlerTarget))
             {