Merge remote-tracking branch 'origin/work6'

3 files changed, 39 insertions, 3 deletions

diff --git a/include/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.h b/include/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.h
index 17258c6e2c..74c53c4433 100644
--- a/include/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.h
+++ b/include/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.h
@@ -1,6 +1,22 @@
 #ifndef D_A_OBJ_COWDOOR_H
 #define D_A_OBJ_COWDOOR_H
 
-#include "dolphin/types.h"
+#include "d/bg/d_bg_s_movebg_actor.h"
+#include "d/com/d_com_inf_game.h"
+#include "f_op/f_op_actor_mng.h"
+
+class daCowdoor_c : public dBgS_MoveBgActor {
+public:
+    /* 80BCC7F8 */ void setBaseMtx();
+    /* 80BCC86C */ int Create();
+    /* 80BCC8C4 */ int CreateHeap();
+    /* 80BCC93C */ int create();
+    /* 80BCCA1C */ int Execute(f32 (**)[3][4]);
+    /* 80BCCA48 */ int Draw();
+    /* 80BCCAEC */ int Delete();
+
+    /* 0x5A0 */ request_of_phase_process_class field_0x5a0;
+    /* 0x5A8 */ J3DModel* field_0x5a8;
+};  // Size: 0x5AC
 
 #endif /* D_A_OBJ_COWDOOR_H */
diff --git a/include/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.h b/include/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.h
index 4e6743d6f5..9f0dda433d 100644
--- a/include/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.h
+++ b/include/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.h
@@ -26,7 +26,6 @@ public:
     /* 80D5B2EC */ daLv6CstaSw_HIO_c();
     /* 80D5B740 */ virtual ~daLv6CstaSw_HIO_c();
 
-    /* 0x04 */ s8 field_0x4;
 };
 
 #endif /* D_A_TAG_LV6CSTASW_H */
diff --git a/include/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.h b/include/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.h
index e49a792d69..3c5cc4451f 100644
--- a/include/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.h
+++ b/include/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.h
@@ -1,6 +1,27 @@
 #ifndef D_A_TAG_POFIRE_H
 #define D_A_TAG_POFIRE_H
 
-#include "dolphin/types.h"
+#include "d/com/d_com_inf_game.h"
+#include "f_op/f_op_actor_mng.h"
+#include "m_Do/m_Do_hostIO.h"
+
+class daTagPoFire_c : public fopAc_ac_c {
+public:
+    /* 80D5DB38 */ void setBaseMtx();
+    /* 80D5DB90 */ int create();
+    /* 80D5DBF0 */ int Execute();
+    /* 80D5DC20 */ int Draw();
+    /* 80D5DC28 */ int Delete();
+
+    /* 0x568 */ u8 field_0x568;
+    /* 0x569 */ u8 field_0x569;
+    /* 0x56B */ u16 field_0x56b;
+};
+
+class daTagPoFire_HIO_c : public mDoHIO_entry_c {
+public:
+    /* 80D5DACC */ daTagPoFire_HIO_c();
+    /* 80D5DCB0 */ virtual ~daTagPoFire_HIO_c();
+};
 
 #endif /* D_A_TAG_POFIRE_H */