diff options
Diffstat (limited to 'src/pokemon_2.c')
| -rw-r--r-- | src/pokemon_2.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/pokemon_2.c b/src/pokemon_2.c index 5b3e6ddad..a618fdec5 100644 --- a/src/pokemon_2.c +++ b/src/pokemon_2.c @@ -28,7 +28,7 @@ extern u16 gCurrentMove; extern u8 gLastUsedAbility; extern u8 gBankAttacker; extern u8 gBankTarget; -extern u8 gAbsentBankFlags; +extern u8 gAbsentBattlerFlags; extern u8 gXXX_CritRelated; extern u16 gBattleWeather; extern struct BattleEnigmaBerry gEnigmaBerries[]; @@ -60,21 +60,21 @@ u8 CountAliveMons(u8 a1) case 0: for (i = 0; i < 4; i++) { - if (i != gActiveBattler && !(gAbsentBankFlags & gBitTable[i])) + if (i != gActiveBattler && !(gAbsentBattlerFlags & gBitTable[i])) retVal++; } break; case 1: for (i = 0; i < 4; i++) { - if (GetBankSide(i) == GetBankSide(gBankAttacker) && !(gAbsentBankFlags & gBitTable[i])) + if (GetBankSide(i) == GetBankSide(gBankAttacker) && !(gAbsentBattlerFlags & gBitTable[i])) retVal++; } break; case 2: for (i = 0; i < 4; i++) { - if (GetBankSide(i) == GetBankSide(gBankTarget) && !(gAbsentBankFlags & gBitTable[i])) + if (GetBankSide(i) == GetBankSide(gBankTarget) && !(gAbsentBattlerFlags & gBitTable[i])) retVal++; } break; @@ -85,11 +85,11 @@ u8 CountAliveMons(u8 a1) u8 sub_803C434(u8 a1) { - u8 status = GetBankIdentity(a1) & 1; + u8 status = GetBattlerPosition(a1) & 1; status ^= 1; if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE)) - return GetBankByIdentity(status); + return GetBattlerAtPosition(status); if (CountAliveMons(0) > 1) { u8 val; @@ -98,14 +98,14 @@ u8 sub_803C434(u8 a1) val = status ^ 2; else val = status; - return GetBankByIdentity(val); + return GetBattlerAtPosition(val); } else { - if ((gAbsentBankFlags & gBitTable[status])) - return GetBankByIdentity(status ^ 2); + if ((gAbsentBattlerFlags & gBitTable[status])) + return GetBattlerAtPosition(status ^ 2); else - return GetBankByIdentity(status); + return GetBattlerAtPosition(status); } } |