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_interface.c | |
parent | 5f1a4de374417b7580131d45c0a478f062f3916f (diff) | |
parent | 35a578c62050893d5f347f637acbdcbbfb99f311 (diff) |
Merge branch 'master' into doc-rm
Diffstat (limited to 'src/battle_interface.c')
-rw-r--r-- | src/battle_interface.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/battle_interface.c b/src/battle_interface.c index e5145adc0..107999045 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -1,19 +1,14 @@ #include "global.h" +#include "gflib.h" #include "battle_anim.h" #include "battle_interface.h" #include "battle_message.h" #include "decompress.h" -#include "gpu_regs.h" #include "graphics.h" #include "menu.h" -#include "palette.h" #include "pokedex.h" #include "pokemon_summary_screen.h" #include "safari_zone.h" -#include "sound.h" -#include "string_util.h" -#include "text.h" -#include "window.h" #include "constants/songs.h" #define GetStringRightAlignXOffset(fontId, string, destWidth) ({ \ |