From 581bab1360d5544101b52c0b7616e7fb16ed8a5d Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Sat, 4 Nov 2017 20:24:50 -0400
Subject: more fixes

---
 include/sprite.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/sprite.h')

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


From be716ef9f841589c67f152a90ce5c7c29f7211d8 Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Sat, 18 Nov 2017 20:24:39 -0500
Subject: change Sprite struct to use a data array instead of manual declares.

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

(limited to 'include/sprite.h')

diff --git a/include/sprite.h b/include/sprite.h
index 38687ebd8..a87260ec0 100644
--- a/include/sprite.h
+++ b/include/sprite.h
@@ -195,14 +195,7 @@ struct Sprite
     /*0x2D*/ u8 animLoopCounter;
 
     // general purpose data fields
-    /*0x2E*/ s16 data0;
-    /*0x30*/ s16 data1;
-    /*0x32*/ s16 data2;
-    /*0x34*/ s16 data3;
-    /*0x36*/ s16 data4;
-    /*0x38*/ s16 data5;
-    /*0x3A*/ s16 data6;
-    /*0x3C*/ s16 data7;
+    /*0x2E*/ s16 data[8];
 
     /*0x3E*/ u16 inUse:1;               //1
              u16 coordOffsetEnabled:1;  //2
-- 
cgit v1.2.3


From ad33b833f35800ff2cfc13aaca09e2e57842703a Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Wed, 20 Dec 2017 11:25:54 -0600
Subject: Decompile battle_anim shock

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

(limited to 'include/sprite.h')

diff --git a/include/sprite.h b/include/sprite.h
index a87260ec0..29a0be562 100644
--- a/include/sprite.h
+++ b/include/sprite.h
@@ -222,6 +222,14 @@ struct Sprite
     /*0x43*/ u8 subpriority;
 };
 
+struct OamMatrix
+{
+    s16 a;
+    s16 b;
+    s16 c;
+    s16 d;
+};
+
 extern const struct OamData gDummyOamData;
 extern const union AnimCmd *const gDummySpriteAnimTable[];
 extern const union AffineAnimCmd *const gDummySpriteAffineAnimTable[];
-- 
cgit v1.2.3