From da20dae9c35f77616189c6cada31ab7d1e1166b9 Mon Sep 17 00:00:00 2001
From: kleeenexfeu <94004034+kleeenexfeu@users.noreply.github.com>
Date: Sat, 20 Nov 2021 02:09:33 +0100
Subject: [PATCH] Only recalculate speed for battler choosing a move

Other actions have priority
---
 src/battle_main.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/battle_main.c b/src/battle_main.c
index 3737fcc543..6caff36f50 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -4707,12 +4707,8 @@ static void TryChangeTurnOrder(void)
         {
             u8 battler1 = gBattlerByTurnOrder[i];
             u8 battler2 = gBattlerByTurnOrder[j];
-            if (gActionsByTurnOrder[i] != B_ACTION_USE_ITEM
-                && gActionsByTurnOrder[j] != B_ACTION_USE_ITEM
-                && gActionsByTurnOrder[i] != B_ACTION_SWITCH
-                && gActionsByTurnOrder[j] != B_ACTION_SWITCH
-                && gActionsByTurnOrder[i] != B_ACTION_THROW_BALL
-                && gActionsByTurnOrder[j] != B_ACTION_THROW_BALL)
+            if (gActionsByTurnOrder[i] = B_ACTION_USE_MOVE
+                && gActionsByTurnOrder[j] = B_ACTION_USE_MOVE)
             {
                 if (GetWhoStrikesFirst(battler1, battler2, FALSE))
                     SwapTurnOrder(i, j);