diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-31 09:31:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-31 09:31:33 -0400 |
| commit | c6cd74fed25cbb6e2fa0296960fbcda795311b06 (patch) | |
| tree | 05ae3de2bc0130040d48e800fe4e962f2a818aef /include/pokeball.h | |
| parent | 922411abebd56d0f5d6072bad4924c909c8e2c27 (diff) | |
| parent | 2b0bcdcad9336defc82f50a329b12e631b1f33ce (diff) | |
Merge pull request #120 from PikalaxALT/trade
Trade
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 ee0478eab..884ded22e 100644 --- a/include/pokeball.h +++ b/include/pokeball.h @@ -25,7 +25,7 @@ enum u8 DoPokeballSendOutAnimation(s16 pan, u8 kindOfThrow); void CreatePokeballSpriteToReleaseMon(u8 monSpriteId, u8 bank, u8 x, u8 y, u8 oamPriority, u8 subpriortiy, u8 g, u32 h); -u8 sub_804BB98(u8 monSpriteId, u8 bank, u8 x, u8 y, u8 oamPriority, u8 subpriortiy, u8 g, u32 h); +u8 CreateTradePokeballSprite(u8 monSpriteId, u8 bank, u8 x, u8 y, u8 oamPriority, u8 subpriortiy, u8 g, u32 h); 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); |