diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
| commit | 53fac4417b53fcee2cc9e46d72ad598b016cc967 (patch) | |
| tree | 07e69072826569c7c31230cb4671a5d321e5f972 /src/battle_ai_script_commands.c | |
| parent | 18124740a4d75ae95948f95ca6f63c320e51501c (diff) | |
| parent | 6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff) | |
fixing merge conflicts
Diffstat (limited to 'src/battle_ai_script_commands.c')
| -rw-r--r-- | src/battle_ai_script_commands.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c index e89d308f5..3e7064eb5 100644 --- a/src/battle_ai_script_commands.c +++ b/src/battle_ai_script_commands.c @@ -1,17 +1,18 @@ #include "global.h" -#include "battle_ai_script_commands.h" -#include "pokemon.h" #include "battle.h" +#include "battle_ai_script_commands.h" +#include "battle_factory.h" #include "battle_setup.h" +#include "item.h" +#include "pokemon.h" +#include "random.h" #include "recorded_battle.h" -#include "constants/species.h" +#include "util.h" #include "constants/abilities.h" -#include "random.h" -#include "item.h" +#include "constants/battle_ai.h" #include "constants/battle_move_effects.h" #include "constants/moves.h" -#include "util.h" -#include "constants/battle_ai.h" +#include "constants/species.h" #define AI_ACTION_DONE 0x0001 #define AI_ACTION_FLEE 0x0002 @@ -44,8 +45,6 @@ AI scripts. extern const u8 *const gBattleAI_ScriptsTable[]; -extern u32 GetAiScriptsInBattleFactory(); - static u8 ChooseMoveOrAction_Singles(void); static u8 ChooseMoveOrAction_Doubles(void); static void RecordLastUsedMoveByTarget(void); |