diff options
| author | garakmon <thomastaps194@comcast.net> | 2018-07-07 21:33:54 -0400 |
|---|---|---|
| committer | garakmon <thomastaps194@comcast.net> | 2018-07-07 21:33:54 -0400 |
| commit | 962a0c3f088171bc5dda12a1f2d140be9593858a (patch) | |
| tree | 8e5803956f1e1842a0c64d8d450f6e5edd052b0d | |
| parent | 864a69f9bf050eaaa062c8346cd6a5032e617139 (diff) | |
more merge conflicts...
| -rw-r--r-- | include/rom_8077ABC.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h index c7cb833bc..5be158c54 100644 --- a/include/rom_8077ABC.h +++ b/include/rom_8077ABC.h @@ -74,7 +74,6 @@ void InitAnimSpritePos(struct Sprite *sprite, u8); void sub_8078764(struct Sprite *sprite, u8); void StartAnimLinearTranslation(struct Sprite *sprite); void sub_8078D60(struct Sprite *sprite); -void sub_8078D8C(struct Sprite *sprite); void InitAnimArcTranslation(struct Sprite *sprite); void WaitAnimForDuration(struct Sprite *sprite); void sub_8078CC0(struct Sprite *sprite); |