Debug d_a_e_ym (#3003)

include/SSystem/SComponent/c_xyz.h

@@ -36,10 +36,11 @@ struct cXyz : Vec {
         this->y = vec.y;
         this->z = vec.z;
     }
-    void operator=(const Vec& vec) {
+    cXyz& operator=(const Vec& vec) {
         this->x = vec.x;
         this->y = vec.y;
         this->z = vec.z;
+        return *this;
     }
     cXyz operator+(Vec const&) const;
     cXyz operator-(Vec const&) const;

include/d/actor/d_a_e_ym.h

@@ -8,6 +8,7 @@
 #include "d/d_cc_d.h"
 #include "d/d_cc_uty.h"
 #include "d/d_path.h"
+#include "m_Do/m_Do_ext.h"
 
 class daKago_c;
 
@@ -49,19 +50,20 @@ public:
 
     void setTagPosP() { mTagPosP = &mTagPos; }
 
-    u8 checkBck(char const*, int);
+    bool checkBck(char const*, int);
     void bckSet(int, u8, f32, f32);
     void bckSetFly(int, u8, f32, f32);
     int draw();
+    void setWaterEffect(); // unused
     void setDigEffect();
     void setElecEffect1();
     void setElecEffect2();
     void setFireEffect();
     bool checkWallCrash();
-    u8 checkWolfBark();
-    u8 checkSurpriseLock();
-    u8 checkRailSurprise();
-    u8 checkSurpriseNear();
+    bool checkWolfBark();
+    bool checkSurpriseLock();
+    bool checkRailSurprise();
+    bool checkSurpriseNear();
     void setNormalCc();
     void setAppear();
     void setMoveSound(int);
@@ -80,17 +82,17 @@ public:
     void executeBack();
     void executeFall();
     void executeAttack();
-    u8 checkAttackEnd();
-    u8 setAttackMotion();
+    bool checkAttackEnd();
+    bool setAttackMotion();
     void executeAttackWall();
     void executeDefense();
-    u8 checkFlyTerritory();
+    bool checkFlyTerritory();
     void initFly();
     void executeFly();
     void setInclination();
     void executeFlyAttack();
     void setNextPathPoint();
-    u8 checkRailDig();
+    bool checkRailDig();
     void executeRail();
     void executeBackRail();
     void checkElectricStart();
@@ -108,8 +110,8 @@ public:
     int execute();
     int _delete();
     int CreateHeap();
-    u8 checkBeforeBg(s16);
-    u8 checkBeforeGround();
+    bool checkBeforeBg(s16);
+    bool checkBeforeGround();
     void checkInitialWall();
     u8 checkWall();
     void setHideType();
@@ -132,7 +134,7 @@ private:
     /* 0x670 */ cXyz mPrevPos;
     /* 0x67C */ cXyz field_0x67c;
     /* 0x688 */ f32 field_0x688;
-    /* 0x68C */ f32 field_0x68c;
+    /* 0x68C */ f32 field_0x68c;    // model size?
     /* 0x690 */ int mAction;
     /* 0x694 */ int mLastAction;
     /* 0x698 */ int mMode;

include/d/actor/d_a_kago.h

@@ -120,10 +120,10 @@ public:
     MtxP getLegR3Mtx() { return mLegR3Mtx; }
     MtxP getMidnaLocaterMtx() { return mpMorf->getModel()->getAnmMtx(4); }
     s8 getPathDir() { return mPathDir; }
-    bool isFlying() { return mIsFlying; }
+    u8 isFlying() { return mIsFlying; }
     fopAc_ac_c* getLockActor() { return mpLockActor; }
     void setLockActor(fopAc_ac_c* actor) { mpLockActor = actor; }
-    void setEatYm() { field_0x6d8 |= 4; }
+    void setEatYm() { field_0x6d8 |= (u8) 4; }
     MtxP getMouthMtx() { return mpMorf->getModel()->getAnmMtx(7); }
 
 private:
@@ -156,7 +156,7 @@ private:
     /* 0x6DE */ u8 field_0x6de;
     /* 0x6DF */ u8 field_0x6df;
     /* 0x6E0 */ u8 field_0x6e0;
-    /* 0x6E1 */ bool mIsFlying;
+    /* 0x6E1 */ u8 mIsFlying;
     /* 0x6E2 */ u8 field_0x6e2[0x6e3 - 0x6e2];
     /* 0x6E3 */ u8 field_0x6e3;
     /* 0x6E4 */ u8 field_0x6e4;

include/d/d_cc_d.h

@@ -203,6 +203,7 @@ public:
     s16* GetShieldFrontRangeYAngle() { return mShieldFrontRangeYAngle; }
     s16 GetShieldRange() { return mShieldRange; }
     u8 GetSpl() { return mSpl; }
+    void SetSpl(dCcG_Tg_Spl tg_spl) { mSpl = tg_spl; }
     void SetSpl(u8 tg_spl) { mSpl = tg_spl; }
     u8 GetHitMark() { return mHitMark; }
     void SetRVec(cXyz& vec) { mRVec = vec; }
@@ -387,6 +388,7 @@ public:
     bool ChkTgHookShotNoHitMark() { return mGObjTg.ChkSPrm(0x400); }
     bool ChkTgArrowNoHitMark() { return mGObjTg.ChkSPrm(0x1000); }
     dCcG_Tg_Spl GetTgSpl() { return (dCcG_Tg_Spl)mGObjTg.GetSpl(); }
+    void SetTgSpl(dCcG_Tg_Spl tg_spl) { mGObjTg.SetSpl(tg_spl); }
     void SetTgSpl(u8 tg_spl) { mGObjTg.SetSpl(tg_spl); }
     int GetTgHitMark() { return mGObjTg.GetHitMark(); }
     int GetAtHitMark() { return mGObjAt.GetHitMark(); }