diff options
author | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-15 01:19:00 -0400 |
---|---|---|
committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-15 01:19:00 -0400 |
commit | 31ded7cc6f40876421c7186e15f8a9fa606ff569 (patch) | |
tree | 831d96edb6d2b4d239affc57ef98d6ccb2f1bccb /src/reshow_battle_screen.c | |
parent | 2e789dbbdc18f56cba62aef51156d44136b20632 (diff) | |
parent | 8e1537fb57dc7ed17079b30f7a3851132cf462bd (diff) |
Merge branch 'master' into pokenav-decomp-again
Diffstat (limited to 'src/reshow_battle_screen.c')
-rw-r--r-- | src/reshow_battle_screen.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/reshow_battle_screen.c b/src/reshow_battle_screen.c index 0926d4569..dd177f884 100644 --- a/src/reshow_battle_screen.c +++ b/src/reshow_battle_screen.c @@ -2,6 +2,7 @@ #include "reshow_battle_screen.h" #include "battle.h" #include "palette.h" +#include "pokemon.h" #include "main.h" #include "scanline_effect.h" #include "text.h" @@ -18,8 +19,6 @@ extern const union AnimCmd * const * const gMonAnimationsSpriteAnimsPtrTable[]; -extern void SetMultiuseSpriteTemplateToTrainerBack(u16 backPicId, u8 battlerPosition); - // this file's functions static void CB2_ReshowBattleScreenAfterMenu(void); static bool8 LoadBattlerSpriteGfx(u8 battlerId); |