diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-04-06 00:37:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-06 00:37:08 -0400 |
| commit | 93d17ef7c886b96791931ba50406b59756e1bdbd (patch) | |
| tree | a96f8cc5e480114dadd1362372da0606c26bc928 /src/battle_controller_player.c | |
| parent | 5f1a4de374417b7580131d45c0a478f062f3916f (diff) | |
| parent | 35a578c62050893d5f347f637acbdcbbfb99f311 (diff) | |
Merge branch 'master' into doc-rm
Diffstat (limited to 'src/battle_controller_player.c')
| -rw-r--r-- | src/battle_controller_player.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index b28249a97..97e833ffd 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -1,23 +1,16 @@ #include "global.h" -#include "bg.h" +#include "gflib.h" #include "data.h" #include "item.h" #include "item_menu.h" #include "link.h" -#include "main.h" #include "m4a.h" -#include "palette.h" #include "party_menu.h" #include "pokeball.h" -#include "pokemon.h" -#include "sound.h" #include "strings.h" -#include "string_util.h" #include "pokemon_special_anim.h" #include "task.h" -#include "text.h" #include "util.h" -#include "window.h" #include "battle.h" #include "battle_anim.h" #include "battle_controllers.h" |