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_player.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_player.c')
| -rw-r--r-- | src/battle_controller_player.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 20781ca44..ad5ae2059 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -1,38 +1,38 @@ #include "global.h" #include "battle.h" +#include "battle_anim.h" +#include "battle_arena.h" #include "battle_controllers.h" -#include "battle_message.h" +#include "battle_dome.h" #include "battle_interface.h" -#include "battle_anim.h" -#include "constants/battle_anim.h" +#include "battle_message.h" +#include "battle_setup.h" #include "battle_tv.h" -#include "pokemon.h" +#include "bg.h" +#include "data2.h" +#include "item.h" +#include "item_menu.h" #include "link.h" -#include "util.h" #include "main.h" -#include "item.h" -#include "constants/items.h" -#include "constants/songs.h" -#include "sound.h" -#include "constants/moves.h" -#include "constants/trainers.h" -#include "window.h" #include "m4a.h" #include "palette.h" -#include "task.h" -#include "text.h" -#include "string_util.h" -#include "bg.h" -#include "reshow_battle_screen.h" -#include "random.h" +#include "party_menu.h" #include "pokeball.h" -#include "data2.h" -#include "battle_setup.h" -#include "item_menu.h" +#include "pokemon.h" +#include "random.h" #include "recorded_battle.h" -#include "party_menu.h" -#include "battle_dome.h" -#include "battle_arena.h" +#include "reshow_battle_screen.h" +#include "sound.h" +#include "string_util.h" +#include "task.h" +#include "text.h" +#include "util.h" +#include "window.h" +#include "constants/battle_anim.h" +#include "constants/items.h" +#include "constants/moves.h" +#include "constants/songs.h" +#include "constants/trainers.h" extern u8 gUnknown_0203CEE8; extern u8 gUnknown_0203CEE9; |