diff options
| author | theo3 <arisstephenson2@gmail.com> | 2022-03-17 19:13:56 -0700 |
|---|---|---|
| committer | theo3 <arisstephenson2@gmail.com> | 2022-03-17 19:16:43 -0700 |
| commit | ef470547e04f2cbc50b98d6578932f1188d25dbd (patch) | |
| tree | 4a5e5bffb8ea301bd15b8bda4627c48ccf052cce /include/entity.h | |
| parent | 33579844948ca5c2ed9e1e353fba8b9571f7104d (diff) | |
cleanup
Diffstat (limited to 'include/entity.h')
| -rw-r--r-- | include/entity.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/entity.h b/include/entity.h index 4b25be09..4f2cc3ca 100644 --- a/include/entity.h +++ b/include/entity.h @@ -106,7 +106,7 @@ typedef struct { } Hitbox3D; typedef struct { - u8 b0 : 3; // 1-4 + u8 b0 : 3; // 1-4 /**< set to is 4 in entity init (default/lowest?) u8 b1 : 3; // 8 u8 b2 : 1; // 0x40 u8 b3 : 1; // 0x80 @@ -504,6 +504,8 @@ extern u8 gManagerCount; #define COLLISION_OFF(entity) ((entity)->flags &= ~ENT_COLLIDE) #define COLLISION_ON(entity) ((entity)->flags |= ENT_COLLIDE) +#define ANIM_DONE (1 << 7) /* invalid frame index */ + /** @name Tile Macros */ /// @{ #define TILE(x, y) (((((x)-gRoomControls.origin_x) >> 4) & 0x3F) | ((((y)-gRoomControls.origin_y) >> 4) & 0x3F) << 6) #define TILE_POS(x, y) (x + (y << 6)) @@ -512,7 +514,8 @@ extern u8 gManagerCount; /// @} /** @name Animation State Macros */ ///@{ -#define AnimationStateTurnAround(expr) ((expr) ^ 0x4) +#define AnimationStateFlip90(expr) ((expr) ^ 0x2) +#define AnimationStateFlip180(expr) ((expr) ^ 0x4) #define AnimationStateIdle(expr) ((expr)&0x6) #define AnimationStateWalk(expr) ((expr)&0xe) ///@} |
