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/battle_anim.h | |
| parent | 60a9dc6a0e81da34f111e66fd3666f9eb57898e9 (diff) | |
| parent | e47b3efdfe8a397e20905d566a8e1b1261170fbb (diff) | |
Merge branch 'master' into doc-inc2
Diffstat (limited to 'include/battle_anim.h')
| -rw-r--r-- | include/battle_anim.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/battle_anim.h b/include/battle_anim.h index a7b71bd85..90104fe9c 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -151,7 +151,7 @@ void sub_80A78AC(struct Sprite *sprite); void sub_80A6BFC(struct BattleAnimBgData *unk, u8 unused); u8 sub_80A8394(u16 species, bool8 isBackpic, u8 a3, s16 x, s16 y, u8 subpriority, u32 personality, u32 trainerId, u32 battlerId, u32 a10); void sub_80A749C(struct Sprite *sprite); -void sub_80A6DEC(struct Sprite *sprite); +void TradeMenuBouncePartySprites(struct Sprite *sprite); void DestroyAnimVisualTaskAndDisableBlend(u8 taskId); void DestroySpriteAndFreeResources_(struct Sprite *sprite); void SetBattlerSpriteYOffsetFromOtherYScale(u8 spriteId, u8 otherSpriteId); |