d_a_shop_item, d_a_b_go, d_a_b_gos OK (#2085)

* d_a_shop_item OK

* d_a_b_go OK

* d_a_b_gos OK

* remove asm

* some work on d_a_b_oh / d_a_b_zant_sima

* d_a_startAndGoal done

6 files changed, 94 insertions, 8 deletions

diff --git a/include/rel/d/a/b/d_a_b_go/d_a_b_go.h b/include/rel/d/a/b/d_a_b_go/d_a_b_go.h
index 82a20e840f..bb524ad0b2 100644
--- a/include/rel/d/a/b/d_a_b_go/d_a_b_go.h
+++ b/include/rel/d/a/b/d_a_b_go/d_a_b_go.h
@@ -1,5 +1,42 @@
 #ifndef D_A_B_GO_H
 #define D_A_B_GO_H
 
+#include "f_op/f_op_actor_mng.h"
+#include "Z2AudioLib/Z2Creature.h"
+#include "d/cc/d_cc_d.h"
+#include "d/cc/d_cc_uty.h"
+
+#define GORON_CHILD_MAX 31
+
+class b_go_class : public fopEn_enemy_c {
+public:
+    /* 80603CA0 */ b_go_class();
+
+    /* 0x5AC */ request_of_phase_process_class mPhase;
+    /* 0x5B4 */ mDoExt_McaMorfSO* mpMorf;
+    /* 0x5B8 */ Z2CreatureEnemy mSound;
+    /* 0x65C */ int mAnmID;
+    /* 0x660 */ u8 unk_0x660;
+    /* 0x661 */ u8 field_0x661[0x668 - 0x661];
+    /* 0x668 */ s16 unk_0x668;
+    /* 0x66A */ s16 mActionID;
+    /* 0x66C */ s16 mMode;
+    /* 0x66E */ u8 field_0x66e[0x67e - 0x66e];
+    /* 0x67E */ s16 mAngleToPlayer;
+    /* 0x680 */ f32 mDistToPlayer;
+    /* 0x684 */ u8 field_0x684[4];
+    /* 0x688 */ s16 mTimers[4];
+    /* 0x690 */ s16 unk_0x690;
+    /* 0x692 */ s16 field_0x692;
+    /* 0x694 */ dBgS_AcchCir mAcchCir;
+    /* 0x6D4 */ dBgS_ObjAcch mAcch;
+    /* 0x8AC */ dCcD_Stts mStts;
+    /* 0x8E8 */ dCcD_Sph field_0x8e8;
+    /* 0xA20 */ dCcD_Sph field_0xa20;
+    /* 0xB58 */ dCcD_Cyl field_0xb58;
+    /* 0xC94 */ dCcU_AtInfo mAtInfo;
+    /* 0xCB8 */ u32 mGoronChildIDs[GORON_CHILD_MAX];
+    /* 0xD34 */ u8 field_0xd34;
+};
 
 #endif /* D_A_B_GO_H */
diff --git a/include/rel/d/a/b/d_a_b_gos/d_a_b_gos.h b/include/rel/d/a/b/d_a_b_gos/d_a_b_gos.h
index 05d72ddfa3..c823bdca94 100644
--- a/include/rel/d/a/b/d_a_b_gos/d_a_b_gos.h
+++ b/include/rel/d/a/b/d_a_b_gos/d_a_b_gos.h
@@ -1,6 +1,43 @@
 #ifndef D_A_B_GOS_H
 #define D_A_B_GOS_H
 
-#include "dolphin/types.h"
+#include "Z2AudioLib/Z2Creature.h"
+#include "d/cc/d_cc_d.h"
+#include "d/cc/d_cc_uty.h"
+#include "f_op/f_op_actor_mng.h"
+
+class b_gos_class : public fopEn_enemy_c {
+public:
+    /* 80605024 */ b_gos_class();
+
+    /* 0x5AC */ request_of_phase_process_class mPhase;
+    /* 0x5B4 */ mDoExt_McaMorfSO* mpMorf;
+    /* 0x5B8 */ Z2CreatureEnemy mSound;
+    /* 0x65C */ int mAnmID;
+    /* 0x660 */ u32 mJointIndex;
+    /* 0x664 */ u8 field_0x664[0x668 - 0x664];
+    /* 0x668 */ u32 mShadowKey;
+    /* 0x66C */ s16 field_0x66c;
+    /* 0x66E */ s16 mAction;
+    /* 0x670 */ s16 mMode;
+    /* 0x672 */ u8 field_0x672[0x680 - 0x672];
+    /* 0x680 */ s16 mWalkDirection;
+    /* 0x682 */ s16 mAngleToPlayer;
+    /* 0x684 */ f32 mDistToPlayer;
+    /* 0x688 */ u8 field_0x688[0x68C - 0x688];
+    /* 0x68C */ s16 mTimers[4];
+    /* 0x694 */ s16 field_0x694;
+    /* 0x698 */ f32 field_0x698;
+    /* 0x69C */ f32 field_0x69c;
+    /* 0x6A0 */ s16 mAngleOffset;
+    /* 0x6A4 */ dBgS_AcchCir mAcchCir;
+    /* 0x6E4 */ dBgS_ObjAcch mAcch;
+    /* 0x8BC */ dCcD_Stts mCcStts;
+    /* 0x8F8 */ dCcD_Sph field_0x8f8;
+    /* 0xA30 */ dCcD_Sph field_0xa30;
+    /* 0xB68 */ dCcD_Cyl mCyl;
+    /* 0xCA4 */ dCcU_AtInfo mAtInfo;
+    /* 0xCC8 */ u8 field_0xcc8;
+};
 
 #endif /* D_A_B_GOS_H */
diff --git a/include/rel/d/a/b/d_a_b_oh/d_a_b_oh.h b/include/rel/d/a/b/d_a_b_oh/d_a_b_oh.h
index 1fc10bd7b4..efb2b49387 100644
--- a/include/rel/d/a/b/d_a_b_oh/d_a_b_oh.h
+++ b/include/rel/d/a/b/d_a_b_oh/d_a_b_oh.h
@@ -6,7 +6,7 @@
 class daB_OH_HIO_c {
 public:
     /* 8061B72C */ daB_OH_HIO_c();
-    /* 8061D93C */ virtual ~daB_OH_HIO_c();
+    /* 8061D93C */ virtual ~daB_OH_HIO_c();  // supposed to be inlined
 
     /* 0x4 */ s8 field_0x4;
     /* 0x8 */ f32 mModelSize;
diff --git a/include/rel/d/a/b/d_a_b_zant_sima/d_a_b_zant_sima.h b/include/rel/d/a/b/d_a_b_zant_sima/d_a_b_zant_sima.h
index f55bb9ca7b..19970cc41c 100644
--- a/include/rel/d/a/b/d_a_b_zant_sima/d_a_b_zant_sima.h
+++ b/include/rel/d/a/b/d_a_b_zant_sima/d_a_b_zant_sima.h
@@ -20,10 +20,12 @@ public:
     /* 0x578 */ mDoExt_btkAnm* mpBtkAnm;
     /* 0x57C */ u32 mPlayerID;
     /* 0x580 */ u32 mBossID;
-    /* 0x584 */ u8 field_0x584[4];
-    /* 0x588 */ f32 field_0x588;
-    /* 0x58C */ csXyz field_0x58c;
-    /* 0x594 */ Mtx field_0x594;
+    /* 0x584 */ u8 mSinkTimers[2];
+    /* 0x586 */ bool mSinkPlayer;
+    /* 0x587 */ bool mSinkZant;
+    /* 0x588 */ f32 mHeight;
+    /* 0x58C */ csXyz mRotation;
+    /* 0x594 */ Mtx mMtx;
     /* 0x5C4 */ dBgW* mpBgW;
 };
 
diff --git a/include/rel/d/a/d_a_shop_item/d_a_shop_item.h b/include/rel/d/a/d_a_shop_item/d_a_shop_item.h
index a3cd4a9dc2..b5cff75720 100644
--- a/include/rel/d/a/d_a_shop_item/d_a_shop_item.h
+++ b/include/rel/d/a/d_a_shop_item/d_a_shop_item.h
@@ -1,6 +1,16 @@
 #ifndef D_A_SHOP_ITEM_H
 #define D_A_SHOP_ITEM_H
 
-#include "dolphin/types.h"
+#include "d/a/d_a_shop_item_static.h"
+
+namespace daShopItem_prm {
+inline u8 getGroup(daShopItem_c* i_this) {
+    return fopAcM_GetParam(i_this) >> 0x1C;
+}
+
+inline u8 getItemNo(daShopItem_c* i_this) {
+    return fopAcM_GetParam(i_this) & 0xFF;
+}
+}  // namespace dahopItem_prm
 
 #endif /* D_A_SHOP_ITEM_H */
diff --git a/include/rel/d/a/d_a_spinner/d_a_spinner.h b/include/rel/d/a/d_a_spinner/d_a_spinner.h
index 418ae6d453..133fb20971 100644
--- a/include/rel/d/a/d_a_spinner/d_a_spinner.h
+++ b/include/rel/d/a/d_a_spinner/d_a_spinner.h
@@ -19,7 +19,7 @@ public:
     /* 804D3174 */ void setWallHit(s16, u32);
     /* 804D34B0 */ void setAnm();
     /* 804D3618 */ int setNextPathNum();
-    /* 804D3694 */ cXyz* getPathNextPos();
+    /* 804D3694 */ Vec* getPathNextPos();
     /* 804D36F4 */ int checkLineWallHit(cXyz*, cXyz*);
     /* 804D3774 */ int checkPathMove();
     /* 804D3D60 */ void setSpreadEffect();