diff options
| author | huderlem <huderlem@gmail.com> | 2019-10-19 08:08:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-19 08:08:03 -0500 |
| commit | d63e99c418de98005eac31ba3e6c1abdd6e3ecaf (patch) | |
| tree | f8352a8edfbc7209588cd783e485ba6b6d2e0b00 /src/contest.c | |
| parent | 11170ce90c0baf77b196e378441d25e7f16e2cf3 (diff) | |
| parent | e97f37077c793a388e3a98c13f09846839e80b22 (diff) | |
Merge pull request #754 from camthesaxman/emerald_diff
resolve more emerald differences
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; |