Merge pull request #224 from hatal175/collision

Improve nonmatching state in collision.c
2026-06-27 02:35:24 -04:00 · 2021-12-27 21:30:03 -08:00
parent 5b84008265 9dac4f7660
commit d8dfff5de9
6 changed files with 33 additions and 282 deletions
@@ -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;