d_a_e_yc OK (#2143)

include/d/a/d_a_player.h

@@ -303,14 +303,14 @@ public:
         FLG2_PLAYER_SHADOW = 0x400,
         FLG2_UNK_200 = 0x200,
         FLG2_UNK_80 = 0x80,
-        FLG2_UNK_40 = 0x40,
+        FLG2_WOLF_ENEMY_HANG_BITE = 0x40,
         FLG2_WOLF_ENEMY_LEFT_THROW = 0x20,
         FLG2_UNK_10 = 0x10,
         FLG2_UNK_8 = 8,
         FLG2_UNK_2 = 2,
         FLG2_UNK_1 = 1,
 
-        FLG2_UNK_58 = FLG2_UNK_40 | FLG2_UNK_10 | FLG2_UNK_8,
+        FLG2_UNK_58 = FLG2_WOLF_ENEMY_HANG_BITE | FLG2_UNK_10 | FLG2_UNK_8,
         FLG2_UNK_10000001 = FLG2_UNK_10000000 | FLG2_UNK_1,
     };
 
@@ -753,6 +753,8 @@ public:
     void onFogFade() { onNoResetFlg2(FLG2_UNK_4000); }
     BOOL checkStickArrowReset() const { return checkResetFlg0(RFLG0_UNK_1); }
 
