diff options
| author | Tetrable <atiftetra@gmail.com> | 2018-09-01 12:36:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-01 12:36:33 +0100 |
| commit | 5a53d6d1fb304736c1fb3c222192a3b722707bca (patch) | |
| tree | eb1794c8da8a8b51caa4abc0de8b797c49ead358 /src/battle_controller_player.c | |
| parent | d8f6da035015393339ea6391d293e5ff88558844 (diff) | |
| parent | 1895383352da3bd5a4f4990fab045ae3610937fc (diff) | |
Merge pull request #2 from pret/master
Update
Diffstat (limited to 'src/battle_controller_player.c')
| -rw-r--r-- | src/battle_controller_player.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 6ab19e368..7f038a0c3 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -28,19 +28,18 @@ #include "pokeball.h" #include "data2.h" #include "battle_setup.h" -#include "item_use.h" +#include "item_menu.h" #include "recorded_battle.h" #include "party_menu.h" +#include "battle_dome.h" extern u8 gUnknown_0203CEE8; extern u8 gUnknown_0203CEE9; extern u8 gUnknown_0203CF00[]; extern u16 gBattle_BG0_X; extern u16 gBattle_BG0_Y; -extern s32 gUnknown_0203CD70; extern struct UnusedControllerStruct gUnknown_02022D0C; extern struct MusicPlayerInfo gMPlayInfo_BGM; -extern struct SpriteTemplate gMultiuseSpriteTemplate; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; @@ -52,7 +51,6 @@ extern void sub_81851A8(u8 *); // this file's functions static void PlayerHandleGetMonData(void); -void PlayerHandleGetRawMonData(void); static void PlayerHandleSetMonData(void); static void PlayerHandleSetRawMonData(void); static void PlayerHandleLoadMonSprite(void); |