d_a_rd, d_lib etc work

include/d/actor/d_a_npc_md.h

@@ -100,7 +100,7 @@ public:
     /* 0x05C */ daNpc_Md_HIO4_c m05C;
     /* 0x068 */ daNpc_Md_HIO5_c m068;
     /* 0x074 */ daNpc_Md_HIO6_c m074;
-    /* 0x08C */ dNpc_HIO_c m08C;
+    /* 0x08C */ dNpc_HIO_c mNpc;
     /* 0x0B4 */ fopAc_ac_c* mpActor;
     /* 0x0B8 */ f32 m0B8;
     /* 0x0BC */ f32 m0BC;

include/d/actor/d_a_player.h

@@ -107,6 +107,7 @@ public:
         daPyFlg1_NPC_NOT_CHANGE         = 0x00000040,
         daPyFlg1_UNK80                  = 0x00000080,
         daPyFlg1_CONFUSE                = 0x00000100,
+        daPyFlg1_UNK400                 = 0x00000400,
         daPyFlg1_FREEZE_STATE           = 0x00000800,
         daPyFlg1_SHIP_TACT              = 0x00001000,
         daPyFlg1_USE_ARROW_EFFECT       = 0x00002000,

include/d/actor/d_a_rd.h

@@ -12,16 +12,16 @@ public:
     daRd_HIO_c();
     virtual ~daRd_HIO_c() {}
     
-    /* 0x04 */ dNpc_HIO_c m04;
+    /* 0x04 */ dNpc_HIO_c mNpc;
     /* 0x2C */ u8 m2C;
     /* 0x2D */ u8 m2D[0x30 - 0x2D];
     /* 0x30 */ f32 m30;
     /* 0x34 */ f32 m34;
     /* 0x38 */ f32 m38;
-    /* 0x3C */ f32 m3C;
+    /* 0x3C */ f32 mAttackRadius;
     /* 0x40 */ s16 m40;
     /* 0x42 */ s16 m42;
-    /* 0x44 */ s16 m44;
+    /* 0x44 */ s16 mAttackSpreadAngle;
     /* 0x46 */ s16 m46;
     /* 0x48 */ s16 m48;
     /* 0x4A */ s16 m4A;
@@ -40,7 +40,7 @@ public:
     /* 0x70 */ f32 m70;
     /* 0x74 */ f32 m74;
     /* 0x78 */ s16 m78;
-    /* 0x7A */ s16 m7A;
+    /* 0x7A */ s16 mParalysisDuration;
     /* 0x7C */ JntHit_HIO_c m7C;
 };
 
@@ -137,7 +137,7 @@ public:
     /* 0x2BC */ int m2BC;
     /* 0x2C0 */ int mSwNo;
     /* 0x2C4 */ u8 m2C4;
-    /* 0x2C5 */ u8 m2C5;
+    /* 0x2C5 */ u8 mHitType; // TODO enum
     /* 0x2C6 */ u8 m2C6[0x2C8 - 0x2C6];
     /* 0x2C8 */ request_of_phase_process_class mPhs;
     /* 0x2D0 */ mDoExt_McaMorf* mpMorf;
@@ -146,9 +146,9 @@ public:
     /* 0x300 */ cXyz m300;
     /* 0x30C */ s16 m30C;
     /* 0x30E */ u8 m30E[0x310 - 0x30E];
-    /* 0x310 */ int m310;
-    /* 0x314 */ int m314;
-    /* 0x318 */ int m318;
+    /* 0x310 */ int mTimer1;
+    /* 0x314 */ int mTimer2;
+    /* 0x318 */ int mBreakFreeCounter;
     /* 0x31C */ dBgS_ObjAcch mAcch;
     /* 0x4E0 */ dBgS_AcchCir mAcchCir;
     /* 0x520 */ dCcD_Stts mStts;
@@ -168,9 +168,9 @@ public:
     /* 0x6E0 */ enemyice mEnemyIce;
     /* 0xA98 */ enemyfire mEnemyFire;
     /* 0xCC0 */ JntHit_c* mpJntHit;
-    /* 0xCC4 */ cXyz mCC4;
-    /* 0xCD0 */ cXyz mCD0;
-    /* 0xCDC */ s16 mCDC;
+    /* 0xCC4 */ cXyz mAttPos;
+    /* 0xCD0 */ cXyz mRdEyePos;
+    /* 0xCDC */ s16 mMaxHeadTurnVel;
     /* 0xCDE */ u8 mCDE[0xCE0 - 0xCDE];
     /* 0xCE0 */ int mCE0;
     /* 0xCE4 */ int mCE4;

include/d/d_lib.h

@@ -90,9 +90,18 @@ bool dLib_pathInfo(dPath**, u8);
 void dLib_pathMove(cXyz*, s8*, dPath*, f32, int (*)(cXyz*, cXyz*, cXyz*, void*), void*);
 void dLib_setNextStageBySclsNum(u8, s8);
 void dLib_setFirstMsg(u16, u32, u32);
-bool dLib_checkPlayerInCircle(cXyz, f32, f32);
-bool dLib_checkActorInCircle(cXyz, fopAc_ac_c*, f32, f32);
-bool dLib_checkActorInFan(cXyz, fopAc_ac_c*, s16, s16, f32, f32);
+/**
+ * Checks if Link is with a circular area.
+ */
+bool dLib_checkPlayerInCircle(cXyz center, f32 radius, f32 halfHeight);
+/**
+ * Checks if an actor is with a circular area.
+ */
+bool dLib_checkActorInCircle(cXyz center, fopAc_ac_c* actor, f32 radius, f32 halfHeight);
+/**
+ * Checks if an actor is with a fan-shaped area (sector of a circle).
+ */
+bool dLib_checkActorInFan(cXyz center, fopAc_ac_c* actor, s16 angleY, s16 fanSpreadAngle, f32 radius, f32 halfHeight);
 u32 dLib_getIplDaysFromSaveTime();
 void dLib_get_QuatFromTriangle(cXyz*, cXyz*, cXyz*);
 void dLib_calc_QuatFromTriangle(Quaternion*, f32, cXyz*, cXyz*, cXyz*);

include/d/d_npc.h

@@ -18,14 +18,14 @@ public:
     /* 0x04 */ f32 m04;
     /* 0x08 */ s16 m08;
     /* 0x0A */ s16 m0A;
-    /* 0x0C */ s16 m0C;
-    /* 0x0E */ s16 m0E;
+    /* 0x0C */ s16 mMaxHeadRot;
+    /* 0x0E */ s16 mMaxBackBoneRot;
     /* 0x10 */ s16 m10;
     /* 0x12 */ s16 m12;
-    /* 0x14 */ s16 m14;
-    /* 0x16 */ s16 m16;
+    /* 0x14 */ s16 mMinHeadRot;
+    /* 0x16 */ s16 mMinBackBoneRot;
     /* 0x18 */ s16 m18;
-    /* 0x1A */ s16 m1A;
+    /* 0x1A */ s16 mMaxHeadTurnVel;
     /* 0x1C */ f32 m1C;
     /* 0x20 */ s16 m20;
     /* 0x22 */ u8 m22;