Merge conflict resolves into review changes

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);