From ad7c944f9f737b427cee4a76b6fd0ec8a54f3c81 Mon Sep 17 00:00:00 2001
From: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Date: Tue, 30 Sep 2025 23:44:40 +0200
Subject: [PATCH] Missing IsBattlerAlive checks in Opportunist/Mirror Herb
 (#7829)

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

diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 22ec1cf256..ca85f1a6f5 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -6715,6 +6715,8 @@ static void Cmd_moveend(void)
             while (gBattleStruct->moveEndBattlerId < gBattlersCount)
             {
                 u32 battler = gBattleStruct->moveEndBattlerId++;
+                if (!IsBattlerAlive(battler))
+                    continue;
                 if (AbilityBattleEffects(ABILITYEFFECT_OPPORTUNIST, battler, GetBattlerAbility(battler), 0, 0))
                     return;
             }
@@ -6725,6 +6727,8 @@ static void Cmd_moveend(void)
             while (gBattleStruct->moveEndBattlerId < gBattlersCount)
             {
                 u32 battler = gBattleStruct->moveEndBattlerId++;
+                if (!IsBattlerAlive(battler))
+                    continue;
                 if (ItemBattleEffects(ITEMEFFECT_MIRROR_HERB, battler))
                     return;
             }