diff options
author | Marcus Huderle <huderlem@gmail.com> | 2017-11-11 13:20:03 -0800 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2017-11-11 13:20:03 -0800 |
commit | 92fda2cc0d5afa76e94927cb72ceac9700f54c1b (patch) | |
tree | 24a7840f1c49602a6ad033ea6cc1cb27b7e12be4 /include/sprite.h | |
parent | 955c5a8e90c9afba35114c583628f74f849a0da4 (diff) | |
parent | 999c4d59793e761ca71ab7b27272de46d78de138 (diff) |
Merge remote-tracking branch 'upstream/master' into pokenav
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 769e1584d..38687ebd8 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -252,7 +252,7 @@ void SetOamMatrix(u8 matrixNum, u16 a, u16 b, u16 c, u16 d); void CalcCenterToCornerVec(struct Sprite *sprite, u8 shape, u8 size, u8 affineMode); void SpriteCallbackDummy(struct Sprite *sprite); void ProcessSpriteCopyRequests(void); -void RequestSpriteCopy(const u8 *src, u8 *dest, u16 size); +void RequestSpriteCopy(const void *src, u8 *dest, u16 size); void FreeSpriteTiles(struct Sprite *sprite); void FreeSpritePalette(struct Sprite *sprite); void FreeSpriteOamMatrix(struct Sprite *sprite); |