diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-20 10:49:21 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-20 10:49:21 +0200 |
| commit | b65da491a97e77ed2aa122ab7342c7fb94d35606 (patch) | |
| tree | 02e7c17f29426d6bca7bae4d133e1462dc81c355 /include/sprite.h | |
| parent | 9ccc472b97b1a7f85703f813665cb4a30f7891b6 (diff) | |
| parent | ae5aa3c4dfd81fc25e5abeef1b915bb2da68b8d1 (diff) | |
merge with master, fix conflicts
Diffstat (limited to 'include/sprite.h')
| -rw-r--r-- | include/sprite.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sprite.h b/include/sprite.h index a9377165e..531314079 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -251,7 +251,7 @@ void BuildOamBuffer(void); u8 CreateSprite(const struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority); u8 CreateSpriteAtEnd(const struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority); u8 CreateInvisibleSprite(void (*callback)(struct Sprite *)); -u8 CreateSpriteAndAnimate(struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority); +u8 CreateSpriteAndAnimate(const struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority); void DestroySprite(struct Sprite *sprite); void ResetOamRange(u8 a, u8 b); void LoadOam(void); |