diff options
| author | elijah-thomas774 <elijahthomas774@gmail.com> | 2026-10-19 22:51:09 -0400 |
|---|---|---|
| committer | elijah-thomas774 <elijahthomas774@gmail.com> | 2026-10-19 22:51:09 -0400 |
| commit | 484bae876d0832fcecd5b0eea2cea0bc49264690 (patch) | |
| tree | 2cc5655714abe8049e7888289763c49db5150460 /include | |
| parent | d6e5efbbe5d12f481b35cb09ad0515d9f0c22a14 (diff) | |
| parent | fcb030b4813c35d530ffa3d8f6e6a7fcb3788a89 (diff) | |
Merge remote-tracking branch 'upstream/HEAD' into bases
Diffstat (limited to 'include')
| -rw-r--r-- | include/d/a/obj/d_a_obj_D3_dummy.h | 28 | ||||
| -rw-r--r-- | include/d/col/bg/d_bg_w_base.h | 2 |
2 files changed, 22 insertions, 8 deletions
diff --git a/include/d/a/obj/d_a_obj_D3_dummy.h b/include/d/a/obj/d_a_obj_D3_dummy.h index 48892644..ceeae272 100644 --- a/include/d/a/obj/d_a_obj_D3_dummy.h +++ b/include/d/a/obj/d_a_obj_D3_dummy.h @@ -3,6 +3,7 @@ #include "d/a/obj/d_a_obj_base.h" #include "d/col/bg/d_bg_w.h" +#include "m/m_mtx.h" #include "s/s_State.hpp" class dAcOD3Dummy_c : public dAcObjBase_c { @@ -10,19 +11,32 @@ public: dAcOD3Dummy_c() : mStateMgr(*this) {} virtual ~dAcOD3Dummy_c() {} + virtual int create() override; + virtual int doDelete() override; + virtual bool createHeap() override; + virtual int draw() override; + virtual int actorExecute() override; + STATE_FUNC_DECLARE(dAcOD3Dummy_c, Wait); - void setField_0x1570(u8 val) { - field_0x1570 = val; + void setUpdateTilePositionsSignal(u8 val) { + mUpdateTilePositions = val; } + s32 getCurrentSkyKeepRoomTileId(); + void updateTileMtx(); + void registerBgs(); + // code is in the dol + s32 getSpotForTile(s32); + private: - /* 0x0330 */ dBgW field_330[8]; - /* 0x13B0 */ u8 unk[0x180]; + /* 0x0330 */ dBgW mTileBgWs[8]; + /* 0x13B0 */ mMtx_c mTileMtx[8]; /* 0x1530 */ STATE_MGR_DECLARE(dAcOD3Dummy_c); - /* 0x156C */ u8 field_0x156C[4]; - /* 0x1570 */ u8 field_0x1570; - /* 0x1571 */ u8 field_0x1571[0xB]; + /* 0x156C */ s32 mCurrentRoomTileId; + /* 0x1570 */ bool mUpdateTilePositions; + /* 0x1574 */ void *mIconData; + /* 0x1578 */ bool mHasBgsRegistered; }; #endif diff --git a/include/d/col/bg/d_bg_w_base.h b/include/d/col/bg/d_bg_w_base.h index b1531119..fdc40a97 100644 --- a/include/d/col/bg/d_bg_w_base.h +++ b/include/d/col/bg/d_bg_w_base.h @@ -66,7 +66,7 @@ public: void RegistBg(int id); void UnRegistBg(); bool ChkReady() const; - void Set0x2F(u8); + void Set0x2F(s32); /* vt at 0x08 */ /* 0x008 */ virtual ~dBgW_Base(); |