diff options
author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-05-09 02:36:30 -0400 |
---|---|---|
committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-05-09 02:36:30 -0400 |
commit | fc761599b412206f80d961a6052dce49b9998689 (patch) | |
tree | 1f3eb8f01ae005b8b509d1f120ce5d7bce230992 /src/battle_ai.c | |
parent | d343d1f19a74657489d987dbd97b84e7389ae295 (diff) | |
parent | 4b4f716ae0c582068928a4ae7b31d9d10ac89eb5 (diff) |
Merge branch 'master' of https://github.com/pret/pokeruby
Diffstat (limited to 'src/battle_ai.c')
-rw-r--r-- | src/battle_ai.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/battle_ai.c b/src/battle_ai.c index bd320904f..9bbaf908e 100644 --- a/src/battle_ai.c +++ b/src/battle_ai.c @@ -334,6 +334,10 @@ void BattleAI_SetupAIData(void) AI_THINKING_STRUCT->aiFlags = 0x20000000; else if (gBattleTypeFlags & BATTLE_TYPE_FIRST_BATTLE) AI_THINKING_STRUCT->aiFlags = 0x80000000; +#ifdef GERMAN + else if (gBattleTypeFlags & 0x900 || 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; } |