ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

IsAceMon - not isAceMon

Browse Source
This commit is contained in:
DizzyEggg 2023-02-16 15:57:15 +01:00
parent 84d7024add
commit d7f68a3893
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/battle_ai_switch_items.c
View File

@ -27,7 +27,7 @@ static bool32 AiExpectsToFaintPlayer(void);
static bool32 AI_ShouldHeal(u32 healAmount);
static bool32 AI_OpponentCanFaintAiWithMod(u32 healAmount);
static bool32 isAceMon(u32 battlerId, u32 monPartyId)
static bool32 IsAceMon(u32 battlerId, u32 monPartyId)
{
if (AI_THINKING_STRUCT->aiFlags & AI_FLAG_ACE_POKEMON
&& !(gBattleStruct->forcedSwitch)
@ -118,7 +118,7 @@ static bool8 ShouldSwitchIfWonderGuard(void)
continue;
if (i == gBattlerPartyIndexes[gActiveBattler])
continue;
if (isAceMon(gActiveBattler, i))
if (IsAceMon(gActiveBattler, i))
continue;
for (opposingBattler = GetBattlerAtPosition(opposingPosition), j = 0; j < MAX_MON_MOVES; j++)
@ -210,7 +210,7 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void)
continue;
if (i == *(gBattleStruct->monToSwitchIntoId + battlerIn2))
continue;
if (isAceMon(gActiveBattler, i))
if (IsAceMon(gActiveBattler, i))
continue;
@ -290,7 +290,7 @@ static bool8 ShouldSwitchIfGameStatePrompt(void)
for (i = firstId; i < lastId; i++)
{
if (isAceMon(gActiveBattler, i))
if (IsAceMon(gActiveBattler, i))
continue;
//Look for mon in party that is able to be switched into and has ability that sets terrain
@ -582,7 +582,7 @@ static bool8 FindMonWithFlagsAndSuperEffective(u16 flags, u8 moduloPercent)
continue;
if (i == *(gBattleStruct->monToSwitchIntoId + battlerIn2))
continue;
if (isAceMon(gActiveBattler, i))
if (IsAceMon(gActiveBattler, i))
continue;
@ -674,7 +674,7 @@ bool32 ShouldSwitch(void)
continue;
if (i == *(gBattleStruct->monToSwitchIntoId + battlerIn2))
continue;
if (isAceMon(gActiveBattler, i))
if (IsAceMon(gActiveBattler, i))
{
hasAceMon = TRUE;
continue;
@ -771,7 +771,7 @@ void AI_TrySwitchOrUseItem(void)
continue;
if (monToSwitchId == *(gBattleStruct->monToSwitchIntoId + battlerIn2))
continue;
if (isAceMon(gActiveBattler, monToSwitchId))
if (IsAceMon(gActiveBattler, monToSwitchId))
continue;
break;
@ -974,7 +974,7 @@ u8 GetMostSuitableMonToSwitchInto(void)
{
invalidMons |= gBitTable[i];
}
else if (isAceMon(gActiveBattler, i))// Save Ace Pokemon for last.
else if (IsAceMon(gActiveBattler, i))// Save Ace Pokemon for last.
{
aceMonId = i;
invalidMons |= gBitTable[i];