summaryrefslogtreecommitdiff
path: root/include/sprite.h
diff options
context:
space:
mode:
authorgarak <garakmon@gmail.com>2018-10-21 15:12:18 -0400
committerGitHub <noreply@github.com>2018-10-21 15:12:18 -0400
commit7a9c7e5f068a2ec88ce6fe24a5c72f4b4ae7f48b (patch)
treeb8e391c9e856a2546075d44cba353c4b100a52ef /include/sprite.h
parent2bb286ab4e3a967ce129d82cdad0ede4d744fa73 (diff)
parent804d0a4b6a12907974ffd8cb20f6ed6c527b663b (diff)
Merge branch 'master' into sprite-tags
Diffstat (limited to 'include/sprite.h')
-rw-r--r--include/sprite.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/sprite.h b/include/sprite.h
index 4ffcd2884..085faff68 100644
--- a/include/sprite.h
+++ b/include/sprite.h
@@ -6,21 +6,21 @@
struct SpriteSheet
{
- const u8 *data; // Raw uncompressed pixel data
+ const void *data; // Raw uncompressed pixel data
u16 size;
u16 tag;
};
struct CompressedSpriteSheet
{
- const u8 *data; // LZ77 compressed pixel data
+ const u32 *data; // LZ77 compressed pixel data
u16 size; // Uncompressed size of pixel data
u16 tag;
};
struct SpriteFrameImage
{
- const u8 *data;
+ const void *data;
u16 size;
};
@@ -36,7 +36,7 @@ struct SpritePalette
struct CompressedSpritePalette
{
- const u8 *data; // LZ77 compressed palette data
+ const u32 *data; // LZ77 compressed palette data
u16 tag;
};