copy dolsdk2004 to tp / b_bh + e_mb done (#2299)

* move dolsdk2004 over

* cleanup some temp work

* finish and cleanup gf

* b_bh done

* d_a_e_mb done

12 files changed, 169 insertions, 26 deletions

diff --git a/include/d/actor/d_a_b_bh.h b/include/d/actor/d_a_b_bh.h
index 9d4d67b5b3..969e3f2b29 100644
--- a/include/d/actor/d_a_b_bh.h
+++ b/include/d/actor/d_a_b_bh.h
@@ -1,26 +1,113 @@
 #ifndef D_A_B_BH_H
 #define D_A_B_BH_H
+
 #include "f_op/f_op_actor_mng.h"
+#include "JSystem/JHostIO/JORMContext.h"
+#include "d/d_cc_d.h"
+#include "d/d_cc_uty.h"
+#include "d/d_bg_s_acch.h"
 
 /**
  * @ingroup actors-enemies
  * @class b_bh_class
- * @brief Big Baba
+ * @brief Diababa - Baba Hand
  *
  * @details Forest Temple enemy.
  *
  */
 class b_bh_class : public fopEn_enemy_c {
-private:
-    /* 0x5AC */ u8 field_0x568[0xf4c - 0x5AC];
+public:
+    /* 0x5AC */ request_of_phase_process_class mPhase;
+    /* 0x5B4 */ u8 mID;
+    /* 0x5B5 */ u8 field_0x5b5;
+    /* 0x5B6 */ u8 field_0x5b6;
+    /* 0x5B7 */ u8 field_0x5b7;
+    /* 0x5B8 */ mDoExt_McaMorfSO* mpModelMorf;
+    /* 0x5BC */ Z2CreatureEnemy mSound;
+    /* 0x660 */ int mAnm;
+    /* 0x664 */ u8 field_0x664[0x668 - 0x664];
+    /* 0x668 */ s16 field_0x668;
+    /* 0x66A */ s16 mAction;
+    /* 0x66C */ s16 mMode;
+    /* 0x66E */ u8 field_0x66E[0x674 - 0x66E];
+    /* 0x674 */ cXyz field_0x674;
+    /* 0x680 */ u8 field_0x680[0x684 - 0x680];
+    /* 0x684 */ s16 field_0x684;
+    /* 0x686 */ s16 field_0x686;
+    /* 0x688 */ f32 field_0x688;
+    /* 0x68C */ f32 field_0x68c;
+    /* 0x690 */ f32 field_0x690;
+    /* 0x694 */ s16 mTimers[5];
+    /* 0x69E */ s16 field_0x69e;
+    /* 0x6A0 */ s8 field_0x6a0;
+    /* 0x6A4 */ cXyz mBasePos;
+    /* 0x6B0 */ cXyz field_0x6b0;
+    /* 0x6BC */ cXyz field_0x6bc[18];
+    /* 0x794 */ csXyz field_0x794[18];
+    /* 0x800 */ J3DModel* mpStemModels[17];
+    /* 0x844 */ u8 field_0x844[0x88C - 0x844];
+    /* 0x88C */ f32 field_0x88c[17];
+    /* 0x8D0 */ u8 field_0x8D0[0x8D4 - 0x8D0];
+    /* 0x8D4 */ s16 field_0x8d4[17];
+    /* 0x8F6 */ u8 field_0x8f6[0x8F8 - 0x8F6];
+    /* 0x8F8 */ s16 field_0x8f8;
+    /* 0x8FC */ f32 field_0x8fc;
+    /* 0x900 */ s16 field_0x900[3];
+    /* 0x906 */ s8 field_0x906[3];
+    /* 0x909 */ s8 field_0x909[3];
+    /* 0x90C */ s8 field_0x90c;
+    /* 0x910 */ f32 field_0x910;
+    /* 0x914 */ f32 field_0x914;
+    /* 0x918 */ f32 field_0x918;
+    /* 0x91C */ J3DModel* mpLeafModels[17];
+    /* 0x960 */ f32 field_0x960[17];
+    /* 0x9A4 */ u8 field_0x9A4[0x9A8 - 0x9A4];
+    /* 0x9A8 */ csXyz field_0x9a8[18];
+    /* 0xA14 */ u8 field_0xA14[0xA20 - 0xA14];
+    /* 0xA20 */ f32 field_0xa20;
+    /* 0xA24 */ s8 field_0xa24;
+    /* 0xA25 */ s8 field_0xa25;
+    /* 0xA26 */ csXyz field_0xa26;
+    /* 0xA2C */ s8 mAnmSeTimer;
+    /* 0xA30 */ u32 mAnmSe;
+    /* 0xA34 */ dCcD_Stts mColliderStts;
+    /* 0xA70 */ dCcD_Sph mCcSph;
+    /* 0xBA8 */ dCcD_Sph mTgSph;
+    /* 0xCE0 */ s8 field_0xce0;
+    /* 0xCE4 */ dCcU_AtInfo mAtInfo;
+    /* 0xD08 */ dBgS_AcchCir mAcchCir;
+    /* 0xD48 */ dBgS_ObjAcch mAcch;
+    /* 0xF20 */ s8 field_0xf20;
+    /* 0xF21 */ s8 field_0xf21;
+    /* 0xF22 */ s8 field_0xf22;
+    /* 0xF24 */ u32 field_0xf24;
+    /* 0xF28 */ u8 field_0xF28[0xF30 - 0xF28];
+    /* 0xF30 */ u32 mMouthMizuEmitterIDs[5];
+    /* 0xF44 */ f32 mMouthMizuParticleSize;
+    /* 0xF48 */ u8 mInitHIO;
 };
 
 STATIC_ASSERT(sizeof(b_bh_class) == 0xf4c);
 
-class daB_BH_HIO_c {
+class daB_BH_HIO_c
+#ifdef DEBUG
+: public JORReflexible
+#endif
+{
 public:
     /* 805AE26C */ daB_BH_HIO_c();
-    /* 805B3098 */ ~daB_BH_HIO_c();
+    /* 805B3098 */ virtual ~daB_BH_HIO_c() {}
+
+#ifdef DEBUG
+    virtual void genMessage(JORMContext*);
+#endif
+
+    /* 0x04 */ s8 no;
+    /* 0x08 */ f32 model_size;
+    /* 0x0C */ u8 unk_0xc[0x10 - 0xC];
+    /* 0x10 */ s16 attack_freq_a;
+    /* 0x12 */ s16 attack_freq_b;
+    /* 0x14 */ s16 down_revive_time;
 };
 
 
diff --git a/include/d/actor/d_a_b_bq.h b/include/d/actor/d_a_b_bq.h
index 6c3d46aaf6..c9ea4ae7fd 100644
--- a/include/d/actor/d_a_b_bq.h
+++ b/include/d/actor/d_a_b_bq.h
@@ -41,16 +41,17 @@ public:
     /* 0x06DE */ s16 field_0x6de;
     /* 0x06E0 */ fpc_ProcID mTentacleIDs[2];
     /* 0x06E8 */ fpc_ProcID mMonkeyBombID;
-    /* 0x06EC */ u8 field_0x6ec;
+    /* 0x06EC */ s8 field_0x6ec;
     /* 0x06ED */ s8 mColpatType;
     /* 0x06F0 */ f32 mColpatBlend;
     /* 0x06F4 */ s16 mHeadRot;
     /* 0x06F6 */ s16 field_0x6f6;
     /* 0x06F8 */ s8 mDisableDraw;
-    /* 0x06F9 */ u8 field_0x6f9;
-    /* 0x06FA */ u8 field_0x6fa;
-    /* 0x06FB */ u8 field_0x6fb;
+    /* 0x06F9 */ s8 field_0x6f9;
+    /* 0x06FA */ s8 field_0x6fa;
+    /* 0x06FB */ s8 field_0x6fb;
     /* 0x06FC */ s8 field_0x6fc;
+    /* 0x06FD */ s8 field_0x6fd;
     /* 0x06FE */ s16 field_0x6fe;
     /* 0x0700 */ dCcD_Stts mCcStts;
     /* 0x073C */ dCcD_Sph mCcSph;
diff --git a/include/d/actor/d_a_e_mb.h b/include/d/actor/d_a_e_mb.h
index 5a6be495fd..d39a6c484d 100644
--- a/include/d/actor/d_a_e_mb.h
+++ b/include/d/actor/d_a_e_mb.h
@@ -1,6 +1,9 @@
 #ifndef D_A_E_MB_H
 #define D_A_E_MB_H
+
 #include "f_op/f_op_actor_mng.h"
+#include "d/d_cc_d.h"
+#include "d/d_cc_uty.h"
 
 /**
  * @ingroup actors-enemies
@@ -11,15 +14,59 @@
  * 
  */
 class e_mb_class : public fopEn_enemy_c {
-private:
-    /* 0x5ac */ u8 field_0x5ac[0x8cc - 0x5ac];
+public:
+    /* 0x5AC */ request_of_phase_process_class mPhase;
+    /* 0x5B4 */ s16 mMode;
+    /* 0x5B6 */ u8 field_0x5b6;
+    /* 0x5B8 */ cXyz field_0x5b8;
+    /* 0x5C4 */ u8 field_0x5C4[0x5C8 - 0x5C4];
+    /* 0x5C8 */ mDoExt_McaMorfSO* mpModelMorf;
+    /* 0x5CC */ int mAnm;
+    /* 0x5D0 */ mDoExt_btpAnm* mpBtp;
+    /* 0x5D4 */ s16 field_0x5d4;
+    /* 0x5D8 */ f32 mBtpFrame;
+    /* 0x5DC */ cXyz field_0x5dc;
+    /* 0x5E8 */ Z2CreatureEnemy mSound;
+    /* 0x68C */ s8 field_0x68c;
+    /* 0x690 */ mDoExt_McaMorf* mpBombModelMorf;
+    /* 0x694 */ mDoExt_McaMorf* mpBombModel2Morf;
+    /* 0x698 */ s16 mCounter;
+    /* 0x69A */ s16 mAction;
+    /* 0x69C */ s16 mTimers[3];
+    /* 0x6A2 */ s16 field_0x6a2;
+    /* 0x6A4 */ cXyz field_0x6a4;
+    /* 0x6B0 */ s8 field_0x6b0;
+    /* 0x6B4 */ mDoExt_3DlineMat1_c mRopeMat;
+    /* 0x6F0 */ f32 field_0x6f0;
+    /* 0x6F4 */ dCcD_Stts mColliderStts;
+    /* 0x730 */ dCcD_Sph mCcSph;
+    /* 0x868 */ dCcU_AtInfo mAtInfo;
+    /* 0x88C */ u8 field_0x88C[0x8C8 - 0x88C];
+    /* 0x8C8 */ s8 field_0x8c8;
+    /* 0x8C9 */ u8 mInitHIO;
 };
 
 STATIC_ASSERT(sizeof(e_mb_class) == 0x8cc);
 
-class daE_MB_HIO_c {
+class daE_MB_HIO_c
+#ifdef DEBUG
+: public JORReflexible
+#endif
+{
+public:
     /* 8070616C */ daE_MB_HIO_c();
-    /* 8070882C */ ~daE_MB_HIO_c();
+    /* 8070882C */ virtual ~daE_MB_HIO_c() {}
+
+#ifdef DEBUG
+    virtual void genMessage(JORMContext*);
+#endif
+
+    /* 0x04 */ s8 no;
+    /* 0x08 */ f32 base_size;
+    /* 0x0C */ f32 swing_speed;
+    /* 0x10 */ f32 swing_descend;
+    /* 0x14 */ f32 swing_correction;
+    /* 0x18 */ f32 reappear_time;
 };
 
 
diff --git a/include/d/actor/d_a_ykgr.h b/include/d/actor/d_a_ykgr.h
index 62f2abc9c1..93e80820e9 100644
--- a/include/d/actor/d_a_ykgr.h
+++ b/include/d/actor/d_a_ykgr.h
@@ -29,12 +29,7 @@ struct dPa_YkgrPcallBack : public JPAParticleCallBack {
     /* 805A848C */ void draw(JPABaseEmitter*, JPABaseParticle*);
     /* 805A84D4 */ void setParam(f32);
 
-    /* 0x04 */ f32 field_0x4;
-    /* 0x08 */ f32 field_0x8;
-    /* 0x0C */ f32 field_0xc;
-    /* 0x10 */ f32 field_0x10;
-    /* 0x14 */ f32 field_0x14;
-    /* 0x18 */ f32 field_0x18;
+    /* 0x04 */ f32 field_0x4[2][3];
     /* 0x1C */ s8 field_0x1c;
 };
 
diff --git a/include/d/d_bg_s_acch.h b/include/d/d_bg_s_acch.h
index 955a172c39..fa6838d185 100644
--- a/include/d/d_bg_s_acch.h
+++ b/include/d/d_bg_s_acch.h
@@ -199,6 +199,9 @@ public:
     /* 0x02C */ u32 m_flags;
     /* 0x030 */ cXyz* pm_pos;
     /* 0x034 */ cXyz* pm_old_pos;
+#ifdef DEBUG
+    /* 0x038 */ cXyz unk_0x38;
+#endif
     /* 0x038 */ cXyz* pm_speed;
     /* 0x03C */ csXyz* pm_angle;
     /* 0x040 */ csXyz* pm_shape_angle;
@@ -224,6 +227,9 @@ public:
     /* 0x0CC */ f32 field_0xcc;
     /* 0x0D0 */ f32 m_wtr_chk_offset;
     /* 0x0D4 */ cBgS_PolyInfo* pm_out_poly_info;
+#ifdef DEBUG
+    /* 0x0E4 */ cXyz unk_0xe4;
+#endif
     /* 0x0D8 */ f32 field_0xd8;
     /* 0x0DC */ dBgS_GndChk m_gnd;
     /* 0x130 */ dBgS_RoofChk m_roof;
diff --git a/include/d/d_bomb.h b/include/d/d_bomb.h
index b03b9ddc66..c3ce9ff36d 100644
--- a/include/d/d_bomb.h
+++ b/include/d/d_bomb.h
@@ -64,6 +64,11 @@ public:
                                               NULL, NULL);
     }
 
+    static fopAc_ac_c* createEnemyBombBoomerang(cXyz* i_pos, csXyz* i_angle, int i_roomNo) {
+        return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 12, i_pos, i_roomNo, i_angle, NULL, -1,
+                                              NULL, NULL);
+    }
+
     static fopAc_ac_c* createWaterBombExplode(cXyz* i_pos) {
         return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 18, i_pos, -1, NULL, NULL, -1, NULL,
                                               NULL);
