diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-11-15 14:24:22 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-15 14:24:22 -0600 |
| commit | 39f54b346d8121849250b18e4af2855e1d34c22d (patch) | |
| tree | 3004b8fb87a9d7c5801eb435ead4a9461a500f0b /src/battle_controllers.c | |
| parent | 216c388001bf4342ecb1298237d748baf69e7a33 (diff) | |
| parent | 4311fd8b89903a35a4485ff7db8a44036bfd1bdc (diff) | |
Merge pull request #382 from Slawter666/synchronise
Move field effects enum to defines
Diffstat (limited to 'src/battle_controllers.c')
| -rw-r--r-- | src/battle_controllers.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle_controllers.c b/src/battle_controllers.c index 56ff34528..1c6942ead 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -1,17 +1,17 @@ #include "global.h" #include "battle.h" +#include "battle_ai_script_commands.h" +#include "battle_anim.h" #include "battle_controllers.h" +#include "battle_message.h" #include "cable_club.h" #include "link.h" -#include "task.h" -#include "battle_ai_script_commands.h" -#include "battle_anim.h" #include "pokemon.h" -#include "constants/species.h" #include "recorded_battle.h" +#include "task.h" #include "util.h" #include "constants/abilities.h" -#include "battle_message.h" +#include "constants/species.h" extern u8 gUnknown_02022D08; extern u8 gUnknown_02022D09; |