summaryrefslogtreecommitdiff
path: root/include/sprite.h
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2018-10-26 23:55:36 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2018-10-26 23:55:36 +0200
commit52be8eeaf15da7b281d48c51b1f4d06740a86c76 (patch)
treeac1c7d0a092f4d16c9ebef0b2538ef46b80c44d5 /include/sprite.h
parentdc273cc19d842e8831548a1342af857aae2886c9 (diff)
parent2778e9ad3dc249eb4cce84be3ac1dfcc7ab850d5 (diff)
Merge branch 'master' into battle_tower
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;
};