diff options
| author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-09-07 11:50:23 +0100 |
|---|---|---|
| committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-09-07 11:50:23 +0100 |
| commit | 9dec2bdef891653d10060a45417609c4d31b14c7 (patch) | |
| tree | f9080cfc922a15570aeeee98d1ff695596e55ccb /include/pokeball.h | |
| parent | bc42c5054c335f4de8a6b43135673ce931991c3e (diff) | |
| parent | ef62393289b7a1d2e20fe195e24830d5c1f2f973 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into spritesheet
Diffstat (limited to 'include/pokeball.h')
| -rw-r--r-- | include/pokeball.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/pokeball.h b/include/pokeball.h index 84178b5b2..8e1d8b8ec 100644 --- a/include/pokeball.h +++ b/include/pokeball.h @@ -18,14 +18,16 @@ enum POKEBALL_COUNT }; +extern const struct SpriteTemplate gBallSpriteTemplates[]; + #define POKEBALL_PLAYER_SENDOUT 0xFF #define POKEBALL_OPPONENT_SENDOUT 0xFE u8 DoPokeballSendOutAnimation(s16 pan, u8 kindOfThrow); -void CreatePokeballSpriteToReleaseMon(u8 monSpriteId, u8 bank, u8 x, u8 y, u8 oamPriority, u8 subpriortiy, u8 g, u32 h, u16 species); +void CreatePokeballSpriteToReleaseMon(u8 monSpriteId, u8 battler, u8 x, u8 y, u8 oamPriority, u8 subpriortiy, u8 g, u32 h, u16 species); u8 sub_807671C(u8 a, u8 b, u8 x, u8 y, u8 oamPriority, u8 subPriority, u8 g, u32 h); -void sub_8076918(u8 bank); -void DoHitAnimHealthboxEffect(u8 bank); +void sub_8076918(u8 battler); +void DoHitAnimHealthboxEffect(u8 battler); void LoadBallGfx(u8 ballId); void FreeBallGfx(u8 ballId); |