diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-12-05 12:42:30 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-12-05 12:42:30 -0600 |
| commit | 19fbf024ff7e5bedc0f297a44c7df298a9bd0ef4 (patch) | |
| tree | e9a928ac0d8eaaca476d8704b95fbf5f6838d994 /include/sprite.h | |
| parent | caa13f877797edbb7a1e13bf00b537bafbd4315a (diff) | |
| parent | 00896cb3b5813cb843e5e1abd4cbc9ff0ad3a632 (diff) | |
fix merge conflicts
Diffstat (limited to 'include/sprite.h')
| -rw-r--r-- | include/sprite.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/include/sprite.h b/include/sprite.h index 531314079..170d77c3f 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 |