b_dre equivalent (#2290)

1 files changed, 31 insertions, 31 deletions

diff --git a/include/d/actor/d_a_b_dre.h b/include/d/actor/d_a_b_dre.h
index b9f8415379..76d6d043f5 100644
--- a/include/d/actor/d_a_b_dre.h
+++ b/include/d/actor/d_a_b_dre.h
@@ -3,6 +3,7 @@
 
 #include "f_op/f_op_actor_mng.h"
 #include "d/d_bg_s_acch.h"
+#include "d/d_cc_uty.h"
 #include "Z2AudioLib/Z2Creature.h"
 
 /**
@@ -16,11 +17,11 @@
 class daB_DRE_c : public fopEn_enemy_c {
 public:
     /* 805C7DD4 */ void SetAnm(mDoExt_McaMorfSO*, int, int, f32, f32);
-    /* 805C7EAC */ void CameraSet();
+    /* 805C7EAC */ bool CameraSet();
     /* 805C8008 */ void SetStopingCam();
     /* 805C808C */ void SetStopCam(cXyz, f32, f32, s16);
     /* 805C8208 */ void SetCMoveCam(cXyz, f32, f32);
-    /* 805C81B8 */ void SetCMoveCam(cXyz, f32);
+    /* 805C81B8 */ bool SetCMoveCam(cXyz, f32);
     /* 805C8348 */ void SetEyeMoveCam(cXyz, f32, f32, s16, f32, f32);
     /* 805C824C */ void SetEyeMoveCam(cXyz, f32, f32, s16, f32);
     /* 805C8458 */ void SetMoveCam(f32, f32);
@@ -31,54 +32,53 @@ public:
     /* 805C9318 */ void Action();
     /* 805C9378 */ void DrAction();
     /* 805C9B40 */ void SoundChk();
-    /* 805CA158 */ void Execute();
+    /* 805CA158 */ int Execute();
     /* 805CA49C */ void SpeedSet();
     /* 805CA4FC */ void BreathSet();
-    /* 805CA670 */ void Delete();
+    /* 805CA670 */ int Delete();
     /* 805CA6C0 */ void setBaseMtx();
-    /* 805CA944 */ void create();
+    /* 805CA944 */ int create();
 
-    MtxP getMtx() { return field_0x6ec->getModel()->getAnmMtx(15); }
+    inline int CreateHeap();
+    inline int Draw();
+
+    MtxP getMtx() { return mpModelMorf->getModel()->getAnmMtx(15); }
 
-private:
     /* 0x5AC */ u8 field_0x5AC[0x5B0 - 0x5AC];
     /* 0x5B0 */ int mAnm;
-    /* 0x5B4 */ u8 field_0x5b4;
+    /* 0x5B4 */ u8 mDrMode;
     /* 0x5B5 */ u8 field_0x5b5;
-    /* 0x5B6 */ u8 field_0x5B6[0x5B7 - 0x5B6];
-    /* 0x5B7 */ u8 field_0x5b7;
-    /* 0x5B8 */ u8 field_0x5b8;
+    /* 0x5B6 */ u8 field_0x5b6;
+    /* 0x5B7 */ u8 mAction;
+    /* 0x5B8 */ u8 mCameraMode;
     /* 0x5B9 */ u8 field_0x5b9;
     /* 0x5BA */ u8 field_0x5BA[0x5C8 - 0x5BA];
-    /* 0x5C8 */ cXyz field_0x5c8;
-    /* 0x5D4 */ cXyz field_0x5d4;
-    /* 0x5E0 */ cXyz field_0x5e0;
-    /* 0x5EC */ cXyz field_0x5ec;
-    /* 0x5F8 */ f32 field_0x5f8;
+    /* 0x5C8 */ cXyz mCamCenter;
+    /* 0x5D4 */ cXyz mCamCenterTarget;
+    /* 0x5E0 */ cXyz mCamEye;
+    /* 0x5EC */ cXyz mCamEyeTarget;
+    /* 0x5F8 */ f32 mBlurRate;
     /* 0x5FC */ s16 field_0x5fc;
-    /* 0x5FE */ u8 field_0x5FE[0x600 - 0x5FE];
-    /* 0x600 */ f32 field_0x600;
-    /* 0x604 */ mDoExt_brkAnm* field_0x604;
+    /* 0x600 */ f32 mCamFovy;
+    /* 0x604 */ mDoExt_brkAnm* mpCoreBrk;
     /* 0x608 */ f32 field_0x608;
     /* 0x60C */ u8 field_0x60C[0x610 - 0x60C];
-    /* 0x610 */ f32 field_0x610;
-    /* 0x614 */ f32 field_0x614;
+    /* 0x610 */ f32 mTargetSpeedF;
+    /* 0x614 */ f32 mTargetSpeedY;
     /* 0x618 */ f32 field_0x618;
-    /* 0x61C */ u32 field_0x61c[4];
-    /* 0x62C */ s16 field_0x62c[5];
-    /* 0x636 */ u8 field_0x636;
-    /* 0x637 */ u8 field_0x637;
+    /* 0x61C */ u32 mBreathEmtrIDs[4];
+    /* 0x62C */ s16 mTimers[5];
+    /* 0x636 */ u8 mHideModel;
+    /* 0x637 */ u8 mHideParts;
     /* 0x638 */ u8 field_0x638;
-    /* 0x639 */ u8 field_0x639[0x63C - 0x639];
     /* 0x63C */ request_of_phase_process_class mPhase;
     /* 0x644 */ Z2CreatureEnemy mSound;
-    /* 0x6E8 */ u8 field_0x6E8[0x6EC - 0x6E8];
-    /* 0x6EC */ mDoExt_McaMorfSO* field_0x6ec;
+    /* 0x6E8 */ u32 mShadowKey;
+    /* 0x6EC */ mDoExt_McaMorfSO* mpModelMorf;
     /* 0x6F0 */ dBgS_AcchCir mAcchCir;
     /* 0x730 */ dBgS_ObjAcch mAcch;
-    /* 0x908 */ u8 field_0x908[0x910 - 0x908];
-    /* 0x910 */ Z2CreatureEnemy* field_0x910;
-    /* 0x914 */ u8 field_0x914[0x930 - 0x914];
+    /* 0x908 */ dCcU_AtInfo mAtInfo;
+    /* 0x92C */ u8 field_0x92c[0x930 - 0x92C];
 };
 
 STATIC_ASSERT(sizeof(daB_DRE_c) == 0x930);