diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-08-18 19:53:34 +0200 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-08-18 19:53:34 +0200 |
commit | 0b5ecd586b68cf0415328e384316c23574a742df (patch) | |
tree | 445d03b2d549b1c2a491dc8353c134d482795c3f /include/sprite.h | |
parent | f25425cf7de8da73f371ab587275f45e774070a0 (diff) | |
parent | 9109469175ed52fedfe8a04567e7ecd83f0f5e66 (diff) |
Merge branch 'master' into decompile_battle_transition
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 733231eb5..5682a7c1d 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -204,14 +204,14 @@ struct Sprite /*0x3A*/ s16 data6; /*0x3C*/ s16 data7; - /*0x3E*/ u16 inUse:1; - u16 coordOffsetEnabled:1; - u16 invisible:1; - u16 flags_3:1; - u16 flags_4:1; - u16 flags_5:1; - u16 flags_6:1; - u16 flags_7:1; + /*0x3E*/ u16 inUse:1; //1 + u16 coordOffsetEnabled:1; //2 + u16 invisible:1; //4 + u16 flags_3:1; //8 + u16 flags_4:1; //0x10 + u16 flags_5:1; //0x20 + u16 flags_6:1; //0x40 + u16 flags_7:1; //0x80 /*0x3F*/ u16 hFlip:1; u16 vFlip:1; u16 animBeginning:1; |