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

small improvement

Browse Source
This commit is contained in:
DizzyEggg 2023-09-13 14:54:47 +02:00
parent 9031f5a063
commit 0081c3a8fd
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/battle_ai_main.c
View File

@ -336,18 +336,18 @@ void Ai_UpdateFaintData(u32 battler)
aiMon->isFainted = TRUE; aiMon->isFainted = TRUE;
} }
static void SetBattlerAiData(u32 battler) static void SetBattlerAiData(u32 battler, struct AiLogicData *aiData)
{ {
u32 ability, holdEffect; u32 ability, holdEffect;
ability = AI_DATA->abilities[battler] = AI_GetAbility(battler); ability = aiData->abilities[battler] = AI_GetAbility(battler);
AI_DATA->items[battler] = gBattleMons[battler].item; aiData->items[battler] = gBattleMons[battler].item;
holdEffect = AI_DATA->holdEffects[battler] = AI_GetHoldEffect(battler); holdEffect = aiData->holdEffects[battler] = AI_GetHoldEffect(battler);
AI_DATA->holdEffectParams[battler] = GetBattlerHoldEffectParam(battler); aiData->holdEffectParams[battler] = GetBattlerHoldEffectParam(battler);
AI_DATA->predictedMoves[battler] = gLastMoves[battler]; aiData->predictedMoves[battler] = gLastMoves[battler];
AI_DATA->hpPercents[battler] = GetHealthPercentage(battler); aiData->hpPercents[battler] = GetHealthPercentage(battler);
AI_DATA->moveLimitations[battler] = CheckMoveLimitations(battler, 0, MOVE_LIMITATIONS_ALL); aiData->moveLimitations[battler] = CheckMoveLimitations(battler, 0, MOVE_LIMITATIONS_ALL);
AI_DATA->speedStats[battler] = GetBattlerTotalSpeedStatArgs(battler, ability, holdEffect); aiData->speedStats[battler] = GetBattlerTotalSpeedStatArgs(battler, ability, holdEffect);
} }
static void SetBattlerAiMovesData(u32 battlerAtk, u32 battlersCount) static void SetBattlerAiMovesData(u32 battlerAtk, u32 battlersCount)
@ -402,7 +402,7 @@ void SetAiLogicDataForTurn(void)
if (!IsBattlerAlive(battlerAtk)) if (!IsBattlerAlive(battlerAtk))
continue; continue;
SetBattlerAiData(battlerAtk); SetBattlerAiData(battlerAtk, AI_DATA);
SetBattlerAiMovesData(battlerAtk, battlersCount); SetBattlerAiMovesData(battlerAtk, battlersCount);
} }
} }