fix merge conflicts

This commit is contained in:
Evan committed 2019-12-04 21:35:31 -07:00
commit 9f2a53eec3
156 files changed
+4490 -6970

No files matched your search

+1
View File
@@ -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