diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-12-14 11:56:41 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-12-14 11:56:41 -0500 |
| commit | 04d158cfcd0f26b4dc4a00e23464a5fde201aa8e (patch) | |
| tree | 5722c829dbad65bbbeb573084291ba0621b89df5 /src/contest.c | |
| parent | d23c1af73e98f3bd91b4551bf624638a33bbe236 (diff) | |
| parent | 103b63bd1a0a8a00733834de1f5094507e070de9 (diff) | |
Merge branch 'master' of github.com:pret/pokeruby into modern_gcc
Diffstat (limited to 'src/contest.c')
| -rw-r--r-- | src/contest.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/contest.c b/src/contest.c index 54294fdfa..9fb17a86b 100644 --- a/src/contest.c +++ b/src/contest.c @@ -46,7 +46,7 @@ extern u8 gDisplayedStringBattle[]; extern u16 gBattleTypeFlags; extern u8 gBattlerAttacker; extern u8 gBattlerTarget; -extern u8 gBanksBySide[]; +extern u8 gBattlerPositions[]; extern u8 gBattlerSpriteIds[]; extern struct Window gUnknown_03004210; extern u32 gContestRngValue; @@ -528,10 +528,10 @@ u8 sub_80AB70C(u8 *a) CreateApplauseMeterSprite(); sub_80B0324(); sub_80B0518(); - gBanksBySide[0] = 0; - gBanksBySide[1] = 1; - gBanksBySide[2] = 3; - gBanksBySide[3] = 2; + gBattlerPositions[0] = 0; + gBattlerPositions[1] = 1; + gBattlerPositions[2] = 3; + gBattlerPositions[3] = 2; gBattleTypeFlags = 0; gBattlerAttacker = 2; gBattlerTarget = 3; |