Merge remote-tracking branch 'origin/work6'

6 files changed, 42 insertions, 4 deletions

diff --git a/include/d/bg/d_bg_s.h b/include/d/bg/d_bg_s.h
index 0335ebe8d7..9e8ca34a97 100644
--- a/include/d/bg/d_bg_s.h
+++ b/include/d/bg/d_bg_s.h
@@ -111,6 +111,8 @@ bool dBgS_CheckBGroundPoly(cBgS_PolyInfo const&);
 bool dBgS_CheckBWallPoly(cBgS_PolyInfo const&);
 void dBgS_MoveBGProc_Typical(dBgW* param_0, void* param_1, cBgS_PolyInfo const& param_2,
                              bool param_3, cXyz* param_4, csXyz* param_5, csXyz* param_6);
+void dBgS_MoveBGProc_TypicalRotY(dBgW* param_0, void* param_1, cBgS_PolyInfo const& param_2,
+                             bool param_3, cXyz* param_4, csXyz* param_5, csXyz* param_6);
 f32 dBgS_GetNY(cBgS_PolyInfo const& poly);
 
 #endif /* D_BG_D_BG_S_H */
diff --git a/include/d/d_gameover.h b/include/d/d_gameover.h
index 3e2c20b081..c3935e8159 100644
--- a/include/d/d_gameover.h
+++ b/include/d/d_gameover.h
@@ -12,7 +12,6 @@ public:
     /* 8019AFE0 */ dGov_HIO_c();
     /* 8019C06C */ virtual ~dGov_HIO_c();
 
-    /* 0x04 */ s8 field_0x4;
     /* 0x08 */ f32 mScale;
     /* 0x0C */ f32 mAlpha;
     /* 0x10 */ f32 mAnimSpeed;
diff --git a/include/m_Do/m_Do_hostIO.h b/include/m_Do/m_Do_hostIO.h
index a6f72935e0..abf715f55d 100644
--- a/include/m_Do/m_Do_hostIO.h
+++ b/include/m_Do/m_Do_hostIO.h
@@ -6,6 +6,7 @@
 class mDoHIO_entry_c {
 public:
     virtual ~mDoHIO_entry_c() {}
+    u8 unk_0x4;
 };
 
 #endif /* M_DO_M_DO_HOSTIO_H */
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 */