diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-04-07 20:20:22 -0400 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-04-07 20:20:22 -0400 |
| commit | 50350cc2e1c26082f9d852e97e1698f7254d4145 (patch) | |
| tree | 3217b352dae2be8da75ad08a8d94ddc7f81a5017 /src/battle_controller_player.c | |
| parent | 1360b3a477f1107785900cd0c4e73ebf018f058c (diff) | |
| parent | a4ea0ac816f799b76ac4bec1b66c569d6b684e64 (diff) | |
Merge branch 'master' into contest-ai-cleanup
Diffstat (limited to 'src/battle_controller_player.c')
| -rw-r--r-- | src/battle_controller_player.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index c4e2face2..e4b5b5c18 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -9,7 +9,7 @@ #include "battle_setup.h" #include "battle_tv.h" #include "bg.h" -#include "data2.h" +#include "data.h" #include "item.h" #include "item_menu.h" #include "link.h" @@ -37,9 +37,6 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM; -extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; -extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; - // this file's functions static void PlayerHandleGetMonData(void); static void PlayerHandleSetMonData(void); |