diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-12-03 12:33:47 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-03 12:33:47 -0600 |
| commit | 8064b011d142cfb7a6c8aa1f8366b85a6ff4e45a (patch) | |
| tree | 5d0753d9daa61c26d726a7bfcd669ccc3ff719f1 /src/battle_controller_player_partner.c | |
| parent | ffa8655f4cd2cb8d6b1bdacc0a5568259eb60a72 (diff) | |
| parent | ba1fc055581921f41cbaebfe9d91b51b8e5df544 (diff) | |
Merge pull request #424 from DizzyEggg/labels
Clean up src/data
Diffstat (limited to 'src/battle_controller_player_partner.c')
| -rw-r--r-- | src/battle_controller_player_partner.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index bd892c922..02dd1383b 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -6,6 +6,7 @@ #include "battle_message.h" #include "battle_interface.h" #include "battle_setup.h" +#include "battle_tower.h" #include "bg.h" #include "data2.h" #include "item_use.h" @@ -26,15 +27,11 @@ #include "constants/songs.h" #include "constants/trainers.h" -extern struct UnusedControllerStruct gUnknown_02022D0C; - extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; extern void sub_81358F4(void); extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); -extern void SetMultiuseSpriteTemplateToPokemon(u16, u8); -extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId); // this file's functions static void PlayerPartnerHandleGetMonData(void); |