ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-24 13:15:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed AI_GetAbility

Browse Source 
Misc cleanup
This commit is contained in:
Ct11217 2022-08-12 15:21:25 -06:00
parent b95e450cb6
commit 7378d1099b
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/battle_ai_switch_items.c
View File

@ -1,6 +1,5 @@
#include "global.h" #include "global.h"
#include "battle.h" #include "battle.h"
#include "constants/battle_ai.h"
#include "battle_ai_main.h" #include "battle_ai_main.h"
#include "battle_ai_util.h" #include "battle_ai_util.h"
#include "battle_util.h" #include "battle_util.h"
@ -169,7 +168,7 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void)
else else
return FALSE; return FALSE;
if (AI_GetAbility(gActiveBattler) == absorbingTypeAbility) if (AI_DATA->abilities[gActiveBattler]) == absorbingTypeAbility)
return FALSE; return FALSE;
GetAIPartyIndexes(gActiveBattler, &firstId, &lastId); GetAIPartyIndexes(gActiveBattler, &firstId, &lastId);
@ -220,8 +219,8 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void)
static bool8 ShouldSwitchIfGameStatePrompt(void) static bool8 ShouldSwitchIfGameStatePrompt(void)
{ {
bool8 switchMon = FALSE; bool8 switchMon = FALSE;
u16 monAbility = AI_GetAbility(gActiveBattler); u16 monAbility = AI_DATA->abilities[gActiveBattler];
u16 holdEffect = AI_GetHoldEffect(gActiveBattler); u16 holdEffect = AI_DATA->holdEffects[gActiveBattler];
u8 opposingPosition = BATTLE_OPPOSITE(GetBattlerPosition(gActiveBattler)); u8 opposingPosition = BATTLE_OPPOSITE(GetBattlerPosition(gActiveBattler));
u8 opposingBattler = GetBattlerAtPosition(opposingPosition); u8 opposingBattler = GetBattlerAtPosition(opposingPosition);
s32 moduloChance = 4; //25% Chance Default s32 moduloChance = 4; //25% Chance Default
@ -267,8 +266,8 @@ static bool8 ShouldSwitchIfGameStatePrompt(void)
//Check if Active Pokemon evasion boosted and might be able to dodge until awake //Check if Active Pokemon evasion boosted and might be able to dodge until awake
if (gBattleMons[gActiveBattler].statStages[STAT_EVASION] > (DEFAULT_STAT_STAGE + 3) if (gBattleMons[gActiveBattler].statStages[STAT_EVASION] > (DEFAULT_STAT_STAGE + 3)
&& AI_GetAbility(opposingBattler) != ABILITY_UNAWARE && AI_DATA->abilities[opposingBattler] != ABILITY_UNAWARE
&& AI_GetAbility(opposingBattler) != ABILITY_KEEN_EYE && AI_DATA->abilities[opposingBattler] != ABILITY_KEEN_EYE
&& !(gBattleMons[gActiveBattler].status2 & STATUS2_FORESIGHT) && !(gBattleMons[gActiveBattler].status2 & STATUS2_FORESIGHT)
&& !(gStatuses3[gActiveBattler] & STATUS3_MIRACLE_EYED)) && !(gStatuses3[gActiveBattler] & STATUS3_MIRACLE_EYED))
switchMon = FALSE; switchMon = FALSE;
@ -334,8 +333,10 @@ static bool8 ShouldSwitchIfGameStatePrompt(void)
return TRUE; return TRUE;
} }
else else
{
return FALSE; return FALSE;
} }
}
static bool8 ShouldSwitchIfAbilityBenefit(void) static bool8 ShouldSwitchIfAbilityBenefit(void)
{ {
@ -352,7 +353,7 @@ static bool8 ShouldSwitchIfAbilityBenefit(void)
||IsNeutralizingGasOnField()) ||IsNeutralizingGasOnField())
return FALSE; return FALSE;
switch(AI_GetAbility(gActiveBattler)) { switch(AI_DATA->abilities[gActiveBattler]) {
case ABILITY_NATURAL_CURE: case ABILITY_NATURAL_CURE:
moduloChance = 4; //25% moduloChance = 4; //25%
//Attempt to cure bad ailment //Attempt to cure bad ailment