+    void offWolfEnemyHangBite() { offNoResetFlg2(FLG2_WOLF_ENEMY_HANG_BITE); }
+
     void setCanoeSlider() { mSpecialMode = 0x2D; }
     
     void offCanoeSlider() {

include/d/cc/d_cc_uty.h

@@ -1,9 +1,11 @@
 #ifndef D_CC_D_CC_UTY_H
 #define D_CC_D_CC_UTY_H
 
-#include "d/com/d_com_inf_game.h"
+#include "dolphin/types.h"
 
+class cCcD_Obj;
 class fopAc_ac_c;
+class Z2Creature;
 
 enum dCcU_AtType {
     /* 0x01 */ HIT_TYPE_LINK_NORMAL_ATTACK = 1,

include/f_op/f_op_actor.h

@@ -241,6 +241,7 @@ public:
 
     bool checkWolfNoLock() const { return mFlags & 0x200; }
     bool checkHeadLockFlg() const { return mFlags & 0x80; }
+    bool checkWolfBiteDamage() const { return mFlags & 0x40; }
     bool checkDownFlg() const { return mFlags & 0x1; }
     bool checkCutDownHitFlg() const { return mFlags & 0x2; }
     bool checkDeadFlg() const { return mFlags & 0x8; }
@@ -257,6 +258,7 @@ public:
     void onWolfNoLock() { mFlags |= 0x200; }
     void onDownFlg() { mFlags |= 1; }
 
+    void offWolfBiteDamage() { mFlags &= ~0x40; }
     void offCutDownHitFlg() { mFlags &= ~0x2; }
     void offDownFlg() { mFlags &= ~0x17; }
 

include/rel/d/a/b/d_a_b_ds/d_a_b_ds.h

@@ -1,7 +1,11 @@
 #ifndef D_A_B_DS_H
 #define D_A_B_DS_H
 
+#include "SSystem/SComponent/c_phase.h"
 #include "Z2AudioLib/Z2Creature.h"
+#include "f_op/f_op_actor.h"
+#include "d/bg/d_bg_s_acch.h"
+#include "d/cc/d_cc_d.h"
 #include "d/cc/d_cc_uty.h"
 #include "d/msg/d_msg_flow.h"
 #include "m_Do/m_Do_ext.h"

include/rel/d/a/b/d_a_b_go/d_a_b_go.h

@@ -1,7 +1,11 @@
 #ifndef D_A_B_GO_H
 #define D_A_B_GO_H
 
+#include "SSystem/SComponent/c_phase.h"
 #include "Z2AudioLib/Z2Creature.h"
+#include "f_op/f_op_actor.h"
+#include "d/bg/d_bg_s_acch.h"
+#include "d/cc/d_cc_d.h"
 #include "d/cc/d_cc_uty.h"
 
 #define GORON_CHILD_MAX 31

include/rel/d/a/b/d_a_b_gos/d_a_b_gos.h

@@ -1,7 +1,10 @@
 #ifndef D_A_B_GOS_H
 #define D_A_B_GOS_H
 
+#include "SSystem/SComponent/c_phase.h"
 #include "Z2AudioLib/Z2Creature.h"
+#include "d/bg/d_bg_s_acch.h"
+#include "d/cc/d_cc_d.h"
 #include "d/cc/d_cc_uty.h"
 #include "f_op/f_op_actor_mng.h"
 

include/rel/d/a/b/d_a_b_ob/d_a_b_ob.h

@@ -1,7 +1,11 @@
 #ifndef D_A_B_OB_H
 #define D_A_B_OB_H
 
+#include "SSystem/SComponent/c_phase.h"
 #include "Z2AudioLib/Z2Creature.h"
+#include "f_op/f_op_actor.h"
+#include "d/bg/d_bg_s_acch.h"
+#include "d/cc/d_cc_d.h"
 #include "d/cc/d_cc_uty.h"
 
 struct ob_part_s {

include/rel/d/a/b/d_a_b_oh/d_a_b_oh.h

@@ -1,6 +1,9 @@
 #ifndef D_A_B_OH_H
 #define D_A_B_OH_H
 
+#include "SSystem/SComponent/c_phase.h"
+#include "f_op/f_op_actor.h"
+#include "d/cc/d_cc_d.h"
 #include "d/cc/d_cc_uty.h"
 
 class daB_OH_HIO_c {

include/rel/d/a/e/d_a_e_fz/d_a_e_fz.h

@@ -9,10 +9,13 @@
 #ifndef D_A_E_FZ_H
 #define D_A_E_FZ_H
 
+#include "SSystem/SComponent/c_phase.h"
 #include "Z2AudioLib/Z2Creature.h"
+#include "f_op/f_op_actor.h"
+#include "d/bg/d_bg_s_acch.h"
+#include "d/cc/d_cc_d.h"
 #include "d/cc/d_cc_uty.h"
 #include "m_Do/m_Do_hostIO.h"
-#include "rel/d/a/b/d_a_b_yo/d_a_b_yo.h"
 
 /**
  * @enum daE_FZ_Action

include/rel/d/a/e/d_a_e_nest/d_a_e_nest.h

@@ -1,6 +1,9 @@
 #ifndef D_A_E_NEST_H
 #define D_A_E_NEST_H
 
+#include "SSystem/SComponent/c_phase.h"
+#include "f_op/f_op_actor.h"
+#include "d/cc/d_cc_d.h"
 #include "d/cc/d_cc_uty.h"
 #include "d/bg/d_bg_s_acch.h"
 #include "Z2AudioLib/Z2Creature.h"

include/rel/d/a/e/d_a_e_ph/d_a_e_ph.h

@@ -1,7 +1,11 @@
 #ifndef D_A_E_PH_H
 #define D_A_E_PH_H
 
+#include "SSystem/SComponent/c_phase.h"
 #include "Z2AudioLib/Z2Creature.h"
+#include "f_op/f_op_actor.h"
+#include "d/bg/d_bg_s_acch.h"
+#include "d/cc/d_cc_d.h"
 #include "d/cc/d_cc_uty.h"
 #include "d/d_path.h"
 

include/rel/d/a/e/d_a_e_rdy/d_a_e_rdy.h

@@ -1,4 +1,20 @@
 #ifndef D_A_E_RDY_H
 #define D_A_E_RDY_H
 
+#include "f_op/f_op_actor.h"
+
+class e_rdy_class : public fopEn_enemy_c {
+public:
+    /* 80779340 */ e_rdy_class();
+
+    /* 0x05AC */ u8 field_0x5ac[0xa8f - 0x5ac];
+    /* 0x0A8F */ u8 field_0xa8f;
+    /* 0x0A90 */ u8 field_0xa90[0x1370 - 0xa90];
+    /* 0x1370 */ s16 field_0x1370;
+    /* 0x1372 */ s16 field_0x1372;
+    /* 0x1374 */ u8 field_0x1374[0x142c - 0x1374];
+};
+
+STATIC_ASSERT(sizeof(e_rdy_class) == 0x142C);
+
 #endif /* D_A_E_RDY_H */

include/rel/d/a/e/d_a_e_wb/d_a_e_wb.h

@@ -2,6 +2,7 @@
 #define D_A_E_WB_H
 
 #include "rel/d/a/d_a_horse/d_a_horse.h"
+#include "SSystem/SComponent/c_phase.h"
 #include "d/cc/d_cc_uty.h"
 
 enum daE_wb_ACT {

include/rel/d/a/e/d_a_e_yc/d_a_e_yc.h

@@ -1,6 +1,13 @@
 #ifndef D_A_E_YC_H
 #define D_A_E_YC_H
 
+#include "SSystem/SComponent/c_phase.h"
+#include "Z2AudioLib/Z2Creature.h"
+#include "d/bg/d_bg_s_acch.h"
+#include "d/cc/d_cc_d.h"
+#include "d/cc/d_cc_uty.h"
+#include "f_op/f_op_actor.h"
+
 /**
 * @ingroup actors-enemies
 * @brief Twilit Kargorok
@@ -8,42 +15,83 @@
 */
 class e_yc_class : public fopEn_enemy_c {
 public:
-    MtxP getLegR3Mtx() { return field_0x5B8->getModel()->getAnmMtx(28); }
+    MtxP getLegR3Mtx() { return mpMorf->getModel()->getAnmMtx(28); }
 
-    /* 0x5AC */ u8 field_0x5ac[0x5B8 - 0x5AC];
-    /* 0x5B8 */ mDoExt_McaMorfSO* field_0x5B8;
-    /* 0x5BC */ Z2CreatureEnemy mEnemy;
+    /* 0x5AC */ request_of_phase_process_class mPhase;
+    /* 0x5B4 */ u8 mParam;
+    /* 0x5B8 */ mDoExt_McaMorfSO* mpMorf;
+    /* 0x5BC */ Z2CreatureEnemy mCreatureSound;
     /* 0x660 */ int mAnm;
-    /* 0x664 */ int field_0x664;
-    /* 0x668 */ u8 field_0x668[6];
-    /* 0x66E */ s16 mCurrentAction;
-    /* 0x670 */ s16 field_0x670;
-    /* 0x672 */ u8 field_0x672[2];
-    /* 0x674 */ f32 field_0x674;
-    /* 0x678 */ f32 field_0x678;
-    /* 0x67C */ f32 field_0x67C;
-    /* 0x680 */ s16 field_0x680;
-    /* 0x682 */ u8 field_0x682[2];
-    /* 0x684 */ f32 field_0x684;
-    /* 0x688 */ u32 field_0x688;
-    /* 0x68C */ u8 field_0x68C[4];
-    /* 0x690 */ f32 field_0x690;
-    /* 0x694 */ u8 field_0x694[28];
-    /* 0x69C */ f32 field_0x69C;
-    /* 0x6A0 */ s16 field_0x6A0;
-    /* 0x6A2 */ s16 field_0x6A2;
-    /* 0x6A4 */ s16 field_0x6A4;
-    /* 0x6A6 */ s16 field_0x6A6;
-    /* 0x6A8 */ s16 field_0x6A8;
-    /* 0x6AA */ s16 field_0x6AA;
-    /* 0x6AC */ void* field_0x6AC;
-    /* 0x6B0 */ u8 field_0x6B0[72];    
-    /* 0x6F4 */ dBgS_Acch mBgS_Acch;
-    /* 0x8CC */ u8 field_0x8CC[28];
-    /* 0x8E8 */ dCcD_GStts mCcD_GStts;
-    /* 0x908 */ dCcD_GObjInf mCcD_GObjInf;
-    /* 0xA0C */ u8 field_0xA0C[364];
-    /* 0xB78 */ cCcD_Obj* mpTgHitObj;
+    /* 0x664 */ int mFlyAnmMode;
+    /* 0x668 */ u32 mShadowKey;
+    /* 0x66C */ s16 mCounter;
+    /* 0x66E */ s16 mAction;
+    /* 0x670 */ s16 mMode;
+    /* 0x674 */ cXyz mTargetPos;
+    /* 0x680 */ s16 mAngleToPlayer;
+    /* 0x684 */ f32 mDistToPlayer;
+    /* 0x688 */ f32 mAngleSpeedRatio;
+    /* 0x68C */ f32 mAngleXSpeedRatio;
+    /* 0x690 */ f32 mMaxAngleSpeed;
+    /* 0x694 */ f32 field_0x694;
+    /* 0x698 */ f32 field_0x698;
+    /* 0x69C */ f32 field_0x69c;
+    /* 0x6A0 */ s16 field_0x6a0;
+    /* 0x6A2 */ s16 mTimer[4];
+    /* 0x6AA */ s16 mCcDisableTimer;
+    /* 0x6AC */ u32 mRiderID;
+    /* 0x6B0 */ u8 field_0x6b0[2];
+    /* 0x6B2 */ s8 mNoDrawFlag;
+    /* 0x6B3 */ s8 mWolfBiteDamageCount;
+    /* 0x6B4 */ dBgS_AcchCir mAcchCir;    
+    /* 0x6F4 */ dBgS_ObjAcch mAcch;
+    /* 0x8CC */ dCcD_Stts mCcStts;
+    /* 0x908 */ dCcD_Sph mCcSph;
+    /* 0xA40 */ dCcD_Sph mAtSph;
+    /* 0xB78 */ dCcU_AtInfo mAtInfo;
+    /* 0xB9C */ u32 mParticleKey[2];
+    /* 0xBA4 */ bool mHIOInit;
+
+    enum Action {
+        /* 0x00 */ ACT_FLY,
+        /* 0x0A */ ACT_F_FLY = 10,
+        /* 0x0B */ ACT_HOVERING,
+        /* 0x0C */ ACT_ATTACK,
+        /* 0x14 */ ACT_WOLFBITE = 20,
+    };
+
+    enum Animation {
+        /* 0x04 */ ANM_CATCH_END = 4,
+        /* 0x05 */ ANM_CATCH_MIDDLE,
+        /* 0x06 */ ANM_CATCH_START,
+        /* 0x07 */ ANM_CRASH,
+        /* 0x08 */ ANM_CRASH2,
+        /* 0x09 */ ANM_FLY,
+        /* 0x0A */ ANM_FLY_BRAKE,
+        /* 0x0B */ ANM_FLY_DASH_WL,
+        /* 0x0C */ ANM_FLY_GLIDE,
+        /* 0x0D */ ANM_FLY_GLIDE_WL,
+        /* 0x0E */ ANM_FLY_LIMIT_WL,
+        /* 0x0F */ ANM_FLY_WL,
+        /* 0x10 */ ANM_HANGED,
+        /* 0x11 */ ANM_HANGED_BRUSH,
+        /* 0x12 */ ANM_HANGED_BRUSH2,
+        /* 0x13 */ ANM_HANGED_DAMAGE,
+        /* 0x14 */ ANM_HANGED_WAIT,
+        /* 0x15 */ ANM_HOVERING,
+    };
 };
 
+STATIC_ASSERT(sizeof(e_yc_class) == 0xBA8);
+
+struct daE_YC_HIO_c {
+    /* 807EFECC */ daE_YC_HIO_c();
+    /* 807F27BC */ virtual ~daE_YC_HIO_c() {}
+
+    /* 0x4 */ s8 field_0x4;
+    /* 0x8 */ f32 mScale;
+};
+
+STATIC_ASSERT(sizeof(daE_YC_HIO_c) == 0xC);
+
 #endif /* D_A_E_YC_H */

include/rel/d/a/e/d_a_e_yk/d_a_e_yk.h

@@ -8,7 +8,11 @@
 #ifndef D_A_E_YK_H
 #define D_A_E_YK_H
 
+#include "SSystem/SComponent/c_phase.h"
 #include "Z2AudioLib/Z2Creature.h"
+#include "f_op/f_op_actor.h"
+#include "d/bg/d_bg_s_acch.h"
+#include "d/cc/d_cc_d.h"
 #include "d/cc/d_cc_uty.h"
 #include "d/d_path.h"
 

include/rel/d/a/e/d_a_e_ym/d_a_e_ym.h

@@ -1,8 +1,13 @@
 #ifndef D_A_E_YM_H
 #define D_A_E_YM_H
 
+#include "SSystem/SComponent/c_phase.h"
 #include "Z2AudioLib/Z2Creature.h"
+#include "f_op/f_op_actor.h"
+#include "d/bg/d_bg_s_acch.h"
+#include "d/cc/d_cc_d.h"
 #include "d/cc/d_cc_uty.h"
+#include "d/d_path.h"
 
 class daE_YM_HIO_c {
 public:

include/rel/d/a/npc/d_a_npc_tk/d_a_npc_tk.h

@@ -1,6 +1,7 @@
 #ifndef D_A_NPC_TK_H
 #define D_A_NPC_TK_H
 
+#include "f_op/f_op_actor_mng.h"
 #include "d/d_path.h"
 
 struct cXyz;