d_s_logo / d_s_play debug work, d_a_kago cleanup, misc cleanup (#3116)

* d_a_kago cleanup

* d_s_logo wii/shield work

* d_s_logo / d_s_play debug work

* fix missing profile class sizeof's

* fix phase->id values

* build fixes

* fix dCamera_c and camera profile

2 files changed, 64 insertions, 48 deletions

diff --git a/include/d/actor/d_a_grass.h b/include/d/actor/d_a_grass.h
index 549a067eba..4b07bea1d5 100644
--- a/include/d/actor/d_a_grass.h
+++ b/include/d/actor/d_a_grass.h
@@ -44,6 +44,8 @@ public:
     static daGrass_c* m_myObj;
     static dGrass_packet_c* m_grass;
     static dFlower_packet_c* m_flower;
+
+    /* 0x568 */ u8 unk_0x568[0x570 - 0x568];
 };
 
 namespace daGrass_prm {
diff --git a/include/d/actor/d_a_kago.h b/include/d/actor/d_a_kago.h
index a84d049ad2..90de3b74bf 100644
--- a/include/d/actor/d_a_kago.h
+++ b/include/d/actor/d_a_kago.h
@@ -18,6 +18,20 @@
  */
 class daKago_c : public fopAc_ac_c {
 public:
+    enum daKago_Action_e {
+        ACTION_FLY_e,
+        ACTION_STAGGER_e,
+        ACTION_EVENT_e,
+        ACTION_PERCH_e,
+        ACTION_WAIT_e,
+        ACTION_ATTACK_e,
+        ACTION_EVENT2_e,
+        ACTION_PERCH2_e,
+        ACTION_LANDING_e,
+        ACTION_DEMO_FLY_e,
+        ACTION_DEMO_FLY2_e,
+    };
+
     int getBckName(int);
     void setBck(int, u8, f32, f32);
     bool checkBck(int);
@@ -93,14 +107,14 @@ public:
 
     void setEvent() {
         mIsFlying = false;
-        mCurrentAction = 2;
-        field_0x744 = 0;
+        mAction = ACTION_EVENT_e;
+        mMode = 0;
     }
 
     void setEvent2() {
         mIsFlying = false;
-        mCurrentAction = 6;
-        field_0x744 = 0;
+        mAction = ACTION_EVENT2_e;
+        mMode = 0;
     }
 
     void setKagoPath(u8 i_pathNo) {
@@ -110,36 +124,36 @@ public:
     }
 
     void onWaterFall() {
-        field_0x6ea = 1;
+        mIsWaterfall = TRUE;
     }
 
     bool isAttack() {
-        return field_0x6dd != 0;
+        return mIsAttack != 0;
     }
 
     MtxP getLegR3Mtx() { return mLegR3Mtx; }
-    MtxP getMidnaLocaterMtx() { return mpMorf->getModel()->getAnmMtx(4); }
+    MtxP getMidnaLocaterMtx() { return mAnm_p->getModel()->getAnmMtx(4); }
     s8 getPathDir() { return mPathDir; }
     u8 isFlying() { return mIsFlying; }
     fopAc_ac_c* getLockActor() { return mpLockActor; }
     void setLockActor(fopAc_ac_c* actor) { mpLockActor = actor; }
     void setEatYm() { field_0x6d8 |= (u8) 4; }
-    MtxP getMouthMtx() { return mpMorf->getModel()->getAnmMtx(7); }
+    MtxP getMouthMtx() { return mAnm_p->getModel()->getAnmMtx(7); }
 
 private:
     /* 0x568 */ request_of_phase_process_class mPhase;
-    /* 0x570 */ mDoExt_McaMorfSO* mpMorf;
+    /* 0x570 */ mDoExt_McaMorfSO* mAnm_p;
     /* 0x574 */ Z2CreatureEnemy mSound;
     /* 0x618 */ fopAc_ac_c* mpLockActor;
     /* 0x61C */ fpc_ProcID mBalloon2DId;
     /* 0x620 */ Mtx mLegR3Mtx;
-    /* 0x650 */ cXyz field_0x650[3];
+    /* 0x650 */ cXyz mWallHitEffPos[3];
     /* 0x674 */ cXyz field_0x674;
     /* 0x680 */ cXyz field_0x680;
-    /* 0x68C */ cXyz field_0x68c;
-    /* 0x698 */ cXyz field_0x698;
+    /* 0x68C */ cXyz mDemoCamCenter;
+    /* 0x698 */ cXyz mDemoCamEye;
     /* 0x6A4 */ cXyz field_0x6a4;
-    /* 0x6B0 */ cXyz field_0x6b0;
+    /* 0x6B0 */ cXyz mPrevCamEye;
     /* 0x6BC */ s16 field_0x6bc;
     /* 0x6BE */ csXyz field_0x6be;
     /* 0x6C4 */ f32 field_0x6c4;
@@ -147,12 +161,12 @@ private:
     /* 0x6CA */ s16 field_0x6ca;
     /* 0x6CC */ f32 field_0x6cc;
     /* 0x6D0 */ f32 field_0x6d0;
-    /* 0x6D4 */ f32 field_0x6d4;
+    /* 0x6D4 */ f32 mDemoCamFovy;
     /* 0x6D8 */ u8 field_0x6d8;
     /* 0x6D9 */ u8 field_0x6d9;
     /* 0x6DA */ s16 field_0x6da;
     /* 0x6DC */ u8 field_0x6dc;
-    /* 0x6DD */ u8 field_0x6dd;
+    /* 0x6DD */ u8 mIsAttack;
     /* 0x6DE */ u8 field_0x6de;
     /* 0x6DF */ u8 field_0x6df;
     /* 0x6E0 */ u8 field_0x6e0;
@@ -162,18 +176,18 @@ private:
     /* 0x6E4 */ u8 field_0x6e4;
     /* 0x6E5 */ u8 field_0x6e5;
     /* 0x6E6 */ u8 field_0x6e6;
-    /* 0x6E7 */ u8 field_0x6e7;
+    /* 0x6E7 */ u8 mType;
     /* 0x6E8 */ u8 field_0x6e8;
     /* 0x6E8 */ u8 field_0x6e9;
-    /* 0x6EA */ u8 field_0x6ea;
-    /* 0x6EB */ u8 field_0x6eb;
+    /* 0x6EA */ u8 mIsWaterfall;
+    /* 0x6EB */ u8 mBalloonMenuMode;
     /* 0x6EC */ u8 field_0x6ec[0x6ed - 0x6ec];
-    /* 0x6ED */ u8 field_0x6ed;
-    /* 0x6F0 */ f32 field_0x6f0;
-    /* 0x6F4 */ f32 field_0x6f4;
-    /* 0x6F8 */ f32 field_0x6f8;
+    /* 0x6ED */ u8 unk_0x6ed;
+    /* 0x6F0 */ f32 mStickX;
+    /* 0x6F4 */ f32 mStickY;
+    /* 0x6F8 */ f32 mFlySpeed;
     /* 0x6FC */ f32 field_0x6fc;
-    /* 0x700 */ f32 field_0x700;
+    /* 0x700 */ f32 mGroundFlyHeight;
     /* 0x704 */ f32 mGroundHeight;
     /* 0x708 */ f32 mRoofHeight;
     /* 0x70C */ f32 field_0x70c;
@@ -181,32 +195,32 @@ private:
     /* 0x712 */ s16 field_0x712;
     /* 0x714 */ s16 field_0x714;
     /* 0x716 */ s16 field_0x716;
-    /* 0x718 */ s16 field_0x718;
-    /* 0x71A */ s16 field_0x71a;
-    /* 0x71C */ s32 field_0x71c;
-    /* 0x720 */ s32 field_0x720;
+    /* 0x718 */ s16 mHeadRotZ;
+    /* 0x71A */ s16 mHeadRotY;
+    /* 0x71C */ int mWaterSplashTimer;
+    /* 0x720 */ int mWallHitInvulnTimer;
     /* 0x724 */ u8 field_0x724[0x728 - 0x724];
-    /* 0x728 */ s32 field_0x728;
-    /* 0x72C */ s32 field_0x72c;
-    /* 0x730 */ s32 mDashCooldownTime;
-    /* 0x734 */ s32 mDashTime;
-    /* 0x738 */ s32 field_0x738;
-    /* 0x73C */ s32 field_0x73c;
-    /* 0x740 */ s32 mCurrentAction;
-    /* 0x744 */ s32 field_0x744;
-    /* 0x748 */ s32 field_0x748;
-    /* 0x74C */ s32 field_0x74c;
-    /* 0x750 */ s32 field_0x750;
-    /* 0x754 */ s32 field_0x754;
-    /* 0x758 */ s32 field_0x758;
-    /* 0x75C */ char* field_0x75c;
-    /* 0x760 */ char* field_0x760;
-    /* 0x764 */ s32 field_0x764;
+    /* 0x728 */ int field_0x728;
+    /* 0x72C */ int field_0x72c;
+    /* 0x730 */ int mDashCooldownTime;
+    /* 0x734 */ int mDashTime;
+    /* 0x738 */ int mGndSpecialCode;
+    /* 0x73C */ int mSceneType;
+    /* 0x740 */ int mAction;
+    /* 0x744 */ int mMode;
+    /* 0x748 */ int mDemoMode;
+    /* 0x74C */ int field_0x74c;
+    /* 0x750 */ int field_0x750;
+    /* 0x754 */ int field_0x754;
+    /* 0x758 */ int field_0x758;
+    /* 0x75C */ char* mArcName;
+    /* 0x760 */ char* mDemoName;
+    /* 0x764 */ u32 mShadowId;
     /* 0x768 */ dPath* mpPath1;
     /* 0x76C */ dPath* mpPath2;
-    /* 0x770 */ s8 mPathIdx;
+    /* 0x770 */ s8 mPathCurrentPointNo;
     /* 0x771 */ s8 field_0x771;
-    /* 0x772 */ s8 mPathIdxOffset;
+    /* 0x772 */ s8 mPathStep;
     /* 0x773 */ s8 mPathDir;
     /* 0x774 */ u8 field_0x774[0x778 - 0x774];
     /* 0x778 */ dBgS_AcchCir mAcchCir;
@@ -220,9 +234,9 @@ private:
     /* 0xB38 */ u32 field_0xb38;
     /* 0xB3C */ u32 field_0xb3c;
     /* 0xB40 */ u32 field_0xb40;
-    /* 0xB44 */ u32 field_0xb44[3];
-    /* 0xB50 */ u32 field_0xb50;
-    /* 0xB54 */ u8 field_0xb54;
+    /* 0xB44 */ u32 mSibukiEmitterIDs[3];
+    /* 0xB50 */ u32 mDashSibukiEmitterID;
+    /* 0xB54 */ u8 mIsHioSet;
     /* 0xB58 */ dMsgFlow_c mMsgFlow;
 };