d_a_obj_lv4CandleTag / d_a_obj_lv4EdShutter done, d_a_obj_picture almost (#2755)

3 files changed, 68 insertions, 41 deletions

diff --git a/include/d/actor/d_a_obj_lv4CandleTag.h b/include/d/actor/d_a_obj_lv4CandleTag.h
index cf7dca2895..b508f6ccc4 100644
--- a/include/d/actor/d_a_obj_lv4CandleTag.h
+++ b/include/d/actor/d_a_obj_lv4CandleTag.h
@@ -22,11 +22,11 @@ public:
         MODE_END,
     };
 
-    // dalv4CandleTag_c() : dEvLib_callback_c(this) {}
+    dalv4CandleTag_c() : dEvLib_callback_c(this) {}
     ~dalv4CandleTag_c() {}
 
     /* 80C5D4B8 */ void setBaseMtx();
-    /* 80C5D4F0 */ cPhs__Step create();
+    /* 80C5D4F0 */ int create();
     /* 80C5D5D4 */ int Execute();
     /* 80C5D618 */ void procMain();
     /* 80C5D6D4 */ void init_modeWatch();
@@ -58,14 +58,4 @@ public:
 
 STATIC_ASSERT(sizeof(dalv4CandleTag_c) == 0x58C);
 
-class dalv4CandleTag_HIO_c : public mDoHIO_entry_c {
-public:
-    /* 80C5D44C */ dalv4CandleTag_HIO_c();
-    /* 80C5D9C0 */ ~dalv4CandleTag_HIO_c() {}
-
-    void genMessage(JORMContext*);
-
-    u8 mTimer;
-};
-
 #endif /* D_A_OBJ_LV4CANDLETAG_H */
diff --git a/include/d/actor/d_a_obj_lv4EdShutter.h b/include/d/actor/d_a_obj_lv4EdShutter.h
index db2edc5bb4..715d35295d 100644
--- a/include/d/actor/d_a_obj_lv4EdShutter.h
+++ b/include/d/actor/d_a_obj_lv4EdShutter.h
@@ -2,6 +2,8 @@
 #define D_A_OBJ_LV4EDSHUTTER_H
 
 #include "f_op/f_op_actor_mng.h"
+#include "d/d_bg_s_movebg_actor.h"
+#include "d/d_event_lib.h"
 
 /**
  * @ingroup actors-objects
@@ -11,12 +13,12 @@
  * @details
  *
  */
