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_script_commands.c | |
| parent | 89da828794d036e33ef313ab95868c8be6bb039f (diff) | |
| parent | ce941e6f56803b389c20a52c0a5b89f5ade12b7a (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'src/battle_ai_script_commands.c')
| -rw-r--r-- | src/battle_ai_script_commands.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c index 5e832aba0..3c07cc227 100644 --- a/src/battle_ai_script_commands.c +++ b/src/battle_ai_script_commands.c @@ -1364,24 +1364,24 @@ static void BattleAICmd_get_ability(void) return; } - if (gBaseStats[gBattleMons[battlerId].species].ability1 != ABILITY_NONE) + if (gBaseStats[gBattleMons[battlerId].species].abilities[0] != ABILITY_NONE) { - if (gBaseStats[gBattleMons[battlerId].species].ability2 != ABILITY_NONE) + if (gBaseStats[gBattleMons[battlerId].species].abilities[1] != ABILITY_NONE) { // AI has no knowledge of opponent, so it guesses which ability. if (Random() & 1) - AI_THINKING_STRUCT->funcResult = gBaseStats[gBattleMons[battlerId].species].ability1; + AI_THINKING_STRUCT->funcResult = gBaseStats[gBattleMons[battlerId].species].abilities[0]; else - AI_THINKING_STRUCT->funcResult = gBaseStats[gBattleMons[battlerId].species].ability2; + AI_THINKING_STRUCT->funcResult = gBaseStats[gBattleMons[battlerId].species].abilities[1]; } else { - AI_THINKING_STRUCT->funcResult = gBaseStats[gBattleMons[battlerId].species].ability1; // It's definitely ability 1. + AI_THINKING_STRUCT->funcResult = gBaseStats[gBattleMons[battlerId].species].abilities[0]; // It's definitely ability 1. } } else { - AI_THINKING_STRUCT->funcResult = gBaseStats[gBattleMons[battlerId].species].ability2; // AI can't actually reach this part since no pokemon has ability 2 and no ability 1. + AI_THINKING_STRUCT->funcResult = gBaseStats[gBattleMons[battlerId].species].abilities[1]; // AI can't actually reach this part since no pokemon has ability 2 and no ability 1. } } else @@ -1412,15 +1412,15 @@ static void BattleAICmd_check_ability(void) { ability = gBattleMons[battlerId].ability; } - else if (gBaseStats[gBattleMons[battlerId].species].ability1 != ABILITY_NONE) + else if (gBaseStats[gBattleMons[battlerId].species].abilities[0] != ABILITY_NONE) { - if (gBaseStats[gBattleMons[battlerId].species].ability2 != ABILITY_NONE) + if (gBaseStats[gBattleMons[battlerId].species].abilities[1] != ABILITY_NONE) { u8 abilityDummyVariable = ability; // Needed to match. - if (gBaseStats[gBattleMons[battlerId].species].ability1 != abilityDummyVariable - && gBaseStats[gBattleMons[battlerId].species].ability2 != abilityDummyVariable) + if (gBaseStats[gBattleMons[battlerId].species].abilities[0] != abilityDummyVariable + && gBaseStats[gBattleMons[battlerId].species].abilities[1] != abilityDummyVariable) { - ability = gBaseStats[gBattleMons[battlerId].species].ability1; + ability = gBaseStats[gBattleMons[battlerId].species].abilities[0]; } else { @@ -1429,12 +1429,12 @@ static void BattleAICmd_check_ability(void) } else { - ability = gBaseStats[gBattleMons[battlerId].species].ability1; + ability = gBaseStats[gBattleMons[battlerId].species].abilities[0]; } } else { - ability = gBaseStats[gBattleMons[battlerId].species].ability2; // AI can't actually reach this part since no pokemon has ability 2 and no ability 1. + ability = gBaseStats[gBattleMons[battlerId].species].abilities[1]; // AI can't actually reach this part since no pokemon has ability 2 and no ability 1. } } else |