diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2021-12-27 21:30:03 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-27 21:30:03 -0800 |
| commit | d8dfff5de93387a6a8a77ea9e7bdbd53b6ff9500 (patch) | |
| tree | 0a8ef45048e01091415348e57df4b0e6318eb0dd /include | |
| parent | 5b84008265fb7bfd997e8df35301a7d95fd8845d (diff) | |
| parent | 9dac4f766060ff430c84966e0e5f874d1c2d1bbd (diff) | |
Merge pull request #224 from hatal175/collision
Improve nonmatching state in collision.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/entity.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/entity.h b/include/entity.h index 43c3b721..ecea4a9d 100644 --- a/include/entity.h +++ b/include/entity.h @@ -95,8 +95,9 @@ typedef struct Entity_ { /*0x26*/ u8 spriteAnimation[3]; /*0x29*/ struct { /* */ u8 b0 : 3; // 1-4 - /* */ u8 b1 : 3; // 8 - /* */ u8 b2 : 2; //0x40 + /* */ u8 b1 : 3; // 8 + /* */ u8 b2 : 1; // 0x40 + /* */ u8 b3 : 1; // 0x80 /* */ } PACKED spritePriority; /*0x2a*/ u16 collisions; /*0x2c*/ union SplitWord x; |