diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c index 0258fa5360..4d3e69485d 100644 --- a/src/battle_ai_util.c +++ b/src/battle_ai_util.c @@ -75,7 +75,8 @@ bool32 BattlerHasAi(u32 battlerId) bool32 IsAiBattlerAware(u32 battlerId) { - if (AI_THINKING_STRUCT->aiFlags[battlerId] & AI_FLAG_OMNISCIENT) + if (AI_THINKING_STRUCT->aiFlags[B_POSITION_OPPONENT_LEFT] & AI_FLAG_OMNISCIENT + || AI_THINKING_STRUCT->aiFlags[B_POSITION_OPPONENT_RIGHT] & AI_FLAG_OMNISCIENT) return TRUE; return BattlerHasAi(battlerId); diff --git a/test/battle/ai.c b/test/battle/ai.c index 0660a0a25f..7d7da10947 100644 --- a/test/battle/ai.c +++ b/test/battle/ai.c @@ -690,7 +690,6 @@ AI_SINGLE_BATTLE_TEST("First Impression is not chosen if it's blocked by certain PARAMETRIZE { species = SPECIES_FARIGIRAF; ability = ABILITY_ARMOR_TAIL; } PARAMETRIZE { species = SPECIES_TSAREENA; ability = ABILITY_QUEENLY_MAJESTY; } - KNOWN_FAILING; // Fails because the Omniscient flag is currently broken. It should pass after it is fixed GIVEN { ASSUME(gMovesInfo[MOVE_FIRST_IMPRESSION].effect == EFFECT_FIRST_TURN_ONLY); ASSUME(gMovesInfo[MOVE_FIRST_IMPRESSION].power == 90); diff --git a/test/battle/ai_calc_best_move_score.c b/test/battle/ai_calc_best_move_score.c index 53cf5215f6..0376738cf3 100644 --- a/test/battle/ai_calc_best_move_score.c +++ b/test/battle/ai_calc_best_move_score.c @@ -61,7 +61,6 @@ AI_SINGLE_BATTLE_TEST("AI will correctly predict what move the opposing mon goin PARAMETRIZE { move = MOVE_HOWL; } PARAMETRIZE { move = MOVE_CALM_MIND; } - KNOWN_FAILING; GIVEN { ASSUME(gMovesInfo[MOVE_SKY_UPPERCUT].power == 85); ASSUME(gMovesInfo[MOVE_HOWL].effect == EFFECT_ATTACK_UP_USER_ALLY);