summaryrefslogtreecommitdiff
path: root/include/d/lyt/meter
diff options
context:
space:
mode:
authorrobojumper <robojumper@gmail.com>2025-04-16 20:45:35 +0200
committerrobojumper <robojumper@gmail.com>2025-04-21 21:51:03 +0200
commit2d4c0f046847397c1e77fe871082dc4ab2294b7e (patch)
tree5ff335656f2520c6503ef9a10ea579b3a532c275 /include/d/lyt/meter
parent568268a9a8e95c1cf9e1fafcc865302479d0b682 (diff)
d_lyt_meter_key OK
Diffstat (limited to 'include/d/lyt/meter')
-rw-r--r--include/d/lyt/meter/d_lyt_meter_key.h26
1 files changed, 22 insertions, 4 deletions
diff --git a/include/d/lyt/meter/d_lyt_meter_key.h b/include/d/lyt/meter/d_lyt_meter_key.h
index a717ddd3..57a5c05a 100644
--- a/include/d/lyt/meter/d_lyt_meter_key.h
+++ b/include/d/lyt/meter/d_lyt_meter_key.h
@@ -1,6 +1,7 @@
#ifndef D_LYT_METER_KEY_H
#define D_LYT_METER_KEY_H
+#include "common.h"
#include "d/lyt/d2d.h"
#include "m/m_vec.h"
#include "nw4r/lyt/lyt_pane.h"
@@ -49,8 +50,11 @@ public:
bool build(d2d::ResAccIf_c *);
bool remove();
+ bool execute();
bool draw();
+ void setPosition(s32 position);
+
private:
STATE_FUNC_DECLARE(dLytMeterBossKey_c, Wait);
STATE_FUNC_DECLARE(dLytMeterBossKey_c, On);
@@ -60,8 +64,13 @@ private:
/* 0x004 */ UI_STATE_MGR_DECLARE(dLytMeterBossKey_c);
/* 0x040 */ d2d::dLytSub mLyt;
/* 0x0D4 */ d2d::AnmGroup_c mAnm[5];
- /* 0x214 */ u32 field_0x2D0;
- /* 0x218 */ mVec3_c mVecs[4];
+ /* 0x214 */ nw4r::lyt::Pane *mpPane;
+ /* 0x218 */ mVec3_c mPanePositions[4];
+ /* 0x248 */ mVec3_c mPosition;
+ /* 0x254 */ s32 mPosititionIndex;
+ /* 0x258 */ s32 mOldPosititionIndex;
+ /* 0x25C */ s32 mMovementFrame;
+ /* 0x260 */ u8 mShouldBeVisible;
};
class dLytMeterSmallKey_c {
@@ -74,8 +83,11 @@ public:
bool build(d2d::ResAccIf_c *);
bool remove();
+ bool execute();
bool draw();
+ void setPosition(s32 position);
+
private:
STATE_FUNC_DECLARE(dLytMeterSmallKey_c, Wait);
STATE_FUNC_DECLARE(dLytMeterSmallKey_c, On);
@@ -85,8 +97,14 @@ private:
/* 0x004 */ UI_STATE_MGR_DECLARE(dLytMeterSmallKey_c);
/* 0x040 */ d2d::dLytSub mLyt;
/* 0x0D4 */ d2d::AnmGroup_c mAnm[5];
- /* 0x214 */ u32 field_0x2D0;
- /* 0x218 */ mVec3_c mVecs[4];
+ /* 0x214 */ nw4r::lyt::Pane *mpPane;
+ /* 0x218 */ mVec3_c mPanePositions[4];
+ /* 0x248 */ mVec3_c mPosition;
+ /* 0x254 */ s32 mSavedSmallKeyCount;
+ /* 0x258 */ s32 mPosititionIndex;
+ /* 0x25C */ s32 mOldPosititionIndex;
+ /* 0x260 */ s32 mMovementFrame;
+ /* 0x264 */ u8 mShouldBeVisible;
};
#endif