d_a_dmidna OK / f_op + misc cleanup (#276)

* some f_op / d_insect cleanup

* rename some vars according to tww

* d_a_dmidna OK

* remove asm

include/d/d_camera.h

@@ -16,7 +16,7 @@ struct dCamMapToolData {
     /* 8015FEB8 */ void Set(s32, s32, fopAc_ac_c*, u16, u8);
 
     /* 0x00 */ stage_camera2_data_class field_0x0;
-    /* 0x18 */ stage_arrow_class field_0x18;
+    /* 0x18 */ stage_arrow_data_class field_0x18;
     /* 0x2C */ u32 field_0x2c;
     /* 0x30 */ s32 field_0x30;
     /* 0x34 */ fopAc_ac_c* field_0x34;
@@ -332,6 +332,7 @@ public:
     /* 801829AC */ void Bank();
 
     bool Active() { return field_0x24 == 0; }
+    f32 TrimHeight() { return mTrimHeight; }
 
     static u8 engine_tbl[240];
 
@@ -405,6 +406,7 @@ public:
     /* 0x1A0 */ int mCurMode;
     /* 0x1A4 */ int mNextMode;
     /* 0x1A8 */ int field_0x1a8;
+    /* 0x1AC */ int field_0x1ac;
     /* 0x1B0 */ cSAngle field_0x1b0;
     /* 0x1B4 */ f32 field_0x1b4;
     /* 0x1B8 */ u8 field_0x1b8[4];
@@ -452,7 +454,7 @@ public:
     class {
     public:
         /* 0x00 */ u8 field_0x0[8];
-        /* 0x08 */ cSAngle field_0x8;
+        /* 0x08 */ cSGlobe field_0x8;
         /* 0x10 */ u8 field_0x10[4];
     }
     /* 0x614 */ field_0x614[4];
@@ -520,8 +522,8 @@ public:
     /* 0x940 */ u8 field_0x940[0x970 - 0x940];
     /* 0x970 */ dCamSetup_c mCamSetup;
     /* 0xAEC */ dCamParam_c mCamParam;
-    /* 0xB0C */
-};
+    /* 0xB0C */ u8 field_0xb0c[0xd58 - 0xb0c];
+};  // Size: 0xD58
 
 dCamera_c* dCam_getBody();
 dCamera_c* dCam_getCamera();

include/d/d_insect.h

@@ -1,29 +1,30 @@
 #ifndef D_D_INSECT_H
 #define D_D_INSECT_H
 
-#include "dolphin/types.h"
 #include "f_op/f_op_actor.h"
 
 class dInsect_c : public fopAc_ac_c {
 public:
-/* 80110648 */ virtual void Insect_Release();
-/* 8015E010 */ dInsect_c();
-/* 8015E078 */ virtual void Insect_GetDemoMain();
-/* 8015E26C */ virtual void CalcZBuffer(f32);
+    /* 8015E010 */ dInsect_c();
+    /* 8015E078 */ void Insect_GetDemoMain();
+    /* 8015E26C */ void CalcZBuffer(f32);
+
+    /* 80110648 */ virtual void Insect_Release() { field_0x56C = 1; }
+
 private:
     /* 0x56C */ u8 field_0x56C;
     /* 0x56D */ u8 field_0x56D;
     /* 0x56E */ u8 field_0x56E[10];
     /* 0x578 */ u32 field_0x578;
     /* 0x57C */ f32 field_0x57C;
-    /* 0x580 */ u8 field_0x580;
+    /* 0x580 */ u8 m_itemNo;
     /* 0x581 */ u8 field_0x581;
-    /* 0x582 */ s16 field_0x582;
+    /* 0x582 */ s16 m_saveBitNo;
     /* 0x584 */ u8 field_0x584;
     /* 0x585 */ u8 field_0x585;
     /* 0x586 */ u8 field_0x586[2];
-    /* 0x588 */ u32 field_0x588;
-    /* 0x58C */ int field_0x58C;
+    /* 0x588 */ u32 m_itemId;
+    /* 0x58C */ int m_mode;
 
 };
 

include/d/d_jnt_col.h

@@ -8,16 +8,17 @@
 
 class dJntColData_c {
 public:
-    u8 field_0x0;
-    s8 mType;
-    u8 field_0x2[0xC - 0x2];
+    /* 0x0 */ u8 field_0x0;
+    /* 0x1 */ s8 mType;
+    /* 0x2 */ s16 mJntNum;
+    /* 0x4 */ u8 field_0x4[0xC - 0x4];
 };
 
 class dJntCol_c {
 public:
     /* 80035C8C */ dJntCol_c();
     /* 80035CA0 */ int init(fopAc_ac_c*, dJntColData_c const*, J3DModel*, int);
-    /* 80035CC8 */ void setNowLine(cM3dGLin*, cXyz const*, csXyz const*, cXyz*);
+    /* 80035CC8 */ static void setNowLine(cM3dGLin*, cXyz const*, csXyz const*, cXyz*);
     /* 80035DC8 */ void searchNearPos(cM3dGLin const*, cXyz const*, cXyz*, int) const;
     /* 80036AEC */ void getArrowOffsetPosAndAngle(cXyz const*, csXyz const*, cXyz*, cXyz*) const;
     /* 80036C44 */ int getHitmarkPosAndAngle(cXyz const*, csXyz const*, cXyz*, csXyz*, int) const;
@@ -30,7 +31,7 @@ public:
 
     s8 getType(int i) { return mData[i].mType; }
 
-    /* 0x00 */ dJntColData_c* mData;
+    /* 0x00 */ const dJntColData_c* mData;
     /* 0x04 */ J3DModel* mModel;
     /* 0x08 */ int field_0x8;
     /* 0x0C */ int field_0xc;

include/d/d_kyeff.h

@@ -1,9 +1,9 @@
 #ifndef D_D_KYEFF_H
 #define D_D_KYEFF_H
 
-#include "dolphin/types.h"
+#include "f_op/f_op_kankyo.h"
 
-class dKyeff_c {
+class dKyeff_c : public kankyo_class {
 public:
     int execute();
 };

include/d/d_kyeff2.h

@@ -1,12 +1,11 @@
 #ifndef D_D_KYEFF2_H
 #define D_D_KYEFF2_H
 
-#include "dolphin/types.h"
-#include "SSystem/SComponent/c_phase.h"
+#include "f_op/f_op_kankyo.h"
 
-class dKyeff2_c {
+class dKyeff2_c : public kankyo_class {
 public:
-    bool execute();
+    int execute();
 };
 
 #endif /* D_D_KYEFF2_H */