diff --git a/include/d/lyt/d_lyt_common_icon_item.h b/include/d/lyt/d_lyt_common_icon_item.h index 5dff8f5b..85e98a39 100644 --- a/include/d/lyt/d_lyt_common_icon_item.h +++ b/include/d/lyt/d_lyt_common_icon_item.h @@ -20,7 +20,7 @@ public: class dLytCommonIconItemPart1_c : public dLytCommonIconItemPartBase_c { public: dLytCommonIconItemPart1_c() - : field_0x28C(0), mColor(0), field_0x2B4(false), mHasNumber(false), mSize(false), mBocoburinLocked(false) {} + : mItem(0), mColor(0), field_0x2B4(false), mHasNumber(false), mSize(false), mBocoburinLocked(false) {} virtual ~dLytCommonIconItemPart1_c() {} virtual nw4r::lyt::Pane *getPane() override { return mLyt.getLayout()->GetRootPane(); @@ -71,7 +71,7 @@ private: /* 0x258 */ dTextBox_c *mpTextBoxes[2]; /* 0x260 */ nw4r::lyt::Bounding *mpBounding; /* 0x264 */ d2d::dLytStructD mStructD; - /* 0x28C */ u8 field_0x28C; + /* 0x28C */ u8 mItem; /* 0x28D */ u8 mColor; /* 0x28E */ u8 _0x28E[0x294 - 0x28E]; /* 0x294 */ wchar_t mNumberBuf[16]; diff --git a/src/d/lyt/d_lyt_common_icon_item.cpp b/src/d/lyt/d_lyt_common_icon_item.cpp index 7ad3bb6e..9effaee8 100644 --- a/src/d/lyt/d_lyt_common_icon_item.cpp +++ b/src/d/lyt/d_lyt_common_icon_item.cpp @@ -165,12 +165,12 @@ void dLytCommonIconItemPart1_c::realizeBocoburin() { void dLytCommonIconItemPart1_c::realizeItem(u8 item) { // Inline? if (mAnm[ITEM_PART_1_ANIM_ICON].getEndFrameRaw() - 1.0f < item) { - field_0x28C = 0; + mItem = 0; } else { - field_0x28C = item; + mItem = item; } - mAnm[ITEM_PART_1_ANIM_ICON].setFrame(field_0x28C); + mAnm[ITEM_PART_1_ANIM_ICON].setFrame(mItem); mAnm[ITEM_PART_1_ANIM_ICON].setAnimEnable(true); mLyt.calc(); mAnm[ITEM_PART_1_ANIM_ICON].setAnimEnable(false);