diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-04-04 18:27:50 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-04-04 18:27:50 -0700 |
| commit | 3a7f68151e0f0fa71ddb35bd96439c25ffd61576 (patch) | |
| tree | c8297d41af868eac80642c1f811bc009fa142099 /src/battle/battle_ai.c | |
| parent | 2c4d7844e48864d962573eb66fe4b9e68b9631f0 (diff) | |
| parent | ce75a3895c73f25d6dc7b019ed06e4193965ab35 (diff) | |
Merge remote-tracking branch 'upstream/master' into battle-1
Diffstat (limited to 'src/battle/battle_ai.c')
| -rw-r--r-- | src/battle/battle_ai.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/battle/battle_ai.c b/src/battle/battle_ai.c index 2ac9df2b9..629a57d25 100644 --- a/src/battle/battle_ai.c +++ b/src/battle/battle_ai.c @@ -13,6 +13,8 @@ #include "util.h" #include "ewram.h" +extern u8 gUnknown_02023A14_50; +extern u32 gUnknown_02023A14_4C; extern u16 gBattleTypeFlags; extern u16 gBattleWeather; extern u8 gActiveBank; @@ -336,11 +338,15 @@ void BattleAI_SetupAIData(void) else if (gBattleTypeFlags & BATTLE_TYPE_FIRST_BATTLE) AI_THINKING_STRUCT->aiFlags = 0x80000000; #ifdef GERMAN - else if (gBattleTypeFlags & 0x900 || gTrainerBattleOpponent == 0x400) + else if (gBattleTypeFlags & (BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_BATTLE_TOWER) || gTrainerBattleOpponent == 0x400) AI_THINKING_STRUCT->aiFlags = 7; #endif else // otherwise, just set aiFlags to whatever flags the trainer has set in their data. AI_THINKING_STRUCT->aiFlags = gTrainers[gTrainerBattleOpponent].aiFlags; +#if DEBUG + if (gUnknown_02023A14_50 & 1) + AI_THINKING_STRUCT->aiFlags = gUnknown_02023A14_4C; +#endif } u8 BattleAI_GetAIActionToUse(void) |