diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-23 10:24:11 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-23 10:24:11 -0500 |
commit | a01d83a4341cd0cdad01fe2d0b96920301257f2a (patch) | |
tree | ac4f4ce6086d4664ea49d515759a8044ecd1d973 /include/battle_controllers.h | |
parent | e7cd8c59f4ca0f6c56a3b3782c21e896c203694e (diff) | |
parent | 91099dbd0c451188742bf045a26a036e0e8d9f89 (diff) |
Merge branch 'master' into sync-ai
Diffstat (limited to 'include/battle_controllers.h')
-rw-r--r-- | include/battle_controllers.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/battle_controllers.h b/include/battle_controllers.h index 06a0e2957..412856353 100644 --- a/include/battle_controllers.h +++ b/include/battle_controllers.h @@ -2,6 +2,7 @@ #define GUARD_BATTLE_CONTROLLERS_H #include "global.h" +#include "battle.h" enum { |