diff --git a/include/d/d_menu_cloth.h b/include/d/d_menu_cloth.h index e47b6f655..2791db977 100644 --- a/include/d/d_menu_cloth.h +++ b/include/d/d_menu_cloth.h @@ -60,7 +60,7 @@ public: daCLOTH_ChildHIO_c(); virtual ~daCLOTH_ChildHIO_c(); -private: +public: /* 0x0004 */ f32 field_0x4; /* 0x0008 */ f32 field_0x8; /* 0x000c */ f32 field_0xc; @@ -80,7 +80,7 @@ private: /* 0x0030 */ u16 field_0x30; /* 0x0032 */ u16 field_0x32; /* 0x0034 */ u16 field_0x34; - /* 0x0036 */ u16 field_0x36; + /* 0x0036 */ s16 field_0x36; /* 0x0038 */ u16 field_0x38; /* 0x003a */ u16 field_0x3a; /* 0x003c */ f32 field_0x3c; @@ -100,8 +100,8 @@ public: daCLOTH_HIO_c(); virtual ~daCLOTH_HIO_c(); -private: - /* 0x0004 */ u8 field_0x4; +public: + /* 0x0004 */ s8 field_0x4; /* 0x0005 */ u8 field_0x5; /* 0x0006 */ u8 field_0x6; /* 0x0007 */ u8 field_0x7; diff --git a/src/d/d_menu_cloth.cpp b/src/d/d_menu_cloth.cpp index e719d9f4e..cfca9c92a 100644 --- a/src/d/d_menu_cloth.cpp +++ b/src/d/d_menu_cloth.cpp @@ -12,7 +12,106 @@ static daCLOTH_HIO_c l_HIO; /* 8019940C-8019966C .text __ct__13daCLOTH_HIO_cFv */ daCLOTH_HIO_c::daCLOTH_HIO_c() { - /* Nonmatching */ + field_0x4 = -1; + + { + mChildren[0].field_0x4 = 1.78f; + mChildren[0].field_0x8 = 1.78f; + mChildren[0].field_0xc = 1.0f; + mChildren[0].field_0x1c = 0; + mChildren[0].field_0x1e = 0; + mChildren[0].field_0x20 = 0; + mChildren[0].field_0x10 = 360.0f; + mChildren[0].field_0x14 = 40.0f; + mChildren[0].field_0x18 = -2400.0f; + mChildren[0].field_0x22 = 0x78; + mChildren[0].field_0x24 = 0xA5; + mChildren[0].field_0x26 = 0x37; + mChildren[0].field_0x28 = 0xDC; + mChildren[0].field_0x2a = 0x23; + mChildren[0].field_0x2c = 0x5f; + mChildren[0].field_0x2e = 0x19; + mChildren[0].field_0x30 = 0x20; + mChildren[0].field_0x32 = 0; + mChildren[0].field_0x34 = 7; + mChildren[0].field_0x36 = -1000; + mChildren[0].field_0x38 = 9000; + mChildren[0].field_0x3a = 0x800; + mChildren[0].field_0x3c = 5.0; + mChildren[0].field_0x40 = 5.0; + mChildren[0].field_0x44 = 250.0; + mChildren[0].field_0x4c = 1000.0; + mChildren[0].field_0x48 = 0; + mChildren[0].field_0x4a = 0; + mChildren[0].field_0x50 = 2; + mChildren[0].field_0x54 = 290.0f; + } + + { + mChildren[1].field_0x4 = 1.27f; + mChildren[1].field_0x8 = 0.93f; + mChildren[1].field_0xc = 1.0f; + mChildren[1].field_0x1c = 0; + mChildren[1].field_0x1e = 0; + mChildren[1].field_0x20 = 0; + mChildren[1].field_0x10 = 350.0; + mChildren[1].field_0x14 = -15.0; + mChildren[1].field_0x18 = -2400.0; + mChildren[1].field_0x22 = 0xbe; + mChildren[1].field_0x24 = 0xb4; + mChildren[1].field_0x26 = 100; + mChildren[1].field_0x28 = 0xaa; + mChildren[1].field_0x2a = 0x8c; + mChildren[1].field_0x2c = 0x50; + mChildren[1].field_0x2e = 0x14; + mChildren[1].field_0x30 = 0x20; + mChildren[1].field_0x32 = 0; + mChildren[1].field_0x34 = 7; + mChildren[1].field_0x36 = -1000; + mChildren[1].field_0x38 = 9000; + mChildren[1].field_0x3a = 0x800; + mChildren[1].field_0x3c = 5.0; + mChildren[1].field_0x40 = 5.0; + mChildren[1].field_0x44 = 250.0; + mChildren[1].field_0x4c = 1000.0; + mChildren[1].field_0x48 = 0; + mChildren[1].field_0x4a = 0; + mChildren[1].field_0x50 = 2; + mChildren[1].field_0x54 = 290.0; + } + + { + mChildren[2].field_0x4 = 1.7; + mChildren[2].field_0x8 = 1.7; + mChildren[2].field_0xc = 1.0; + mChildren[2].field_0x1c = 0; + mChildren[2].field_0x1e = 0; + mChildren[2].field_0x20 = 0x4000; + mChildren[2].field_0x10 = 360.0; + mChildren[2].field_0x14 = 40.0; + mChildren[2].field_0x18 = -2400.0; + mChildren[2].field_0x22 = 0xbe; + mChildren[2].field_0x24 = 0xb4; + mChildren[2].field_0x26 = 100; + mChildren[2].field_0x28 = 0xdc; + mChildren[2].field_0x2a = 0x8c; + mChildren[2].field_0x2c = 0x50; + mChildren[2].field_0x2e = 0x14; + mChildren[2].field_0x30 = 0x20; + mChildren[2].field_0x32 = 0; + mChildren[2].field_0x34 = 7; + mChildren[2].field_0x36 = -1000; + mChildren[2].field_0x38 = 9000; + mChildren[2].field_0x3a = 0x800; + mChildren[2].field_0x3c = 5.0; + mChildren[2].field_0x40 = 5.0; + mChildren[2].field_0x44 = 250.0; + mChildren[2].field_0x4c = 1000.0; + mChildren[2].field_0x48 = 0; + mChildren[2].field_0x4a = 0; + mChildren[2].field_0x50 = 2; + mChildren[2].field_0x54 = 290.0; + } } /* 8019966C-801996B4 .text __dt__18daCLOTH_ChildHIO_cFv */