WIP/experimental: ColliderCylinderElement

Dragorn421 · Nov 17, 2022 · cfc8c32 · cfc8c32
1 parent fa8bf58
commit cfc8c32
Show file tree

Hide file tree

Showing 5 changed files with 167 additions and 146 deletions.
diff --git a/include/z64collision_check.h b/include/z64collision_check.h
@@ -189,28 +189,34 @@ typedef struct {
  * Cylinder collider
  */
 
+typedef struct {
+    /* 0x00 */ ColliderElement base;
+    /* 0x28 */ Cylinder16 dim;
+} ColliderCylinderElement; // size = 0x34
+
+typedef struct {
+    /* 0x00 */ ColliderElementInit base;
+    /* 0x18 */ Cylinder16 dim;
+} ColliderCylinderElementInit; // size = 0x24
+
 typedef struct {
     /* 0x00 */ Collider base;
-    /* 0x18 */ ColliderElement elem;
-    /* 0x40 */ Cylinder16 dim;
+    /* 0x18 */ ColliderCylinderElement element;
 } ColliderCylinder; // size = 0x4C
 
 typedef struct {
     /* 0x00 */ ColliderInit base;
-    /* 0x08 */ ColliderElementInit elem;
-    /* 0x20 */ Cylinder16 dim;
+    /* 0x08 */ ColliderCylinderElementInit element;
 } ColliderCylinderInit; // size = 0x2C
 
 typedef struct {
     /* 0x00 */ ColliderInitType1 base;
-    /* 0x08 */ ColliderElementInit elem;
-    /* 0x20 */ Cylinder16 dim;
+    /* 0x08 */ ColliderCylinderElementInit element;
 } ColliderCylinderInitType1; // size = 0x2C
 
 typedef struct {
     /* 0x00 */ ColliderInitToActor base;
-    /* 0x08 */ ColliderElementInit elem;
-    /* 0x20 */ Cylinder16 dim;
+    /* 0x08 */ ColliderCylinderElementInit element;
 } ColliderCylinderInitToActor; // size = 0x2C
 
 /*