diff options
author | Diegoisawesome <diego@domoreaweso.me> | 2017-10-09 13:32:26 -0500 |
---|---|---|
committer | Diegoisawesome <diego@domoreaweso.me> | 2017-10-09 13:32:26 -0500 |
commit | 41db0259759c8e4c3c31c5cf09daed9f85ab5b63 (patch) | |
tree | ab77e37580ab0eb0ee18c28f749d8c8da15dbcf7 /include/sprite.h | |
parent | ae06c13e99162cebd3617f5aafb135bdd8b3f237 (diff) | |
parent | 96c5966ff3676eb1b3463808b83b42e13e1591fd (diff) |
Merge remote-tracking branch 'pret/master' into baserom_extraction
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 838b0d7c0..a9377165e 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -212,14 +212,14 @@ struct Sprite 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; - u16 affineAnimBeginning:1; - u16 animEnded:1; - u16 affineAnimEnded:1; - u16 usingSheet:1; - u16 flags_f:1; + /*0x3F*/ u16 hFlip:1; //1 + u16 vFlip:1; //2 + u16 animBeginning:1; //4 + u16 affineAnimBeginning:1; //8 + u16 animEnded:1; //0x10 + u16 affineAnimEnded:1; //0x20 + u16 usingSheet:1; //0x40 + u16 flags_f:1; //0x80 /*0x40*/ u16 sheetTileStart; |