d_a_obj_mtest 100%, no match

2 files changed, 91 insertions, 19 deletions

diff --git a/include/SSystem/SComponent/c_bg_w.h b/include/SSystem/SComponent/c_bg_w.h
index 5436a214..fff910c2 100644
--- a/include/SSystem/SComponent/c_bg_w.h
+++ b/include/SSystem/SComponent/c_bg_w.h
@@ -121,6 +121,10 @@ public:
         LOCK_e = 0x80,
     };
 
+    enum PRIORITY {
+        
+    };
+
     cBgW();
 
     void FreeArea();
@@ -154,22 +158,50 @@ public:
     void GetTriPnt(int, cXyz*, cXyz*, cXyz*) const;
     void GetTopUnder(f32*, f32*) const;
 
-    s32 GetGrpInf(s32 grp_id) {
+    s32 GetGrpInf(int grp_id) const {
         JUT_ASSERT(0x2e1, 0 <= grp_id && grp_id < pm_bgd->m_g_num);
         return pm_bgd->m_g_tbl[grp_id].m_info;
     }
 
-    s32 GetTriGrp(s32 poly_index) {
+    s32 GetTriGrp(int poly_index) const {
         JUT_ASSERT(0x2a2, 0 <= poly_index && poly_index < pm_bgd->m_t_num);
         return pm_bgd->m_t_tbl[poly_index].grp;
     }
 
-    cM3dGPla * GetTriPla(s32 poly_index) {
+    cM3dGPla * GetTriPla(int poly_index) {
         JUT_ASSERT(0x2af, 0 <= poly_index && poly_index < pm_bgd->m_t_num);
         return &pm_tri[poly_index].m_plane;
     }
 
-    void SetPriority(u8 priority) { mWallCorrectPriority = priority; }
+    void SetPriority(PRIORITY priority) { mWallCorrectPriority = priority; }
+    void SetLock() { mFlags |= 0x80; }
+
+    void ChkFlush() {}
+    void ChkGroundRegist() {}
+    void ChkLock() {}
+    void ChkMoveBg() {}
+    void ChkNoCalcVtx() {}
+    void ChkPriority(int) {}
+    void ChkRoofRegist() {}
+    void ChkThrough() {}
+    void ChkWallRegist() {}
+    void ClrNoCalcVtx() {}
+    void GetBaseMtxP() {}
+    void GetOldInvMtx(float(*)[4]) const {}
+    void GetPolyInf0(int) const {}
+    void GetPolyInf1(int) const {}
+    void GetPolyInf2(int) const {}
+    void GetPolyInf3(int) const {}
+    void GetPolyInfId(int) const {}
+    void GetVtxNum() const {}
+    void GetVtxTbl() const {}
+    void GroundCross(cBgS_GndChk*) {}
+    void LineCheck(cBgS_LinChk*) {}
+    void OffRoofRegist() {}
+    void SetBaseMtxP(float(*)[3][4]) {}
+    void SetNoCalcVtx() {}
+    void SetVtxTbl(Vec*) {}
+    void ShdwDraw(cBgS_ShdwDraw*) {}
 
     virtual ~cBgW();
     virtual u32 GetGrpToRoomIndex(int) const;
diff --git a/include/d/actor/d_a_obj_mtest.h b/include/d/actor/d_a_obj_mtest.h
index 3e624092..225af779 100644
--- a/include/d/actor/d_a_obj_mtest.h
+++ b/include/d/actor/d_a_obj_mtest.h
@@ -2,28 +2,68 @@
 #define D_A_OBJ_MTEST_H
 
 #include "f_op/f_op_actor.h"
+#include "d/d_bg_s_movebg_actor.h"
+#include "d/d_cc_d.h"
+#include "d/d_a_obj.h"
 
 namespace daObjMtest {
-    class Act_c : public fopAc_ac_c {
+    class Act_c : public dBgS_MoveBgActor {
     public:
-        void prm_get_arg0() const {}
-        void prm_get_arg1() const {}
-        void prm_get_swSave() const {}
-        void prm_get_type() const {}
-    
-        void chk_appear();
-        void CreateHeap();
-        s32 Create();
-        void Mthd_Create();
-        BOOL Delete();
-        void Mthd_Delete();
+        enum Type {
+            Type_0 = 0,
+            Type_1 = 1,
+            Type_2 = 2,
+            Type_3 = 3,
+            Type_4 = 4,
+            Type_5 = 5,
+            Type_6 = 6,
+            Type_7 = 7,
+            Type_Max,
+        };
+        
+        enum Prm_e {
+            PRM_ARG0_W = 0x04,
+            PRM_ARG0_S = 0x10,
+            
+            PRM_ARG1_W = 0x04,
+            PRM_ARG1_S = 0x18,
+            
+            PRM_SWSAVE_W = 0x08,
+            PRM_SWSAVE_S = 0x08,
+            
+            PRM_TYPE_W = 0x03,
+            PRM_TYPE_S = 0x00,
+        };
+        
+        s32 prm_get_arg0() const { return daObj::PrmAbstract(this, PRM_ARG0_W, PRM_ARG0_S); }
+        s32 prm_get_arg1() const { return daObj::PrmAbstract(this, PRM_ARG1_W, PRM_ARG1_S); }
+        s32 prm_get_swSave() const { return daObj::PrmAbstract(this, PRM_SWSAVE_W, PRM_SWSAVE_S); }
+        s32 prm_get_type() const { return daObj::PrmAbstract(this, PRM_TYPE_W, PRM_TYPE_S); }
+        
+        static char* M_arcname[];
+        static const dCcD_SrcCyl M_cyl_src;
+        static cXyz M_scl_mult[];
+        
+        virtual BOOL CreateHeap();
+        virtual BOOL Create();
+        virtual BOOL Delete();
+        virtual BOOL Execute(Mtx** pMtx);
+        virtual BOOL Draw();
+        
+        bool chk_appear();
+        s32 Mthd_Create();
+        BOOL Mthd_Delete();
         void set_mtx();
         void init_mtx();
-        void Execute(float(**)[3][4]);
-        BOOL Draw();
     
     public:
-        /* Place member variables here */
+        /* 0x2C8 */ Mtx mMtx;
+        /* 0x2F8 */ request_of_phase_process_class mPhs;
+        /* 0x300 */ J3DModel* mpModel;
+        /* 0x304 */ dCcD_Stts mStts;
+        /* 0x340 */ dCcD_Cyl mCyl;
+        /* 0x470 */ int M_type;
+        /* 0x474 */ bool mbAppear;
     };
 };