diff options
| author | camthesaxman <cameronghall@cox.net> | 2019-07-29 20:44:18 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2019-07-29 20:44:18 -0500 |
| commit | db4af549fdf13cdaca6654f7bb9ef54ecef14359 (patch) | |
| tree | c06f2d86efac079db46a3e9767faee1207f7f7e7 /src/pokemon_2.c | |
| parent | b8393b3a799f92e7064c266600607d98f6baf4d9 (diff) | |
resolve some Emerald differences
Diffstat (limited to 'src/pokemon_2.c')
| -rw-r--r-- | src/pokemon_2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/pokemon_2.c b/src/pokemon_2.c index 1720159a2..a92d12fd9 100644 --- a/src/pokemon_2.c +++ b/src/pokemon_2.c @@ -26,8 +26,8 @@ extern u8 gActiveBattler; extern struct BattlePokemon gBattleMons[4]; extern u16 gCurrentMove; extern u8 gLastUsedAbility; -extern u8 gBankAttacker; -extern u8 gBankTarget; +extern u8 gBattlerAttacker; +extern u8 gBattlerTarget; extern u8 gAbsentBattlerFlags; extern u8 gXXX_CritRelated; extern u16 gBattleWeather; @@ -67,14 +67,14 @@ u8 CountAliveMons(u8 a1) case 1: for (i = 0; i < 4; i++) { - if (GetBattlerSide(i) == GetBattlerSide(gBankAttacker) && !(gAbsentBattlerFlags & gBitTable[i])) + if (GetBattlerSide(i) == GetBattlerSide(gBattlerAttacker) && !(gAbsentBattlerFlags & gBitTable[i])) retVal++; } break; case 2: for (i = 0; i < 4; i++) { - if (GetBattlerSide(i) == GetBattlerSide(gBankTarget) && !(gAbsentBattlerFlags & gBitTable[i])) + if (GetBattlerSide(i) == GetBattlerSide(gBattlerTarget) && !(gAbsentBattlerFlags & gBitTable[i])) retVal++; } break; |