diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2019-05-14 15:42:55 +0200 |
---|---|---|
committer | huderlem <huderlem@gmail.com> | 2019-05-16 17:09:43 -0500 |
commit | 4ae1e014bc799795c770564fb97f36c76913e5c8 (patch) | |
tree | 3a29c633b4ae1971b4a9fcce08af7ed5179010d6 /src/battle_dome.c | |
parent | 33979f0fa69001b41668726828603e22326694c1 (diff) |
Change abilities in base stats to array
Diffstat (limited to 'src/battle_dome.c')
-rw-r--r-- | src/battle_dome.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_dome.c b/src/battle_dome.c index 95fce49a3..162d46d61 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -2903,7 +2903,7 @@ static int GetTypeEffectivenessPoints(int move, int targetSpecies, int arg2) defType1 = gBaseStats[targetSpecies].type1; defType2 = gBaseStats[targetSpecies].type2; - defAbility = gBaseStats[targetSpecies].ability1; + defAbility = gBaseStats[targetSpecies].abilities[0]; moveType = gBattleMoves[move].type; if (defAbility == ABILITY_LEVITATE && moveType == TYPE_GROUND) @@ -5447,9 +5447,9 @@ static u16 GetWinningMove(int winnerTournamentId, int loserTournamentId, u8 roun targetSpecies = gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[loserTournamentId][k]].species; if (var & 1) - targetAbility = gBaseStats[targetSpecies].ability2; + targetAbility = gBaseStats[targetSpecies].abilities[1]; else - targetAbility = gBaseStats[targetSpecies].ability1; + targetAbility = gBaseStats[targetSpecies].abilities[0]; var = AI_TypeCalc(moveIds[i * 4 + j], targetSpecies, targetAbility); if (var & MOVE_RESULT_NOT_VERY_EFFECTIVE && var & MOVE_RESULT_SUPER_EFFECTIVE) |