Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Anger Point/Crit Moves Doubles AI Interaction #5244

Merged
merged 4 commits into from
Aug 25, 2024
Merged

Add Anger Point/Crit Moves Doubles AI Interaction #5244

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ff48be1
Add Anger Point/Crit Moves AI Interaction
SarnPoke Aug 23, 2024
a4b86cc
Add OHKO check
SarnPoke Aug 23, 2024
d534efc
Fix mistake
SarnPoke Aug 23, 2024
df7ebcb
Add Speed Check
SarnPoke Aug 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/battle_ai_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2868,6 +2868,14 @@ static s32 AI_DoubleBattle(u32 battlerAtk, u32 battlerDef, u32 move, s32 score)
{
switch (atkPartnerAbility)
{
case ABILITY_ANGER_POINT:
if (gMovesInfo[move].alwaysCriticalHit == TRUE
&& BattlerStatCanRise(battlerAtkPartner, atkPartnerAbility, STAT_ATK)
&& !CanIndexMoveFaintTarget(battlerAtk, battlerAtkPartner, AI_THINKING_STRUCT->movesetIndex, 1))
SarnPoke marked this conversation as resolved.
Show resolved Hide resolved
{
RETURN_SCORE_PLUS(GOOD_EFFECT);
}
break;
case ABILITY_VOLT_ABSORB:
if (!(AI_THINKING_STRUCT->aiFlags[battlerAtk] & AI_FLAG_HP_AWARE))
{
Expand Down
Loading