-class daLv4EdShutter_c : public fopAc_ac_c {
+class daLv4EdShutter_c : public dBgS_MoveBgActor, public request_of_phase_process_class, public dEvLib_callback_c {
 public:
+    daLv4EdShutter_c() : dEvLib_callback_c(this) {}
+
     /* 80C5DE38 */ void setBaseMtx();
-    /* 80C5DEC8 */ void CreateHeap();
-    /* 80C5DF34 */ void create();
-    /* 80C5E0A4 */ void Execute(Mtx**);
+    /* 80C5DF34 */ int create();
     /* 80C5E0F4 */ void move();
     /* 80C5E1B0 */ void init_modeWait();
     /* 80C5E1C8 */ void modeWait();
@@ -26,26 +28,38 @@ public:
     /* 80C5E518 */ void modeClose();
     /* 80C5E584 */ void init_modeEnd();
     /* 80C5E590 */ void modeEnd();
-    /* 80C5E594 */ void eventStart();
-    /* 80C5E5CC */ void Draw();
-    /* 80C5E670 */ void Delete();
-    /* 80C5E834 */ ~daLv4EdShutter_c();
 
+    /* 80C5DEC8 */ virtual int CreateHeap();
+    /* 80C5E0A4 */ virtual int Execute(Mtx**);
+    /* 80C5E5CC */ virtual int Draw();
+    /* 80C5E670 */ virtual int Delete();
+
+    /* 80C5E834 */ virtual ~daLv4EdShutter_c() {}
+    /* 80C5E594 */ virtual bool eventStart();
+
+    u8 getCloseSw() { return fopAcM_GetParamBit(this, 0, 8); }
+    u8 getOpenSw() { return fopAcM_GetParamBit(this, 8, 8); }
+    u8 getWaitTime() { return fopAcM_GetParamBit(this, 16, 8); }
+    int getEventID() { return fopAcM_GetParamBit(this, 24, 8); }
+
+    u8 getZenmetuSw() { return shape_angle.z & 0xFF; }
     u8 getStatus() { return mStatus; }
 
 private:
-    /* 0x568 */ u8 field_0x568[0x5CA - 0x568];
+    /* 0x5B8 */ request_of_phase_process_class mPhase;
+    /* 0x5C0 */ J3DModel* mpModel;
+    /* 0x5C4 */ u8 mMode;
+    /* 0x5C6 */ u16 mWaitTimer;
+    /* 0x5C8 */ u8 mOpenSw;
+    /* 0x5C9 */ u8 mCloseSw;
     /* 0x5CA */ u8 mStatus;
-    /* 0x5CB */ u8 field_0x56B[0x5DC - 0x5CB];
+    /* 0x5CB */ u8 field_0x5cb;
+    /* 0x5CC */ u8 mZenmetuSw;
+    /* 0x5D0 */ f32 mMovePos;
+    /* 0x5D4 */ u8 field_0x5D4[0x5D8 - 0x5D4];
+    /* 0x5D8 */ f32 mMoveSpeed;
 };
 
 STATIC_ASSERT(sizeof(daLv4EdShutter_c) == 0x5dc);
 
-class daLv4EdShutter_HIO_c {
-public:
-    /* 80C5DDAC */ daLv4EdShutter_HIO_c();
-    /* 80C5E72C */ ~daLv4EdShutter_HIO_c();
-};
-
-
 #endif /* D_A_OBJ_LV4EDSHUTTER_H */
diff --git a/include/d/actor/d_a_obj_picture.h b/include/d/actor/d_a_obj_picture.h
index 0ce957c08b..7403821644 100644
--- a/include/d/actor/d_a_obj_picture.h
+++ b/include/d/actor/d_a_obj_picture.h
@@ -12,15 +12,15 @@
  * @details
  *
  */
-class daObjPicture_c : public fopAc_ac_c {
+class daObjPicture_c : public fopAc_ac_c, public request_of_phase_process_class {
 public:
     /* 80CAD318 */ daObjPicture_c();
-    /* 80CAD6C8 */ ~daObjPicture_c();
-    /* 80CAD908 */ void createHeap();
-    /* 80CADC18 */ void create();
-    /* 80CADFB0 */ void Delete();
-    /* 80CAE05C */ void draw();
-    /* 80CAE1B8 */ void execute();
+    /* 80CAD6C8 */ virtual ~daObjPicture_c();
+    /* 80CAD908 */ int createHeap();
+    /* 80CADC18 */ int create();
+    /* 80CADFB0 */ int Delete();
+    /* 80CAE05C */ int draw();
+    /* 80CAE1B8 */ int execute();
     /* 80CAE510 */ void init();
     /* 80CAE5B0 */ void setPicModelMtx();
     /* 80CAE638 */ void setTmgModelMtx();
@@ -29,15 +29,38 @@ public:
     /* 80CAE76C */ void setLinePos();
     /* 80CAE8E8 */ void moveLineFall1();
     /* 80CAEA60 */ void moveLineFall2();
-    /* 80CAED28 */ void chkHitRope();
-    /* 80CAEDDC */ void chkHitBombTg();
+    /* 80CAED28 */ bool chkHitRope();
+    /* 80CAEDDC */ bool chkHitBombTg();
     /* 80CAEE90 */ void setPicAtCol();
 
-    static u8 s_CcDCps[76];
-    static u8 s_CcDCyl_pic_at[68];
+    int getArg_0() { return fopAcM_GetParamBit(this, 0, 4); }
+    int getSW_0() { return fopAcM_GetParamBit(this, 4, 8); }
+
+    static dCcD_SrcCps s_CcDCps;
+    static dCcD_SrcCyl s_CcDCyl_pic_at;
 
 private:
-    /* 0x568 */ u8 field_0x568[0xda0 - 0x568];
+    /* 0x574 */ dCcD_Stts field_0x574;
+    /* 0x5B0 */ dCcD_Stts field_0x5b0;
+    /* 0x5EC */ dCcD_Stts field_0x5ec;
+    /* 0x628 */ dCcD_Cps mCps[2];
+    /* 0x8B0 */ dCcD_Cyl mAtCyl;
+    /* 0x9EC */ dCcD_Cps mCps2[2];
+    /* 0xC74 */ u8 field_0xC74[0xC7C - 0xC74];
+    /* 0xC7C */ cXyz mPicAtPos;
+    /* 0xC88 */ cXyz field_0xc88;
+    /* 0xC94 */ Vec field_0xc94;
+    /* 0xCA0 */ Vec field_0xca0;
+    /* 0xCAC */ mDoExt_3DlineMat1_c* mpRopeMat[2];
+    /* 0xCB4 */ J3DModel* mpPicModel;
+    /* 0xCB8 */ J3DModel* mpRopestModel;
+    /* 0xCBC */ dBgW* mpBgw[2];
+    /* 0xCC4 */ Mtx mBgMtx[2];
+    /* 0xD24 */ u8 field_0xd24;
+    /* 0xD25 */ u8 field_0xd25;
+    /* 0xD26 */ u8 field_0xd26;
+    /* 0xD27 */ u8 field_0xd27;
+    /* 0xD28 */ Vec field_0xd28[10];
 };
 
 STATIC_ASSERT(sizeof(daObjPicture_c) == 0xda0);