fix merge conflicts

2019-12-04 21:35:31 -07:00
parent c8b22e2680 67f48e5f28
commit 9f2a53eec3
156 changed files with 4490 additions and 6970 deletions
@@ -34,5 +34,6 @@ void DoHitAnimHealthboxEffect(u8 bank);
 void LoadBallGfx(u8 ballId);
 void FreeBallGfx(u8 ballId);
 void sub_804BD94(u8 battler);
+void DestroySpriteAndFreeResources2(struct Sprite *sprite);

 #endif // GUARD_POKEBALL_H