d_a_obj_bemos debug work (#2947)

* debug work

* PR cleanup

1 files changed, 46 insertions, 48 deletions

diff --git a/include/d/actor/d_a_obj_bemos.h b/include/d/actor/d_a_obj_bemos.h
index 51d5f3029f..bf28ec9eca 100644
--- a/include/d/actor/d_a_obj_bemos.h
+++ b/include/d/actor/d_a_obj_bemos.h
@@ -16,7 +16,8 @@
  *
  * @details
  *
- */
+*/
+
 class daObjBm_c : public dBgS_MoveBgActor {
 public:
     typedef void (daObjBm_c::*procFunc)();
@@ -48,7 +49,7 @@ public:
         void wall_pos(fopAc_ac_c const*, daObjBm_c::BgcSrc_c const*, int, s16, f32);
         bool chk_wall_pre(fopAc_ac_c const*, daObjBm_c::BgcSrc_c const*, int, s16);
 
-        static daObjBm_c::BgcSrc_c M_lin5[];
+        static const daObjBm_c::BgcSrc_c M_lin5[];
         static const daObjBm_c::BgcSrc_c M_lin20[];
 
         static dBgS_ObjGndChk M_gnd_work[23];
@@ -132,14 +133,14 @@ public:
     // private:
     /* 0x05A0 */ request_of_phase_process_class mPhase;
     /* 0x05A8 */ J3DModel* mpModel;
-    /* 0x05AC */ mDoExt_brkAnm* mpBrkAnm;
-    /* 0x05B0 */ mDoExt_bckAnm* mpBckAnm;
-    /* 0x05B4 */ J3DModel* mpModel2;
-    /* 0x05B8 */ mDoExt_btkAnm* mpBtkAnm;
-    /* 0x05BC */ mDoExt_btkAnm* mpBtkAnm2;
-    /* 0x05C0 */ mDoExt_bckAnm* mpBckAnm2;
-    /* 0x05C4 */ J3DModel* mpModel3;
-    /* 0x05C8 */ mDoExt_bckAnm* mpBckAnm3;
+    /* 0x05AC */ mDoExt_brkAnm* mSerchBrk;
+    /* 0x05B0 */ mDoExt_bckAnm* mBeamosBck;
+    /* 0x05B4 */ J3DModel* mBeamModel;
+    /* 0x05B8 */ mDoExt_btkAnm* mBeamBtk;
+    /* 0x05BC */ mDoExt_btkAnm* mBeamEffBtk;
+    /* 0x05C0 */ mDoExt_bckAnm* mBeamEffBck;
+    /* 0x05C4 */ J3DModel* mBmfModel;
+    /* 0x05C8 */ mDoExt_bckAnm* mBmfOffBck;
     /* 0x05CC */ dBgS_ObjAcch mAcch;
     /* 0x07A4 */ dBgS_AcchCir mAcchCir;
     /* 0x07E4 */ dCcD_Stts mStts;
@@ -149,63 +150,61 @@ public:
     /* 0x0F8C */ s16 mJoints[5];
     /* 0x0F96 */ s16 field_0xf96;
     /* 0x0F98 */ s16 field_0xf98;
-    /* 0x0F9A */ s16 field_0xf9a;
-    /* 0x0F9C */ s16 field_0xf9c;
-    /* 0x0F9E */ s16 field_0xf9e;
-    /* 0x0FA0 */ s16 field_0xfa0;
-    /* 0x0FA2 */ s16 field_0xfa2;
-    /* 0x0FA4 */ s16 field_0xfa4;
-    /* 0x0FA6 */ s16 field_0xfa6;
-    /* 0x0FA8 */ s16 field_0xfa8;
+    /* 0x0F9A */ s16 mBigGearRotX;
+    /* 0x0F9C */ s16 mBigGearRotXTarget;
+    /* 0x0F9E */ s16 mSmallGear0RotX;
+    /* 0x0FA0 */ s16 mSmallGear0RotXTarget;
+    /* 0x0FA2 */ s16 mSmallGear1RotX;
+    /* 0x0FA4 */ s16 mSmallGear1RotXTarget;
+    /* 0x0FA6 */ s16 mSmallGear2RotX;
+    /* 0x0FA8 */ s16 mSmallGear2RotXTarget;
     /* 0x0FAA */ s16 field_0xfaa;
     /* 0x0FAC */ s16 field_0xfac;
-    /* 0x0FAE */ s16 field_0xfae;
-    /* 0x0FB0 */ s16 field_0xfb0;
+    /* 0x0FAE */ s16 mGearRotationSpd;
+    /* 0x0FB0 */ s16 mGearRotSpdTarget;
     /* 0x0FB2 */ s16 field_0xfb2;
     /* 0x0FB4 */ J3DMaterial* mpMaterial;
     /* 0x0FB8 */ cXyz field_0xfb8;
     /* 0x0FC4 */ csXyz field_0xfc4;
-    /* 0x0FCA */ u8 field_0xfca[2];
     /* 0x0FCC */ cXyz field_0xfcc;
     /* 0x0FD8 */ cXyz field_0xfd8;
-    /* 0x0FE4 */ u8 field_0xfe4;
+    /* 0x0FE4 */ u8 mActionIdx;
     /* 0x0FE5 */ u8 field_0xfe5;
-    /* 0x0FE6 */ u8 field_0xfe6;
-    /* 0x0FE7 */ s8 field_0xfe7;
+    /* 0x0FE6 */ u8 mSearchAttackTimer;
+    /* 0x0FE7 */ s8 mFindPlayerFlag;
     /* 0x0FE8 */ u8 field_0xfe8;
     /* 0x0FE9 */ u8 field_0xfe9;
-    /* 0x0FEA */ u8 field_0xfea;
-    /* 0x0FEB */ u8 field_0xfeb;
+    /* 0x0FEA */ u8 mActionMode;
+    /* 0x0FEB */ u8 mActionTypeIdx;
     /* 0x0FEC */ u8 field_0xfec;
     /* 0x0FED */ u8 field_0xfed;
     /* 0x0FF0 */ u32 field_0xff0;
     /* 0x0FF4 */ u8 field_0xff4;
-    /* 0x0FF5 */ u8 field_0xff5;
-    /* 0x0FF6 */ u8 field_0xff6;
-    /* 0x0FF7 */ u8 field_0xff7;
-    /* 0x0FF8 */ JPABaseEmitter* field_0xff8[2];
+    /* 0x0FF5 */ u8 mEmitterTimer;
+    /* 0x0FF6 */ u8 mEffFuncIdx;
+    /* 0x0FF7 */ u8 mShowFlag;
+    /* 0x0FF8 */ JPABaseEmitter* mBrokenSmokeEmitter[2];
     /* 0x1000 */ f32 field_0x1000;
-    /* 0x1004 */ f32 field_0x1004;
-    /* 0x1008 */ u16 field_0x1008;
+    /* 0x1004 */ f32 mPlayerDist;
+    /* 0x1008 */ u16 mAfterSwitchActivateNoSearchTimer;
     /* 0x100A */ u16 field_0x100a;
     /* 0x100C */ u16 field_0x100c;
-    /* 0x100E */ u8 field_0x100e;
-    /* 0x100F */ u8 field_0x100f;
-    /* 0x1010 */ JPABaseEmitter* field_0x1010[2];
-    /* 0x1018 */ JPABaseEmitter* field_0x1018[2];
-    /* 0x1010 */ JPABaseEmitter* field_0x1020[3];
-    /* 0x102C */ JPABaseEmitter* field_0x102c;
-    /* 0x1030 */ JPABaseEmitter* field_0x1030;
-    /* 0x1034 */ JPABaseEmitter* field_0x1034;
+    /* 0x100E */ u8 mCreateFirstFlag;
+    /* 0x1010 */ JPABaseEmitter* mNessenBurnPrtclEmitter[2];
+    /* 0x1018 */ JPABaseEmitter* mNessenSrcPrtclEmitter[2];
+    /* 0x1010 */ JPABaseEmitter* mNessenSplashPrtclEmitter[3];
+    /* 0x102C */ JPABaseEmitter* mGearSparkEmitter;
+    /* 0x1030 */ JPABaseEmitter* mGearRockEmitter;
+    /* 0x1034 */ JPABaseEmitter* mNessenHeatPrtclEmitter;
     /* 0x1038 */ s8 field_0x1038;
     /* 0x1039 */ s8 field_0x1039;
-    /* 0x103C */ cXyz field_0x103c;
-    /* 0x1048 */ cXyz field_0x1048;
-    /* 0x1054 */ cXyz field_0x1054;
-    /* 0x1060 */ Z2SoundObjSimple mSound;
-    /* 0x1080 */ Z2SoundObjSimple mSound2;
-    /* 0x10A0 */ cXyz field_0x10a0;
-    /* 0x10AC */ int field_0x10ac;
+    /* 0x103C */ cXyz mSparkSePos;
+    /* 0x1048 */ cXyz mBeamSoundPos;
+    /* 0x1054 */ cXyz mBurnSoundPos;
+    /* 0x1060 */ Z2SoundObjSimple mBeamSound;
+    /* 0x1080 */ Z2SoundObjSimple mBurnSound;
+    /* 0x10A0 */ cXyz mBeamScale;
+    /* 0x10AC */ int mModeProcIdx;
     /* 0x10B0 */ int field_0x10b0;
     /* 0x10B4 */ int field_0x10b4;
     /* 0x10B8 */ f32 field_0x10b8;
@@ -216,7 +215,6 @@ public:
     /* 0x10CE */ s16 field_0x10ce;
     /* 0x10D0 */ s16 field_0x10d0;
     /* 0x10D2 */ u8 field_0x10d2;
-    /* 0x10D3 */ u8 field_0x10d3;
     /* 0x10D4 */ Bgc_c mBgc;
 };