atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'ghoulsaveblock' of https://github.com/Bassoonian/pokeemerald-expansion into ghoulsaveblock

Browse source
This commit is contained in:
Bassoonian 2024-02-06 23:36:35 +01:00
commit 28e3a2ba98
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/battle_ai_util.c
View file

@ -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);

1
test/battle/ai.c
View file

@ -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);

1
test/battle/ai_calc_best_move_score.c
View file

@ -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);