From 8e7202ec3d289305190aedc66d02435571747a76 Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Sun, 21 Oct 2018 02:24:57 -0500
Subject: Fix LZ compressed data alignment

---
 include/sprite.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'include/sprite.h')

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;
 };
 
-- 
cgit v1.2.3


From 22a0b58e57a26f8636b0afcb841aef8ae4910192 Mon Sep 17 00:00:00 2001
From: garak <garakmon@gmail.com>
Date: Wed, 24 Oct 2018 15:52:21 -0400
Subject: effects_2 and water data

---
 include/sprite.h | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'include/sprite.h')

diff --git a/include/sprite.h b/include/sprite.h
index 085faff68..32bdd9c55 100644
--- a/include/sprite.h
+++ b/include/sprite.h
@@ -103,12 +103,19 @@ struct AffineAnimJumpCmd
     u16 target;
 };
 
+struct AffineAnimEndCmdAlt
+{
+    s16 type;
+    u16 val;
+};
+
 union AffineAnimCmd
 {
     s16 type;
     struct AffineAnimFrameCmd frame;
     struct AffineAnimLoopCmd loop;
     struct AffineAnimJumpCmd jump;
+    struct AffineAnimEndCmdAlt end; // unused in code
 };
 
 #define AFFINEANIMCMDTYPE_LOOP 0x7FFD
@@ -123,6 +130,8 @@ union AffineAnimCmd
     {.jump = {.type = AFFINEANIMCMDTYPE_JUMP, .target = _target}}
 #define AFFINEANIMCMD_END \
     {.type = AFFINEANIMCMDTYPE_END}
+#define AFFINEANIMCMD_END_ALT(_val) \
+    {.end = {.type = AFFINEANIMCMDTYPE_END, .val = _val}}
 
 struct AffineAnimState
 {
-- 
cgit v1.2.3