d_a_kamome (#879)

configure.py

@@ -1501,7 +1501,7 @@ config.libs = [
     ActorRel(Equivalent,  "d_a_himo3"),
     ActorRel(NonMatching, "d_a_hmlif"),
     ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"),   "d_a_hys"),
-    ActorRel(NonMatching, "d_a_kamome"),
+    ActorRel(Equivalent,  "d_a_kamome"),
     ActorRel(NonMatching, "d_a_kamome2"), # Demo-only
     ActorRel(NonMatching, "d_a_kantera"),
     ActorRel(NonMatching, "d_a_kn"),

include/d/actor/d_a_kamome.h

@@ -9,20 +9,20 @@
 
 class mDoExt_McaMorf;
 
-class kamome_class : public fopAc_ac_c {
-public:
-    /* 0x290 */ request_of_phase_process_class mPhsKamome;
+struct kamome_class {
+    /* 0x000 */ fopAc_ac_c actor;
+    /* 0x290 */ request_of_phase_process_class mPhase;
     /* 0x298 */ mDoExt_McaMorf* mpMorf;
     /* 0x29C */ u32 mShadowId;
     /* 0x2A0 */ u8 mType;
     /* 0x2A1 */ u8 mKoMaxCount;
     /* 0x2A2 */ u8 mPathIdx;
     /* 0x2A3 */ u8 mSwitchNoPrm;
-    /* 0x2A4 */ int mGlobalTimer;
-    /* 0x2A8 */ u8 mAnimState;
-    /* 0x2A9 */ u8 mMoveState;
+    /* 0x2A4 */ s32 mGlobalTimer;
+    /* 0x2A8 */ s8 mAnimState;
+    /* 0x2A9 */ s8 mMoveState;
     /* 0x2AA */ u8 mSwitchNo;
-    /* 0x2AB */ u8 m2AB;
+    /* 0x2AB */ s8 m2AB;
     /* 0x2AC */ s16 mJointRotY;
     /* 0x2AE */ s16 mJointRotZ;
     /* 0x2B0 */ s16 mJointRotYTarget;
@@ -30,7 +30,7 @@ public:
     /* 0x2B4 */ s16 m2B4;
     /* 0x2B6 */ u8 m2B6[0x2B8 - 0x2B6];
     /* 0x2B8 */ f32 m2B8;
-    /* 0x2BC */ u8 mbNoDraw;
+    /* 0x2BC */ s8 mbNoDraw;
     /* 0x2BD */ u8 m2BD[0x2C0 - 0x2BD];
     /* 0x2C0 */ cXyz mTargetPos;
     /* 0x2CC */ f32 mVelocityFwdTarget;
@@ -38,20 +38,15 @@ public:
     /* 0x2D4 */ f32 mRotVelFade;
     /* 0x2D8 */ f32 mRotVel;
     /* 0x2DC */ u8 m2DC[0x2E0 - 0x2DC];
-    /* 0x2E0 */ s16 mTimer0;
-    /* 0x2E2 */ s16 mTimer1;
-    /* 0x2E4 */ s16 mTimer2;
-    /* 0x2E6 */ s16 mTimer3;
-    /* 0x2E8 */ s16 mTimer4;
-    /* 0x2EA */ s16 mTimer5;
+    /* 0x2E0 */ s16 mTimers[6];
     /* 0x2EC */ s16 mRiseTimer;
     /* 0x2EE */ u8 m2EE[0x2F0 - 0x2EE];
     /* 0x2F0 */ f32 mScale;
     /* 0x2F4 */ fpc_ProcID mEsaProcID;
     /* 0x2F8 */ fopAc_ac_c* mpTargetActor;
     /* 0x2FC */ s16 m2FC;
-    /* 0x2FE */ u8 mbUsePathMovement;
-    /* 0x2FF */ u8 mCurPointIdx;
+    /* 0x2FE */ s8 mbUsePathMovement;
+    /* 0x2FF */ s8 mCurPointIdx;
     /* 0x300 */ s8 mPathIdxIncr;
     /* 0x301 */ u8 m301[0x304 - 0x301];
     /* 0x304 */ dPath* mpPath;
@@ -61,8 +56,8 @@ public:
     /* 0x30C */ s16 mRotY;
     /* 0x30E */ u8 m30E[0x31C - 0x30E];
     /* 0x31C */ dBgS_AcchCir mAcchCir;
-    /* 0x35C */ dBgS_Acch mAcch;
-    /* 0x520 */ dCcD_Stts mCcD;
+    /* 0x35C */ dBgS_ObjAcch mAcch;
+    /* 0x520 */ dCcD_Stts mStts;
     /* 0x55C */ dCcD_Sph mSph;
     /* 0x688 */ u8 m688;
     /* 0x689 */ u8 m689[0x68C - 0x689];

include/d/d_attention.h

@@ -256,7 +256,7 @@ public:
 
     // TODO:
     void LockEdge() {}
-    void chkEnemySound() {}
+    bool chkEnemySound() { return chkFlag(AttnFlag_00000100); }
     void LookRequest(fopAc_ac_c* reqActor, f32 horizontalDist, f32 upDist, f32 downDist, s16 angle, int param_5) {
         mLook[0].request(reqActor, horizontalDist, upDist, downDist, angle, param_5);
     }

include/d/d_com_inf_game.h

@@ -3967,7 +3967,7 @@ inline fopAc_ac_c* dComIfGp_att_getZHint() {
     return dComIfGp_getAttention().getZHintTarget();
 }
 
-inline void dComIfGp_att_chkEnemySound() {
+inline bool dComIfGp_att_chkEnemySound() {
     return dComIfGp_getAttention().chkEnemySound();
 }