diff options
| author | CovenEsme <84377742+CovenEsme@users.noreply.github.com> | 2025-03-14 02:48:47 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-13 22:48:47 -0400 |
| commit | b3b140ff7fa8990bc894f32a17e7e45683a5ef7e (patch) | |
| tree | f755ddbf871176d723d9bfab773b2ffc4f3e073d /include/d/a | |
| parent | d10e2680174d30c3f43fc8eb6df2fd9cc972c9f5 (diff) | |
Shrine OK (#137)
* d_a_obj_shrine_after ok
* d_a_obj_shrine_before ok
* d_a_obj_shrine_bef_inside ok
* Add offset comments
Diffstat (limited to 'include/d/a')
| -rw-r--r-- | include/d/a/obj/d_a_obj_fence_boko.h | 8 | ||||
| -rw-r--r-- | include/d/a/obj/d_a_obj_fence_boko2.h | 6 | ||||
| -rw-r--r-- | include/d/a/obj/d_a_obj_fence_konsai.h | 6 | ||||
| -rw-r--r-- | include/d/a/obj/d_a_obj_iron_stage.h | 6 | ||||
| -rw-r--r-- | include/d/a/obj/d_a_obj_shrine_after.h | 8 | ||||
| -rw-r--r-- | include/d/a/obj/d_a_obj_shrine_bef_inside.h | 10 | ||||
| -rw-r--r-- | include/d/a/obj/d_a_obj_shrine_before.h | 8 |
7 files changed, 39 insertions, 13 deletions
diff --git a/include/d/a/obj/d_a_obj_fence_boko.h b/include/d/a/obj/d_a_obj_fence_boko.h index d6297ce0..9bc69e21 100644 --- a/include/d/a/obj/d_a_obj_fence_boko.h +++ b/include/d/a/obj/d_a_obj_fence_boko.h @@ -14,10 +14,10 @@ public: virtual ~dAcOfenceBoko_c() {} virtual int actorExecute() override; - nw4r::g3d::ResFile mResFile; - m3d::smdl_c mModel; - dBgW mCollision; - bool field_0x560; + /* 0x330 */ nw4r::g3d::ResFile mResFile; + /* 0x334 */ m3d::smdl_c mModel; + /* 0x350 */ dBgW mCollision; + /* 0x560 */ bool field_0x560; private: }; diff --git a/include/d/a/obj/d_a_obj_fence_boko2.h b/include/d/a/obj/d_a_obj_fence_boko2.h index 8108c2c0..f270c1b9 100644 --- a/include/d/a/obj/d_a_obj_fence_boko2.h +++ b/include/d/a/obj/d_a_obj_fence_boko2.h @@ -14,9 +14,9 @@ public: virtual ~dAcOfenceBoko2_c() {} virtual int actorExecute() override; - nw4r::g3d::ResFile mResFile; - m3d::smdl_c mModel; - dBgW mCollision; + /* 0x330 */ nw4r::g3d::ResFile mResFile; + /* 0x334 */ m3d::smdl_c mModel; + /* 0x350 */ dBgW mCollision; private: }; diff --git a/include/d/a/obj/d_a_obj_fence_konsai.h b/include/d/a/obj/d_a_obj_fence_konsai.h index 74cd5c06..a72fc500 100644 --- a/include/d/a/obj/d_a_obj_fence_konsai.h +++ b/include/d/a/obj/d_a_obj_fence_konsai.h @@ -14,9 +14,9 @@ public: virtual ~dAcOfenceKonsai_c() {} virtual int actorExecute() override; - nw4r::g3d::ResFile mResFile; - m3d::smdl_c mModel; - dBgW mCollision; + /* 0x330 */ nw4r::g3d::ResFile mResFile; + /* 0x334 */ m3d::smdl_c mModel; + /* 0x350 */ dBgW mCollision; private: }; diff --git a/include/d/a/obj/d_a_obj_iron_stage.h b/include/d/a/obj/d_a_obj_iron_stage.h index 935ca30a..a27a5758 100644 --- a/include/d/a/obj/d_a_obj_iron_stage.h +++ b/include/d/a/obj/d_a_obj_iron_stage.h @@ -16,9 +16,9 @@ public: virtual ~dAcOironStage_c() {} virtual int actorExecute() override; - nw4r::g3d::ResFile mResFile; - m3d::smdl_c mModel; - dBgW mCollision; + /* 0x330 */ nw4r::g3d::ResFile mResFile; + /* 0x334 */ m3d::smdl_c mModel; + /* 0x350 */ dBgW mCollision; private: }; diff --git a/include/d/a/obj/d_a_obj_shrine_after.h b/include/d/a/obj/d_a_obj_shrine_after.h index ccc6aad5..3b20746e 100644 --- a/include/d/a/obj/d_a_obj_shrine_after.h +++ b/include/d/a/obj/d_a_obj_shrine_after.h @@ -6,7 +6,15 @@ class dAcOshrineAfter_c : public dAcObjBase_c { public: dAcOshrineAfter_c() {} + virtual int create() override; + virtual int doDelete() override; + virtual int draw() override; + virtual bool createHeap() override; virtual ~dAcOshrineAfter_c() {} + virtual int actorExecute() override; + + /* 0x330 */ nw4r::g3d::ResFile mResFile; + /* 0x334 */ m3d::smdl_c mModel; private: }; diff --git a/include/d/a/obj/d_a_obj_shrine_bef_inside.h b/include/d/a/obj/d_a_obj_shrine_bef_inside.h index 937d6c5e..c6d9f64c 100644 --- a/include/d/a/obj/d_a_obj_shrine_bef_inside.h +++ b/include/d/a/obj/d_a_obj_shrine_bef_inside.h @@ -2,11 +2,21 @@ #define D_A_OBJ_SHRINE_BEF_INSIDE_H #include "d/a/obj/d_a_obj_base.h" +#include "d/col/bg/d_bg_w.h" class dAcOshrineBefInside_c : public dAcObjBase_c { public: dAcOshrineBefInside_c() {} + virtual int create() override; + virtual int doDelete() override; + virtual int draw() override; + virtual bool createHeap() override; virtual ~dAcOshrineBefInside_c() {} + virtual int actorExecute() override; + + /* 0x330 */ nw4r::g3d::ResFile mResFile; + /* 0x334 */ m3d::smdl_c mModel[2]; + /* 0x36C */ dBgW mCollision; private: }; diff --git a/include/d/a/obj/d_a_obj_shrine_before.h b/include/d/a/obj/d_a_obj_shrine_before.h index 96c8d257..6930e772 100644 --- a/include/d/a/obj/d_a_obj_shrine_before.h +++ b/include/d/a/obj/d_a_obj_shrine_before.h @@ -6,7 +6,15 @@ class dAcOshrineBefore_c : public dAcObjBase_c { public: dAcOshrineBefore_c() {} + virtual int create() override; + virtual int doDelete() override; + virtual int draw() override; + virtual bool createHeap() override; virtual ~dAcOshrineBefore_c() {} + virtual int actorExecute() override; + + /* 0x330 */ nw4r::g3d::ResFile mResFile; + /* 0x334 */ m3d::smdl_c mModel; private: }; |
