Merge branch 'master' into d_a_do

include/rel/d/a/d_a_spinner/d_a_spinner.h

@@ -43,7 +43,7 @@ public:
 
     void setMove(f32 speedF, s16 param_1) {
         fopAcM_SetParam(this, 1);
-        mSpeedF = speedF;
+        speedF = speedF;
         field_0xa7a = param_1;
         mCyl.OnAtSetBit();
     }

include/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.h

@@ -1,6 +1,28 @@
 #ifndef D_A_OBJ_CBOARD_H
 #define D_A_OBJ_CBOARD_H
 
-#include "dolphin/types.h"
+#include "d/bg/d_bg_s_movebg_actor.h"
+#include "d/com/d_com_inf_game.h"
+
+class daObjBoard_c : public dBgS_MoveBgActor {
+public:
+    /* 8057B958 */ void initBaseMtx();
+    /* 8057B978 */ void setBaseMtx();
+    /* 8057BA78 */ int create1st();
+
+    /* 8057BA70 */ virtual int CreateHeap();
+    /* 8057B9C8 */ virtual int Create();
+    /* 8057BB74 */ virtual int Execute(Mtx**);
+    /* 8057BCC0 */ virtual int Draw();
+    /* 8057BCC8 */ virtual int Delete();
+
+    u8 getNameArg() { return fopAcM_GetParamBit(this, 0, 4); }
+    u8 getArg0() { return fopAcM_GetParamBit(this, 4, 4); }
+    u8 getSwNo() { return fopAcM_GetParamBit(this, 8, 8); }
+
+private:
+    /* 0x5A0 */ request_of_phase_process_class mPhase;
+    /* 0x5A8 */ Mtx field_0x5a8;
+};  // Size: 0x5D8
 
 #endif /* D_A_OBJ_CBOARD_H */

include/rel/d/a/tag/d_a_tag_ajnot/d_a_tag_ajnot.h

@@ -1,6 +1,15 @@
 #ifndef D_A_TAG_AJNOT_H
 #define D_A_TAG_AJNOT_H
 
+#include "d/com/d_com_inf_game.h"
 #include "dolphin/types.h"
+#include "f_op/f_op_actor_mng.h"
+
+class daTagAJnot_c : public fopAc_ac_c {
+public:
+    /* 805A2658 */ int create();
+    /* 805A26C8 */ ~daTagAJnot_c();
+    /* 805A2744 */ int execute();
+};
 
 #endif /* D_A_TAG_AJNOT_H */

include/rel/d/a/tag/d_a_tag_guard/d_a_tag_guard.h

@@ -1,6 +1,19 @@
 #ifndef D_A_TAG_GUARD_H
 #define D_A_TAG_GUARD_H
 
-#include "dolphin/types.h"
+#include "f_op/f_op_actor_mng.h"
+#include "d/d_path.h"
+
+class daTagGuard_c : public fopAc_ac_c {
+public:
+    /* 80D597F8 */ int getAppearPoint(Vec*);
+    /* 80D5985C */ void createGuard(u32);
+
+    u8 getPathID() { return fopAcM_GetParam(this) >> 8; }
+    inline int create();
+    inline void create_init();
+
+    /* 0x568 */ dPath* mPath;
+};  // Size: 0x56C
 
 #endif /* D_A_TAG_GUARD_H */