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_controller_safari.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_controller_safari.c')
| -rw-r--r-- | src/battle_controller_safari.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c index 148f13865..a7ea04515 100644 --- a/src/battle_controller_safari.c +++ b/src/battle_controller_safari.c @@ -1,27 +1,27 @@ #include "global.h" #include "battle.h" +#include "battle_anim.h" #include "battle_controllers.h" -#include "battle_message.h" #include "battle_interface.h" -#include "battle_anim.h" -#include "constants/battle_anim.h" -#include "pokemon.h" +#include "battle_message.h" +#include "bg.h" +#include "data2.h" +#include "item_menu.h" #include "link.h" -#include "util.h" #include "main.h" -#include "constants/songs.h" -#include "sound.h" -#include "window.h" #include "m4a.h" #include "palette.h" -#include "task.h" -#include "text.h" -#include "bg.h" -#include "reshow_battle_screen.h" #include "pokeball.h" -#include "data2.h" #include "pokeblock.h" -#include "item_menu.h" +#include "pokemon.h" +#include "reshow_battle_screen.h" +#include "sound.h" +#include "task.h" +#include "text.h" +#include "util.h" +#include "window.h" +#include "constants/battle_anim.h" +#include "constants/songs.h" extern u16 gBattle_BG0_X; extern u16 gBattle_BG0_Y; |