diff --git a/include/d/d_menu_cloth.h b/include/d/d_menu_cloth.h index caed9f9c7..ead024846 100644 --- a/include/d/d_menu_cloth.h +++ b/include/d/d_menu_cloth.h @@ -50,7 +50,7 @@ public: /* 0x0004 */ u16 field_0x4; /* 0x0006 */ u8 field_0x6[0x08 - 0x06]; /* 0x0008 */ u16 field_0x8; - /* 0x000A */ u16 field_0xa; + /* 0x000A */ s16 field_0xa; /* 0x000C */ u8 field_0xc; /* 0x000D */ u8 field_0xd; /* 0x000E */ u8 field_0xe[0x44 - 0x0E]; @@ -91,7 +91,7 @@ public: /* 0x002e */ s16 field_0x2e; /* 0x0030 */ s16 field_0x30; /* 0x0032 */ u16 field_0x32; - /* 0x0034 */ u16 field_0x34; + /* 0x0034 */ s16 field_0x34; /* 0x0036 */ s16 field_0x36; /* 0x0038 */ u16 field_0x38; /* 0x003a */ u16 field_0x3a; diff --git a/src/d/d_menu_cloth.cpp b/src/d/d_menu_cloth.cpp index cdde625bb..6526e35f3 100644 --- a/src/d/d_menu_cloth.cpp +++ b/src/d/d_menu_cloth.cpp @@ -429,7 +429,23 @@ void dMCloth_c::cloth_move_simple() { /* 8019BCF4-8019BDB8 .text cloth_move__9dMCloth_cFv */ void dMCloth_c::cloth_move() { - /* Nonmatching */ + switch (mClothType) { + case 0: + case 2: { + if (field_0xa < l_HIO.mChildren[mClothType].field_0x34) { + cloth_move_sin(); + field_0xa++; + } else { + cloth_move_simple(); + } + } break; + case 1: { + if (field_0xa < l_HIO.mChildren[mClothType].field_0x34) { + field_0xa++; + } + cloth_move_sin(); + } break; + } } /* 8019BDB8-8019BDC0 .text dMenu_ClothCreate__FPv */