diff options
author | Phlosioneer <mattmdrr2@gmail.com> | 2019-04-07 20:20:22 -0400 |
---|---|---|
committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-04-07 20:20:22 -0400 |
commit | 50350cc2e1c26082f9d852e97e1698f7254d4145 (patch) | |
tree | 3217b352dae2be8da75ad08a8d94ddc7f81a5017 /src/battle_ai_script_commands.c | |
parent | 1360b3a477f1107785900cd0c4e73ebf018f058c (diff) | |
parent | a4ea0ac816f799b76ac4bec1b66c569d6b684e64 (diff) |
Merge branch 'master' into contest-ai-cleanup
Diffstat (limited to 'src/battle_ai_script_commands.c')
-rw-r--r-- | src/battle_ai_script_commands.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c index 61876e0de..5e832aba0 100644 --- a/src/battle_ai_script_commands.c +++ b/src/battle_ai_script_commands.c @@ -4,6 +4,7 @@ #include "battle_ai_script_commands.h" #include "battle_factory.h" #include "battle_setup.h" +#include "data.h" #include "item.h" #include "pokemon.h" #include "random.h" @@ -2217,7 +2218,7 @@ static void BattleAICmd_if_flash_fired(void) { u8 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]); - if (gBattleResources->flags->flags[battlerId] & UNKNOWN_FLAG_FLASH_FIRE) + if (gBattleResources->flags->flags[battlerId] & RESOURCE_FLAG_FLASH_FIRE) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); else gAIScriptPtr += 6; |