Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-03-21 17:54:57 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix AI_CompareDamagingMoves reading incorrect move indexes (#9454)

Browse Source
This commit is contained in:
Pawkkie 2026-03-07 03:21:51 -05:00 committed by GitHub
parent 66b550b9f0
commit 012a63608f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/battle_ai_util.c
View File

@ -1324,7 +1324,7 @@ static bool32 AI_IsMoveEffectInMinus(enum BattlerId battlerAtk, enum BattlerId b
// Checks if one of the moves has side effects or perks, assuming equal dmg or equal no of hits to KO
enum MoveComparisonResult CompareMoveEffects(enum Move move1, enum Move move2, enum BattlerId battlerAtk, enum BattlerId battlerDef, s32 noOfHitsToKo)
{
bool32 effect1, effect2;
bool32 effect1minus, effect1plus, effect2minus, effect2plus;
enum Ability defAbility = gAiLogicData->abilities[battlerDef];
enum Ability atkAbility = gAiLogicData->abilities[battlerAtk];
@ -1342,18 +1342,24 @@ enum MoveComparisonResult CompareMoveEffects(enum Move move1, enum Move move2, e
}
// Check additional effects.
effect1 = AI_IsMoveEffectInMinus(battlerAtk, battlerDef, move1, noOfHitsToKo);
effect2 = AI_IsMoveEffectInMinus(battlerAtk, battlerDef, move2, noOfHitsToKo);
if (effect2 && !effect1)
return MOVE_WON_COMPARISON;
if (effect1 && !effect2)
return MOVE_LOST_COMPARISON;
gAiThinkingStruct->movesetIndex = GetMoveIndex(battlerAtk, move1);
effect1minus = AI_IsMoveEffectInMinus(battlerAtk, battlerDef, move1, noOfHitsToKo);
effect1plus = AI_IsMoveEffectInPlus(battlerAtk, battlerDef, move1, noOfHitsToKo);
effect1 = AI_IsMoveEffectInPlus(battlerAtk, battlerDef, move1, noOfHitsToKo);
effect2 = AI_IsMoveEffectInPlus(battlerAtk, battlerDef, move2, noOfHitsToKo);
if (effect2 && !effect1)
gAiThinkingStruct->movesetIndex = GetMoveIndex(battlerAtk, move2);
effect2plus = AI_IsMoveEffectInPlus(battlerAtk, battlerDef, move2, noOfHitsToKo);
effect2minus = AI_IsMoveEffectInMinus(battlerAtk, battlerDef, move2, noOfHitsToKo);
gAiThinkingStruct->movesetIndex = 0;
if (effect2minus && !effect1minus)
return MOVE_WON_COMPARISON;
if (effect1minus && !effect2minus)
return MOVE_LOST_COMPARISON;
if (effect1 && !effect2)
if (effect2plus && !effect1plus)
return MOVE_LOST_COMPARISON;
if (effect1plus && !effect2plus)
return MOVE_WON_COMPARISON;
return MOVE_NEUTRAL_COMPARISON;

22
test/battle/ai/ai.c
View File

@ -1285,3 +1285,25 @@ AI_DOUBLE_BATTLE_TEST("AI can use Acupressure on its ally")
ANIMATION(ANIM_TYPE_MOVE, MOVE_ACUPRESSURE, opponentLeft);
}
}
AI_SINGLE_BATTLE_TEST("AI's comparison of damaging moves correctly reads moveset indexes for effects")
{
u32 move = MOVE_NONE;
PARAMETRIZE { move = MOVE_TACKLE; }
PARAMETRIZE { move = MOVE_DUAL_CHOP; }
GIVEN {
AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY | AI_FLAG_SMART_SWITCHING | AI_FLAG_SMART_MON_CHOICES | AI_FLAG_OMNISCIENT);
PLAYER(SPECIES_RAPIDASH_GALAR){ Level(64); HP(1); Nature(NATURE_TIMID); Moves(MOVE_TACKLE);}
OPPONENT(SPECIES_HAXORUS){ Level(64); Nature(NATURE_JOLLY); Ability(ABILITY_MOLD_BREAKER); Moves(move, MOVE_EARTHQUAKE, MOVE_POISON_JAB); }
} WHEN {
TURN {
MOVE(player, MOVE_TACKLE);
if (move == MOVE_TACKLE)
SCORE_EQ_VAL(opponent, MOVE_TACKLE, 104);
else if (move == MOVE_DUAL_CHOP)
SCORE_EQ_VAL(opponent, MOVE_DUAL_CHOP, 60);
SCORE_EQ_VAL(opponent, MOVE_EARTHQUAKE, 104);
SCORE_EQ_VAL(opponent, MOVE_POISON_JAB, 105);
}
}
}