From 9708b5da3607e5e298d9d40dc39cbf63392f1559 Mon Sep 17 00:00:00 2001 From: garakmon Date: Sat, 7 Jul 2018 21:41:31 -0400 Subject: mergeflicts --- include/rom_8077ABC.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/rom_8077ABC.h') diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h index 5be158c54..55c0f46c2 100644 --- a/include/rom_8077ABC.h +++ b/include/rom_8077ABC.h @@ -75,6 +75,7 @@ void sub_8078764(struct Sprite *sprite, u8); void StartAnimLinearTranslation(struct Sprite *sprite); void sub_8078D60(struct Sprite *sprite); void InitAnimArcTranslation(struct Sprite *sprite); +void sub_8078D8C(struct Sprite *sprite); void WaitAnimForDuration(struct Sprite *sprite); void sub_8078CC0(struct Sprite *sprite); void sub_8078600(struct Sprite *sprite); -- cgit v1.2.3