diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-12-05 12:42:30 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-12-05 12:42:30 -0600 |
| commit | 19fbf024ff7e5bedc0f297a44c7df298a9bd0ef4 (patch) | |
| tree | e9a928ac0d8eaaca476d8704b95fbf5f6838d994 /include/pokeball.h | |
| parent | caa13f877797edbb7a1e13bf00b537bafbd4315a (diff) | |
| parent | 00896cb3b5813cb843e5e1abd4cbc9ff0ad3a632 (diff) | |
fix merge conflicts
Diffstat (limited to 'include/pokeball.h')
| -rw-r--r-- | include/pokeball.h | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/include/pokeball.h b/include/pokeball.h index 76f084465..84178b5b2 100644 --- a/include/pokeball.h +++ b/include/pokeball.h @@ -1,8 +1,32 @@ #ifndef GUARD_POKEBALL_H #define GUARD_POKEBALL_H -u8 sub_80753E8(u16, u8); +enum +{ + BALL_POKE, + BALL_GREAT, + BALL_SAFARI, + BALL_ULTRA, + BALL_MASTER, + BALL_NET, + BALL_DIVE, + BALL_NEST, + BALL_REPEAT, + BALL_TIMER, + BALL_LUXURY, + BALL_PREMIER, + POKEBALL_COUNT +}; + +#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); +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 LoadBallGfx(u8 ballId); +void FreeBallGfx(u8 ballId); #endif // GUARD_POKEBALL_H |