Fix s_Bone, S_skeleton, s_800BCE18_0 layout (#391)

Author: pseregiet

include/bodyprog/bodyprog.h

@@ -921,12 +921,12 @@ typedef struct
 } s_func_800452EC;
 
 // Maybe a collection of matrices.
-typedef struct
+typedef struct _Bone
 {
     s_800BCE18_2BEC_0_0 field_x0;
     s8             field_10;
     s8             unk_11[3];
-    s32            field_14;
+    struct _Bone*  next_14;
 } s_Bone;
 STATIC_ASSERT_SIZEOF(s_Bone, 24);
 
@@ -937,19 +937,11 @@ typedef struct
     u8               boneIdx_1; // Current bone index? Used in traversal.
     u8               field_2;
     s8               field_3;
-    s_func_800452EC* field_4;
+    s_Bone* bones_4;
     s_Bone* bones_8;
-
-    // Maybe incorrect.
-    s8                 field_C[4]; // Maybe struct similar to `s_Bone` but smaller.
-    u8                 field_10;   // Some count related to bone hierarchy.
-    s8                 field_11;
-    s8                 field_12;
-    s8                 field_13;
-    struct s_Skeleton* skeleton_14;
-    s8                 unk_18[4];
+    s_Bone  boneArr_C[56];
 } s_Skeleton;
-STATIC_ASSERT_SIZEOF(s_Skeleton, 28);
+STATIC_ASSERT_SIZEOF(s_Skeleton, 0x54C);
 
 typedef struct
 {
@@ -1055,8 +1047,9 @@ typedef struct
     s32           queueIdx_4;
     s_LmHeader*   lmHdr_8;
     s_FsImageDesc texture_C;
-    s_Skeleton    field_14; // Could be different struct?
-} s_800BCE18_0_CC; // Unknown size.
+    s_Skeleton    skeleton_14; // Could be different struct?
+} s_SkeletonStuff; // Unknown size.
+STATIC_ASSERT_SIZEOF(s_SkeletonStuff, 0x560);
 
 typedef struct _MapType
 {
@@ -1074,14 +1067,11 @@ typedef struct
     s8                field_4;
     u8                unk_5[3];
     VECTOR3           field_8;               // Position.
-    s32               field_14;              // Used frequently as `s_LmHeader*`, but code adds file lengths to it. Could just be `u8*` pointing to current file data?
-    s_800BCE18_0_CC*  field_18[Chara_Count]; // Per-character data? So far only seen accessed by `map4_s03::800D59EC` which calls `func_8003BE50(Chara_Twinfeeler)`.
-    s_800BCE18_0_CC   field_CC;
-    u8                unk_D0[368];
-    s32               field_26C;
-    u8                unk_270[752];
+    s32               dataPtr_14;              // Used frequently as `s_LmHeader*`, but code adds file lengths to it. Could just be `u8*` pointing to current file data?
+    s_SkeletonStuff*  charaSkeletons_18[Chara_Count];
+    s_SkeletonStuff   skeletons_CC[4];
 } s_800BCE18_0;
-STATIC_ASSERT_SIZEOF(s_800BCE18_0, 1376);
+STATIC_ASSERT_SIZEOF(s_800BCE18_0, (0x560 * 4 + 0xcc));
 
 typedef struct
 {
@@ -1118,21 +1108,19 @@ typedef struct
     s_FsImageDesc imageDesc_C;
     s_LmHeader*   lmHdr_14;
     s_Bone        bone_18;
-} s_800BCE18_1BAC;
+} s_heldItem;
 
 typedef struct
 {
-    s_800BCE18_0      field_0[4];
-    u8                unk_1580[204];
-    s_800BCE18_0_CC   field_164C;
-    u8                unk_1650[1328];
-    s_800BCE18_1BAC   heldItem_1BAC;
+    s_800BCE18_0      field_0;
+    s_SkeletonStuff   harrySkel_164C;
+    s_heldItem        heldItem_1BAC;
     VC_CAMERA_INTINFO vcCameraInternalInfo_1BDC; // Debug camera info.
     s_LmHeader        field_1BE4;
     s32               field_2BE8;
-    s_800BCE18_2BEC   field_2BEC[1]; // Unknown size, valid count determined by `field_2BE8`?
+    s_800BCE18_2BEC   field_2BEC[29]; // Size based on the check in func_8003C92C
 } s_800BCE18;
-STATIC_ASSERT_SIZEOF(s_800BCE18, 11260);
+STATIC_ASSERT_SIZEOF(s_800BCE18, 11260 + (16*28));
 
 // IPD data?
 typedef struct
@@ -2529,7 +2517,7 @@ void SysState_Fmv_Update();
 
 s32 Map_TypeGet();
 
-void func_8003C1AC(s_800BCE18_0_CC* arg0);
+void func_8003C1AC(s_SkeletonStuff* arg0);
 
 void func_8003C220(s_MapOverlayHeader* mapHeader, s32 playerPosX, s32 playerPosZ);
 
@@ -2558,7 +2546,7 @@ void func_8003D550(s32 arg0, s32 arg1);
 /** Called by some chara init funcs, similar to `func_8003DD80`? */
 void func_8003D468(s32 arg0, bool flag);
 
-void func_8003D6A4(s_800BCE18_0_CC* arg0);
+void func_8003D6A4(s_SkeletonStuff* arg0);
 
 /** Return type assumed. */
 void func_8003D160();
@@ -2841,7 +2829,7 @@ void func_80045108(s_Skeleton* skel, s_LmHeader* lmHdr, u8* arg2, s32 arg3);
 void func_800451B0(s_Skeleton* skel, s_LmHeader* lmHdr, s32* arg2);
 
 /** Anim func. Param names are rough. */
-void func_80045258(s_Skeleton** skels, s_Bone* bones, s32 boneIdx, s_LmHeader* lmHdr);
+void func_80045258(s_Bone** skels, s_Bone* bones, s32 boneIdx, s_LmHeader* lmHdr);
 
 /** Anim func. */
 void func_800452EC(s_Skeleton* skel);
@@ -3961,7 +3949,7 @@ void func_8003BE28();
 
 // ====================
 
-s32 func_8003BE50(s32 idx);
+s_Bone* func_8003BE50(s32 idx);
 
 void GameFs_BgEtcGfxLoad();
 
@@ -3982,7 +3970,7 @@ void func_8003C0C0();
 /** Allocates player model? */
 void func_8003C110();
 
-void func_8003C1AC(s_800BCE18_0_CC* arg0);
+void func_8003C1AC(s_SkeletonStuff* arg0);
 
 void Ipd_ActiveChunksClear1();
 
@@ -4017,7 +4005,7 @@ void func_8003D938();
 
 void func_8003D95C();
 
-void func_8003D9C8(s_800BCE18_0_CC* arg0);
+void func_8003D9C8(s_SkeletonStuff* arg0);
 
 void func_8003DA9C(s32 arg0, GsCOORDINATE2* coord, s32 arg2, s16 arg3, s32 arg4);