diff options
author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-09-30 20:28:46 -0400 |
---|---|---|
committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-09-30 20:28:46 -0400 |
commit | c7e71bc47d322fc7da3a07910ba36fe236b51e13 (patch) | |
tree | b24d817d82621d758804fc995189fffc7413f72e /src/battle/battle_3.c | |
parent | 044e8cc93b46fccb2e4e5ed5accf4c55917a3f7f (diff) | |
parent | 5fb9b9052276243d54ecfc27d0514e9c35825e8c (diff) |
Merge branch 'master' of https://github.com/pret/pokeruby into refactor_src
Diffstat (limited to 'src/battle/battle_3.c')
-rw-r--r-- | src/battle/battle_3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle/battle_3.c b/src/battle/battle_3.c index f04e722c4..b59757f00 100644 --- a/src/battle/battle_3.c +++ b/src/battle/battle_3.c @@ -378,7 +378,7 @@ u8 UpdateTurnCounters(void) s32 j; for (j = i + 1; j < gNoOfAllBanks; j++) { - if (b_first_side(gTurnOrder[i], gTurnOrder[j], 0)) + if (GetWhoStrikesFirst(gTurnOrder[i], gTurnOrder[j], 0)) sub_8012FBC(i, j); } } |