summaryrefslogtreecommitdiff
path: root/src/battle_main.c
diff options
context:
space:
mode:
authorPokeCodec <67983839+PokeCodec@users.noreply.github.com>2020-08-28 14:35:37 -0400
committerPokeCodec <67983839+PokeCodec@users.noreply.github.com>2020-08-28 14:35:37 -0400
commita04b0ff487dfdf97d3dbe61602bc7bc914c6dbb2 (patch)
tree000be56716cf495a5b60b33ffd81cdd958dea342 /src/battle_main.c
parent1515a2ecc489a8976c4a26a3bed73edaf444d403 (diff)
More formatting fixes
Diffstat (limited to 'src/battle_main.c')
-rw-r--r--src/battle_main.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/battle_main.c b/src/battle_main.c
index a62f3d86b..03e958c61 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -4875,7 +4875,11 @@ static void SetActionsAndBattlersTurnOrder(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)
+
+ if (gActionsByTurnOrder[i] != B_ACTION_USE_ITEM
+ && gActionsByTurnOrder[j] != B_ACTION_USE_ITEM
+ && gActionsByTurnOrder[i] != B_ACTION_SWITCH
+ && gActionsByTurnOrder[j] != B_ACTION_SWITCH)
{
if (GetWhoStrikesFirst(battler1, battler2, FALSE))
SwapTurnOrder(i, j);