d_a_obj_vmc match

fixes #448
zeldaret · Sep 2, 2024 · 00eb28e · 00eb28e
1 parent ca6919c
commit 00eb28e
Show file tree

Hide file tree

Showing 4 changed files with 306 additions and 34 deletions.
diff --git a/configure.py b/configure.py
@@ -1626,7 +1626,7 @@ def JSystemLib(lib_name, objects):
     ActorRel(NonMatching, "d_a_obj_usovmc"),
     ActorRel(Matching,    "d_a_obj_vfan", extra_cflags=[ '-pragma "nosyminline on"']),
     ActorRel(NonMatching, "d_a_obj_vgnfd"),
-    ActorRel(NonMatching, "d_a_obj_vmc"),
+    ActorRel(Matching,    "d_a_obj_vmc", extra_cflags=["-sym off"]),
     ActorRel(Matching,    "d_a_obj_vmsdz"),
     ActorRel(Matching,    "d_a_obj_vmsms"),
     ActorRel(NonMatching, "d_a_obj_volcano"),

diff --git a/include/d/actor/d_a_obj_vmc.h b/include/d/actor/d_a_obj_vmc.h
@@ -2,29 +2,61 @@
 #define D_A_OBJ_VMC_H
 
 #include "f_op/f_op_actor.h"
+#include "d/d_a_obj.h"
+#include "d/d_cc_d.h"
+#include "d/d_particle.h"
+#include "SSystem/SComponent/c_phase.h"
+#include "m_Do/m_Do_ext.h"
+
+class dBgW;
 
 namespace daObjVmc {
     class Act_c : public fopAc_ac_c {
     public:
+        enum Prm_e {
+            PRM_SWSAVE_W = 8,
+            PRM_SWSAVE_S = 8,
+        };
+
         void daObjVmc_ChangeGrow() {}
-        void prm_get_swSave() const {}
+        s32 prm_get_swSave() const { return daObj::PrmAbstract(this, PRM_SWSAVE_W, PRM_SWSAVE_S); }
 
-        void solidHeapCB(fopAc_ac_c*);
-        void create_heap();
+        static BOOL solidHeapCB(fopAc_ac_c*);
+        bool create_heap();
         void CreateInit();
         s32 _create();
-        BOOL _delete();
+        bool _delete();
         void set_mtx();
         void init_mtx();
         void daObjVmc_base_main();
         void daObjVmc_tree_demo_wait();
         void daObjVmc_tree_demo_main();
         void daObjVmc_tree_main();
-        BOOL _execute();
-        BOOL _draw();
-
+        bool _execute();
+        bool _draw();
+
+    public:
+        static const char M_arcname[];
+
     public:
-        /* Place member variables here */
+        /* 0x290 */ request_of_phase_process_class mPhs;
+        /* 0x298 */ dBgW* mpBgBase;
+        /* 0x29A */ dBgW* mpBgTree;
+        /* 0x2A0 */ J3DModel* mModelBase;
+        /* 0x2A4 */ J3DModel* mModelTree;
+        /* 0x2A8 */ mDoExt_bckAnm mBckAnmGrow;
+        /* 0x2B8 */ mDoExt_bckAnm mBckAnmHookshot;
+        /* 0x2C8 */ dCcD_Stts mStts;
+        /* 0x304 */ dCcD_Cyl mCyl;
+        /* 0x434 */ Mtx mMtxBase;
+        /* 0x434 */ Mtx mMtxTree;
+        /* 0x494 */ dPa_smokeEcallBack mSmoke;
+        /* 0x4B4 */ u8 mLinkRangeCheck;
+        /* 0x4B8 */ s32 mState;
+        /* 0x4BC */ s32 mTimer;
+        /* 0x4C0 */ u8 mHookshotAnim;
+        /* 0x4C1 */ u8 mHasTreeBg;
+        /* 0x4C2 */ u8 mHasTree;
     };
 };
 

diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h
@@ -82,6 +82,7 @@ enum fopAc_AttentionFlag_e {
     fopAc_Attn_TALKFLAG_NOTALK_e    = 0x02000000,
     fopAc_Attn_ENEMYFLAG_NOLOCKON_e = 0x04000000,
     fopAc_Attn_TALKFLAG_LOOK_e      = 0x08000000,
+    fopAc_Attn_UNK10000000_e        = 0x10000000,
     fopAc_Attn_TALKFLAG_CHECK_e     = 0x20000000,
     fopAc_Attn_TALKFLAG_READ_e      = 0x40000000,
 };