diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-10-16 04:22:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-16 04:22:34 -0400 |
| commit | b4a9298205ee9355fadd4455a9b8f692dcd3e787 (patch) | |
| tree | 156f18275a5187ae20fc5f5c3a72d61635f126ec /include/pokeball.h | |
| parent | 20fa13616f3ad2ec2f7d68668b9f386355a10fa7 (diff) | |
| parent | 60a592a2c32d07d47c892204659a8576017584d1 (diff) | |
Merge branch 'master' into document-gyms2
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); |