summaryrefslogtreecommitdiff
path: root/src/battle_main.c
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2018-08-30 15:01:07 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2018-08-30 15:01:07 +0200
commitbc9fe72c6e85b1930f137ed49c5d2b0c4e4b10de (patch)
tree3dac926becb2309a80e6ec201700953f09bc2ef2 /src/battle_main.c
parent8e5c72766c2efd2d3d4e490232fcd5f6c265fe06 (diff)
Do some pyramid bag
Diffstat (limited to 'src/battle_main.c')
-rw-r--r--src/battle_main.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/battle_main.c b/src/battle_main.c
index 9f9511c38..c31fb48d5 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -4596,13 +4596,10 @@ static void sub_803CDF8(void)
void SwapTurnOrder(u8 id1, u8 id2)
{
- u32 temp = gActionsByTurnOrder[id1];
- gActionsByTurnOrder[id1] = gActionsByTurnOrder[id2];
- gActionsByTurnOrder[id2] = temp;
-
- temp = gBattlerByTurnOrder[id1];
- gBattlerByTurnOrder[id1] = gBattlerByTurnOrder[id2];
- gBattlerByTurnOrder[id2] = temp;
+ u32 temp;
+
+ SWAP(gActionsByTurnOrder[id1], gActionsByTurnOrder[id2], temp);
+ SWAP(gBattlerByTurnOrder[id1], gBattlerByTurnOrder[id2], temp);
}
u8 GetWhoStrikesFirst(u8 battler1, u8 battler2, bool8 ignoreChosenMoves)