Start matching dMCloth_c::cloth_init and update structure definitions to use INNER_SIZE constant, optimize initialization logic, and replace redundant assignments with consolidated methods.

This commit is contained in:
Briggs Baltzell
2026-02-06 09:25:27 -06:00
parent 4c2f8709a3
commit 1cc8554cd8
2 changed files with 108 additions and 34 deletions
+26 -16
View File
@@ -40,10 +40,20 @@ public:
void cloth_move_simple();
void cloth_move();
private:
static s16 init_angle_z;
public:
static const int ARR_SIZE = 441;
static const int INNER_SIZE = 11;
/* 0x0004 */ u16 field_0x4;
/* 0x0006 */ u8 field_0x6[0x44 - 0x06];
/* 0x0006 */ u8 field_0x6[0x08 - 0x06];
/* 0x0008 */ u16 field_0x8;
/* 0x000A */ u16 field_0xa;
/* 0x000C */ u8 field_0xc;
/* 0x000D */ u8 field_0xd;
/* 0x000E */ u8 field_0xe[0x44 - 0x0E];
/* 0x0044 */ JKRArchive* mpArc;
/* 0x0048 */ cXyz field_0x48[2][ARR_SIZE];
/* 0x29A0 */ cXyz field_0x29a0[2][ARR_SIZE];
@@ -54,7 +64,11 @@ public:
/* 0x911C */ u8 field_0x911c[0x913C - 0x911C];
/* 0x913C */ u8 mCurArr;
/* 0x913D */ u8 mClothType;
/* 0x913E */ u8 field_913e[0x9168 - 0x913E];
/* 0x913E */ u8 field_0x913e[0x9140 - 0x913E];
/* 0x9140 */ cXyz field_0x9140;
/* 0x914C */ u8 field_0x914C[0x9158 - 0x914C];
/* 0x9158 */ csXyz field_0x9158;
/* 0x915E */ s8 field_0x915e[8];
};
class daCLOTH_ChildHIO_c {
@@ -63,23 +77,19 @@ public:
virtual ~daCLOTH_ChildHIO_c();
public:
/* 0x0004 */ f32 field_0x4;
/* 0x0008 */ f32 field_0x8;
/* 0x000c */ f32 field_0xc;
/* 0x0004 */ cXyz field_0x4;
/* 0x0010 */ f32 field_0x10;
/* 0x0014 */ f32 field_0x14;
/* 0x0018 */ f32 field_0x18;
/* 0x001c */ u16 field_0x1c;
/* 0x001e */ u16 field_0x1e;
/* 0x0020 */ u16 field_0x20;
/* 0x0022 */ u16 field_0x22;
/* 0x0024 */ u16 field_0x24;
/* 0x0026 */ u16 field_0x26;
/* 0x0028 */ u16 field_0x28;
/* 0x002a */ u16 field_0x2a;
/* 0x002c */ u16 field_0x2c;
/* 0x002e */ u16 field_0x2e;
/* 0x0030 */ u16 field_0x30;
/* 0x001c */ csXyz field_0x1c;
/* 0x0022 */ s16 field_0x22;
/* 0x0024 */ s16 field_0x24;
/* 0x0026 */ s16 field_0x26;
/* 0x0028 */ s16 field_0x28;
/* 0x002a */ s16 field_0x2a;
/* 0x002c */ s16 field_0x2c;
/* 0x002e */ s16 field_0x2e;
/* 0x0030 */ s16 field_0x30;
/* 0x0032 */ u16 field_0x32;
/* 0x0034 */ u16 field_0x34;
/* 0x0036 */ s16 field_0x36;