diff --git a/include/d/d_gameover.h b/include/d/d_gameover.h
index 2a231ecf89..91f071b812 100644
--- a/include/d/d_gameover.h
+++ b/include/d/d_gameover.h
@@ -5,6 +5,7 @@
 #include "d/d_menu_save.h"
 #include "f_op/f_op_msg.h"
 #include "f_op/f_op_msg_mng.h"
+#include "f_pc/f_pc_manager.h"
 #include "m_Do/m_Do_hostIO.h"
 
 class dDlst_Gameover_CAPTURE_c : public dDlst_base_c {
@@ -84,7 +85,7 @@ s32 d_GameOver_Create(u8 param_0);
 bool d_GameOver_Delete(fpc_ProcID& i_id);
 
 inline s32 d_GameOver_CheckDelete(fpc_ProcID& id) {
-    if (id != UINT32_MAX) {
+    if (id != fpcM_ERROR_PROCESS_ID_e) {
         dGameover_c* gameover = (dGameover_c*)fopMsgM_SearchByID(id);
 
         if (gameover != NULL) {
@@ -98,7 +99,7 @@ inline s32 d_GameOver_CheckDelete(fpc_ProcID& id) {
 }
 
 inline s32 d_GameOver_animeStart(fpc_ProcID& id) {
-    if (id != UINT32_MAX) {
+    if (id != fpcM_ERROR_PROCESS_ID_e) {
         dGameover_c* gameover = (dGameover_c*)fopMsgM_SearchByID(id);
 
         if (gameover != NULL) {
diff --git a/include/d/d_lib.h b/include/d/d_lib.h
index 9cef33cfef..ad8babf29d 100644
--- a/include/d/d_lib.h
+++ b/include/d/d_lib.h
@@ -2,8 +2,8 @@
 #define D_D_LIB_H
 
 #include "SSystem/SComponent/c_xyz.h"
-#include "dolphin/mtx/quat.h"
-#include "dolphin/os/OSTime.h"
+#include <dolphin/mtx.h>
+#include <dolphin/os.h>
 
 class fopAc_ac_c;
 
diff --git a/include/d/d_menu_window.h b/include/d/d_menu_window.h
index 90dceda47d..c7b5b0595c 100644
--- a/include/d/d_menu_window.h
+++ b/include/d/d_menu_window.h
@@ -58,7 +58,7 @@ public:
             GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
             GXSetZCompLoc(GX_TRUE);
             GXSetZMode(GX_FALSE, GX_ALWAYS, GX_FALSE);
-            GXSetBlendMode(GX_BM_BLEND, GX_BL_SRC_ALPHA, GX_BL_INV_SRC_ALPHA, GX_LO_OR);
+            GXSetBlendMode(GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_OR);
             GXSetAlphaCompare(GX_ALWAYS, 0, GX_AOP_OR, GX_ALWAYS, 0);
             GXSetFog(GX_FOG_NONE, 0.0f, 0.0f, 0.0f, 0.0f, g_clearColor);
             GXSetFogRangeAdj(GX_FALSE, 0, NULL);
diff --git a/include/d/d_meter_HIO.h b/include/d/d_meter_HIO.h
index 2cca81d0ee..799633c439 100644
--- a/include/d/d_meter_HIO.h
+++ b/include/d/d_meter_HIO.h
@@ -4,6 +4,7 @@
 #include "JSystem/JUtility/TColor.h"
 #include "SSystem/SComponent/c_sxyz.h"
 #include "SSystem/SComponent/c_xyz.h"
+#include "global.h"
 
 class JKRAramArchive;
 
diff --git a/include/d/d_save.h b/include/d/d_save.h
index d51bd1f9ab..6419052425 100644
--- a/include/d/d_save.h
+++ b/include/d/d_save.h
@@ -3,7 +3,7 @@
 
 #include "string.h"
 #include "SSystem/SComponent/c_xyz.h"
-#include "dolphin/os/OSTime.h"
+#include <dolphin/os.h>
 #include "global.h"
 #include "f_pc/f_pc_name.h"
 
diff --git a/include/d/d_tresure.h b/include/d/d_tresure.h
index 7e5f017d31..4a8859909b 100644
--- a/include/d/d_tresure.h
+++ b/include/d/d_tresure.h
@@ -1,7 +1,7 @@
 #ifndef D_D_TRESURE_H
 #define D_D_TRESURE_H
 
-#include "dolphin/mtx/vec.h"
+#include "dolphin/mtx.h"
 
 class dTres_c {
 public: