diff options
| author | robojumper <robojumper@gmail.com> | 2025-04-16 20:45:35 +0200 |
|---|---|---|
| committer | robojumper <robojumper@gmail.com> | 2025-04-21 21:51:03 +0200 |
| commit | 2d4c0f046847397c1e77fe871082dc4ab2294b7e (patch) | |
| tree | 5ff335656f2520c6503ef9a10ea579b3a532c275 /include | |
| parent | 568268a9a8e95c1cf9e1fafcc865302479d0b682 (diff) | |
d_lyt_meter_key OK
Diffstat (limited to 'include')
| -rw-r--r-- | include/d/a/d_a_item.h | 3 | ||||
| -rw-r--r-- | include/d/d_bzs_types.h | 2 | ||||
| -rw-r--r-- | include/d/d_stage_mgr.h | 1 | ||||
| -rw-r--r-- | include/d/lyt/meter/d_lyt_meter_key.h | 26 |
4 files changed, 26 insertions, 6 deletions
diff --git a/include/d/a/d_a_item.h b/include/d/a/d_a_item.h index 45a546b9..b5e28d15 100644 --- a/include/d/a/d_a_item.h +++ b/include/d/a/d_a_item.h @@ -59,7 +59,8 @@ public: static s32 getTotalSeedCapacity(); static s32 getTotalArrowCapacity(); - static bool getKeyPieceCount(); + static u32 getKeyPieceCount(); + static u32 getSmallKeyCount(); static bool isRupee(ITEM_ID item); static bool isKeyPiece(ITEM_ID item); diff --git a/include/d/d_bzs_types.h b/include/d/d_bzs_types.h index bf0a06f5..cf5264b4 100644 --- a/include/d/d_bzs_types.h +++ b/include/d/d_bzs_types.h @@ -189,7 +189,7 @@ struct STIF { /* 0x0F */ u8 field_0x0F; /* 0x10 */ u8 field_0x10; /* 0x11 */ u8 field_0x11; - /* 0x12 */ u8 mapNameId; + /* 0x12 */ s8 mapNameId; /* 0x13 */ u8 field_0x13; }; diff --git a/include/d/d_stage_mgr.h b/include/d/d_stage_mgr.h index 523d180f..d4a3a805 100644 --- a/include/d/d_stage_mgr.h +++ b/include/d/d_stage_mgr.h @@ -54,6 +54,7 @@ public: s32 getSTIFunk1() const; s32 getAreaType() const; + s32 getMapNameId() const; static dStageMgr_c *GetInstance() { return sInstance; 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 |