diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-17 20:22:56 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-17 20:22:56 +0100 |
| commit | 46fa2557d777096803ff90ba95d5500a9c03d2c5 (patch) | |
| tree | ded4f0e046be43e371631fca3ac013d96fa244e0 /include/sprite.h | |
| parent | 930fea6fad24692773b930ec7448c59d599844b8 (diff) | |
| parent | 6d73bb4b57efb3ff81dcc2aa0d00d5de380add9e (diff) | |
merge mail with master, fix 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 |