diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2016-09-10 11:00:02 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2016-09-10 11:00:02 -0700 |
| commit | 3cb79cf078e82206796e1b834393ab771593de72 (patch) | |
| tree | 3e27550ab45ce782db8f2e182819015ba3aef733 /include/sprite.h | |
| parent | f5d9daeca38728f67db92a175c37e5a3bc18cee3 (diff) | |
| parent | 19bffecc4deb401aa51add3b95163b72686f40ee (diff) | |
Merge 'master' with 'origin/master'
Diffstat (limited to 'include/sprite.h')
| -rw-r--r-- | include/sprite.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/sprite.h b/include/sprite.h index 10bd3a5f0..9b800a9ea 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -149,14 +149,14 @@ struct Sprite u8 animLoopCounter; // general purpose data fields - u16 data0; - u16 data1; - u16 data2; - u16 data3; - u16 data4; - u16 data5; - u16 data6; - u16 data7; + s16 data0; + s16 data1; + s16 data2; + s16 data3; + s16 data4; + s16 data5; + s16 data6; + s16 data7; u16 inUse:1; u16 coordOffsetEnabled:1; |