diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-08-30 14:40:22 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-30 14:40:22 -0500 |
| commit | 1895383352da3bd5a4f4990fab045ae3610937fc (patch) | |
| tree | eb1794c8da8a8b51caa4abc0de8b797c49ead358 /src/battle_main.c | |
| parent | 765e03846b471b26d986e9f64e41fd7b9ab5561e (diff) | |
| parent | 96f2b995dc67d1278bd65b3661426da95503cb5d (diff) | |
Merge pull request #308 from DizzyEggg/pyramid_bag
Decompile pyramid bag
Diffstat (limited to 'src/battle_main.c')
| -rw-r--r-- | src/battle_main.c | 11 |
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) |