Clean up

zeldaret · Sep 11, 2023 · 6a4aed6 · 6a4aed6
1 parent d229a14
commit 6a4aed6
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 16 deletions.
diff --git a/include/d/actor/d_a_itembase.h b/include/d/actor/d_a_itembase.h
@@ -3,8 +3,10 @@
 
 #include "f_op/f_op_actor.h"
 #include "SSystem/SComponent/c_phase.h"
-#include "d/d_bg_s.h"
-#include "d/d_item_data.h"
+
+class mDoExt_btkAnm;
+class mDoExt_brkAnm;
+class mDoExt_bckAnm;
 
 struct daItemBase_c_m_data {
     /* 0x00 */ float mFieldItemGravity;
@@ -56,18 +58,18 @@ struct daItemBase_c : public fopAc_ac_c {
     static daItemBase_c_m_data m_data;
 
 public:
-    /* 0x294 */ struct request_of_phase_process_class mPhs;
-    /* 0x29C */ struct J3DModel* mModel;
-    /* 0x2A0 */ struct J3DModel* mModelArrow[2]; // Extra models for arrow bundles
-    /* 0x2A8 */ struct mDoExt_btkAnm* mBtkAnm1;
-    /* 0x2AC */ struct mDoExt_btkAnm* mBtkAnm2;
-    /* 0x2B0 */ struct mDoExt_brkAnm* mBrkAnm1;
-    /* 0x2B4 */ struct mDoExt_brkAnm* mBrkAnm2;
-    /* 0x2B8 */ struct mDoExt_bckAnm* mBckAnm;
-    // /* 0x2BC */ struct dBgS_Acch mAcch;
-    // /* 0x480 */ struct dBgS_AcchCir mAcchCir;
-    // /* 0x4C0 */ struct dCcD_Stts mStts;
-    // /* 0x4FC */ struct dCcD_Cyl mCyl;
+    /* 0x294 */ request_of_phase_process_class mPhs;
+    /* 0x29C */ J3DModel* mModel;
+    /* 0x2A0 */ J3DModel* mModelArrow[2]; // Extra models for arrow bundles
+    /* 0x2A8 */ mDoExt_btkAnm* mBtkAnm1;
+    /* 0x2AC */ mDoExt_btkAnm* mBtkAnm2;
+    /* 0x2B0 */ mDoExt_brkAnm* mBrkAnm1;
+    /* 0x2B4 */ mDoExt_brkAnm* mBrkAnm2;
+    /* 0x2B8 */ mDoExt_bckAnm* mBckAnm;
+    // /* 0x2BC */ dBgS_Acch mAcch;
+    // /* 0x480 */ dBgS_AcchCir mAcchCir;
+    // /* 0x4C0 */ dCcD_Stts mStts;
+    // /* 0x4FC */ dCcD_Cyl mCyl;
     // /* 0x62C */ undefined field14_0x62c;
     // /* 0x62D */ undefined field15_0x62d;
     // /* 0x62E */ undefined field16_0x62e;
@@ -78,7 +80,7 @@ struct daItemBase_c : public fopAc_ac_c {
     /* 0x638 */ short field20_0x638;
     /* 0x63A */ u8 m_itemNo;
     /* 0x63B */ u8 mDrawFlags;
-    /* 0x63C */ struct cXyz mScaleTarget;
+    /* 0x63C */ cXyz mScaleTarget;
 };
 
 STATIC_ASSERT(sizeof(daItemBase_c) == 0x648);

diff --git a/include/d/actor/d_a_itembase_static.h b/include/d/actor/d_a_itembase_static.h
@@ -1,7 +1,7 @@
 #ifndef D_A_ITEMBASE_STATIC_H
 #define D_A_ITEMBASE_STATIC_H
 
-#include "d/actor/d_a_itembase.h"
+#include "f_op/f_op_actor.h"
 
 void getItemNo();
 void getHeight();

diff --git a/src/d/actor/d_a_item.cpp b/src/d/actor/d_a_item.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/d_item.h"
+#include "d/d_item_data.h"
 #include "d/actor/d_a_item.h"
 #include "d/actor/d_a_player.h"
 #include "d/d_com_inf_game.h"

diff --git a/src/d/actor/d_a_itembase.cpp b/src/d/actor/d_a_itembase.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/actor/d_a_itembase.h"
+#include "d/d_item_data.h"
 #include "d/d_resorce.h"
 #include "d/d_drawlist.h"
 #include "m_Do/m_Do_ext.h"