diff options
| author | SatoMew <SatoMew@users.noreply.github.com> | 2019-08-04 20:35:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-04 20:35:38 +0100 |
| commit | 667f0837e2c0fecb03e4198a182cf04624a47fbd (patch) | |
| tree | 4f11ff910478fdb34a4c40c465b30be2ac1a22da /src/battle_ai_switch_items.c | |
| parent | 89da828794d036e33ef313ab95868c8be6bb039f (diff) | |
| parent | ce941e6f56803b389c20a52c0a5b89f5ade12b7a (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'src/battle_ai_switch_items.c')
| -rw-r--r-- | src/battle_ai_switch_items.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c index de798eee3..cd31293f8 100644 --- a/src/battle_ai_switch_items.c +++ b/src/battle_ai_switch_items.c @@ -93,7 +93,7 @@ static bool8 ShouldSwitchIfWonderGuard(void) continue; GetMonData(&party[i], MON_DATA_SPECIES); // Unused return value. - GetMonData(&party[i], MON_DATA_ALT_ABILITY); // Unused return value. + GetMonData(&party[i], MON_DATA_ABILITY_NUM); // Unused return value. for (opposingBattler = GetBattlerAtPosition(opposingPosition), j = 0; j < MAX_MON_MOVES; j++) { @@ -197,10 +197,10 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void) continue; species = GetMonData(&party[i], MON_DATA_SPECIES); - if (GetMonData(&party[i], MON_DATA_ALT_ABILITY) != 0) - monAbility = gBaseStats[species].ability2; + if (GetMonData(&party[i], MON_DATA_ABILITY_NUM) != 0) + monAbility = gBaseStats[species].abilities[1]; else - monAbility = gBaseStats[species].ability1; + monAbility = gBaseStats[species].abilities[0]; if (absorbingTypeAbility == monAbility && Random() & 1) { @@ -392,10 +392,10 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent) continue; species = GetMonData(&party[i], MON_DATA_SPECIES); - if (GetMonData(&party[i], MON_DATA_ALT_ABILITY) != 0) - monAbility = gBaseStats[species].ability2; + if (GetMonData(&party[i], MON_DATA_ABILITY_NUM) != 0) + monAbility = gBaseStats[species].abilities[1]; else - monAbility = gBaseStats[species].ability1; + monAbility = gBaseStats[species].abilities[0]; moveFlags = AI_TypeCalc(gLastLandedMoves[gActiveBattler], species, monAbility); if (moveFlags & flags) |