diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2017-06-18 13:01:55 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-06-18 13:01:55 -0400 |
commit | 5d04fe94d9eed2980ac0b439b0e45af13c792037 (patch) | |
tree | bf9f0c1eaecbcf25e9de4ef6d5c99c16f132e5a4 /src/sprite.c | |
parent | 02af81bc95367d4557189fda0f1dccccf16c852a (diff) | |
parent | 13ff901d46f1726d5c0680cf8593484e0e9bbc4d (diff) |
Merge remote-tracking branch 'origin/master' into field_map_obj_data
Diffstat (limited to 'src/sprite.c')
-rw-r--r-- | src/sprite.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/sprite.c b/src/sprite.c index 409c66cfa..fb8c2b648 100644 --- a/src/sprite.c +++ b/src/sprite.c @@ -57,7 +57,6 @@ static void ClearSpriteCopyRequests(void); static void ResetOamMatrices(void); static void ResetSprite(struct Sprite *sprite); static s16 AllocSpriteTiles(u16 tileCount); -u8 SpriteTileAllocBitmapOp(u16 bit, u8 op); static void RequestSpriteFrameImageCopy(u16 index, u16 tileNum, const struct SpriteFrameImage *images); static void ResetAllSprites(void); static void BeginAnim(struct Sprite *sprite); |