diff options
author | GriffinR <griffin.richards@comcast.net> | 2019-10-13 15:44:07 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-13 15:44:07 -0400 |
commit | 30ef49416391d036286661a8e1225b4ba03e3109 (patch) | |
tree | 449560dd408241717995409d3cb6c0a8e4b5223a /include/pokeball.h | |
parent | 60a9dc6a0e81da34f111e66fd3666f9eb57898e9 (diff) | |
parent | e47b3efdfe8a397e20905d566a8e1b1261170fbb (diff) |
Merge branch 'master' into doc-inc2
Diffstat (limited to 'include/pokeball.h')
-rw-r--r-- | include/pokeball.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/pokeball.h b/include/pokeball.h index 8e1d8b8ec..12b9b1eff 100644 --- a/include/pokeball.h +++ b/include/pokeball.h @@ -25,7 +25,7 @@ extern const struct SpriteTemplate gBallSpriteTemplates[]; u8 DoPokeballSendOutAnimation(s16 pan, u8 kindOfThrow); 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); +u8 CreateTradePokeballSprite(u8 a, u8 b, u8 x, u8 y, u8 oamPriority, u8 subPriority, u8 g, u32 h); void sub_8076918(u8 battler); void DoHitAnimHealthboxEffect(u8 battler); void LoadBallGfx(u8 ballId); |