diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-02-07 00:40:17 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-02-07 00:40:17 -0500 |
| commit | 0e448936b5f77561f8bb55f3e0d27e7ed5a64c99 (patch) | |
| tree | 7c529306c92bcc3e482ef4e0ac89ec941bdc4097 /src/battle/battle_ai.c | |
| parent | 51ade392bf16ae4c87a18f8965b8e650fe983d03 (diff) | |
| parent | a395cd7e53ed33634eef4df22814da4ba96a3357 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby
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) |