Setup d_a_e actors (#2157)

* checkpoint

* checkpoint

* checkpoint

* checkpoint

* checkpoint

* checkpoint

* checkpoint

* finish

* add class comments
This commit is contained in:
Pheenoh
2024-05-23 23:31:16 -07:00
committed by GitHub
parent 522c051b1a
commit 38ac3e9227
181 changed files with 6148 additions and 18570 deletions
+43
View File
@@ -1,4 +1,47 @@
#ifndef D_A_E_AI_H
#define D_A_E_AI_H
#include "f_op/f_op_actor_mng.h"
/**
* @ingroup actors-enemies
* @class e_ai_class
* @brief Armos
*
* @details
*
*/
class e_ai_class : public fopEn_enemy_c {
/* 806791BC */ void initCcCylinder();
/* 80679284 */ void setCcCylinder();
/* 80679350 */ void anm_init(int, f32, u8, f32);
/* 806793FC */ void Draw();
/* 806794F4 */ void player_way_check();
/* 80679538 */ void other_bg_check(fopAc_ac_c*);
/* 80679610 */ void pl_check(f32, s16);
/* 8067968C */ void damage_check();
/* 80679DC8 */ void e_ai_damage();
/* 8067A2CC */ void e_ai_attack();
/* 8067A54C */ void e_ai_move();
/* 8067AA48 */ void e_ai_wait();
/* 8067ACA0 */ void e_ai_return();
/* 8067B024 */ void action();
/* 8067B2B0 */ void PlayerWaySet();
/* 8067B31C */ void AttentionSet();
/* 8067B378 */ void Execute();
/* 8067B598 */ void setBaseMtx();
/* 8067B620 */ void Delete();
/* 8067B6F0 */ void CreateHeap();
/* 8067B8E4 */ void Create();
/* 8067BAEC */ e_ai_class();
private:
/* 0x5ac */ u8 field_0x5ac[0xd44 - 0x5ac];
};
STATIC_ASSERT(sizeof(e_ai_class) == 0xd44);
class daE_AI_HIO_c {
/* 8067916C */ daE_AI_HIO_c();
/* 8067BF40 */ ~daE_AI_HIO_c();
};
#endif /* D_A_E_AI_H */
+7 -4
View File
@@ -19,10 +19,13 @@ enum e_arrow_type {
};
/**
* @ingroup actors-enemies
* @brief Enemy arrow
*
*/
* @ingroup actors-enemies
* @class e_arrow_class
* @brief Enemy Arrow
*
* @details
*
*/
class e_arrow_class : public fopEn_enemy_c {
public:
/* 0x5AC */ request_of_phase_process_class mPhase;
+8
View File
@@ -8,6 +8,14 @@
#include "d/cc/d_cc_uty.h"
#include "d/d_path.h"
/**
* @ingroup actors-enemies
* @class e_ba_class
* @brief Keese
*
* @details
*
*/
class e_ba_class : public fopEn_enemy_c {
public:
enum Type {
+7 -4
View File
@@ -44,10 +44,13 @@ struct bee_s {
STATIC_ASSERT(sizeof(bee_s) == 0x74);
/**
* @ingroup actors-enemies
* @brief Bee
*
*/
* @ingroup actors-enemies
* @class e_bee_class
* @brief Bee
*
* @details
*
*/
class e_bee_class : public fopAc_ac_c {
public:
/* 0x0568 */ request_of_phase_process_class mPhase;
+45
View File
@@ -2,5 +2,50 @@
#define D_A_E_BG_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
/**
* @ingroup actors-enemies
* @class daE_BG_c
* @brief Bomb Fish
*
* @details
*
*/
class daE_BG_c : public fopEn_enemy_c {
/* 8068585C */ void ctrlJoint(J3DJoint*, J3DModel*);
/* 80685948 */ void JointCallBack(J3DJoint*, int);
/* 80685994 */ void draw();
/* 80685B70 */ void setBck(int, u8, f32, f32);
/* 80685C14 */ void setActionMode(int, int);
/* 80685C2C */ void damage_check();
/* 80685DBC */ void setSparkEffect();
/* 80685F04 */ void search_esa();
/* 80685F88 */ void executeBorn();
/* 80686210 */ void executeSwim();
/* 80686C90 */ void executeAttack();
/* 80687B38 */ void executeDamage();
/* 80687CD8 */ void setBombCarry(int);
/* 80687DEC */ void executeBomb();
/* 80687FC4 */ void executeBirth();
/* 8068838C */ void executeHook();
/* 806883D0 */ void executeEat();
/* 80689168 */ void action();
/* 80689544 */ void mtx_set();
/* 8068966C */ void cc_set();
/* 806897EC */ void execute();
/* 80689978 */ void _delete();
/* 80689A0C */ void CreateHeap();
/* 80689C38 */ void create();
private:
/* 0x5ac */ u8 field_0x5ac[0xbbc - 0x5ac];
};
STATIC_ASSERT(sizeof(daE_BG_c) == 0xbbc);
class daE_BG_HIO_c {
/* 8068580C */ daE_BG_HIO_c();
/* 8068A19C */ ~daE_BG_HIO_c();
};
#endif /* D_A_E_BG_H */
+21
View File
@@ -1,4 +1,25 @@
#ifndef D_A_E_BI_H
#define D_A_E_BI_H
#include "f_op/f_op_actor_mng.h"
/**
* @ingroup actors-enemies
* @class e_bi_class
* @brief Bomb Insect
*
* @details
*
*/
class e_bi_class : public fopEn_enemy_c {
private:
/* 0x5ac */ u8 field_0x5ac[0xc00 - 0x5ac];
};
STATIC_ASSERT(sizeof(e_bi_class) == 0xc00);
class daE_BI_HIO_c {
/* 8068A5EC */ daE_BI_HIO_c();
/* 8068D2DC */ ~daE_BI_HIO_c();
};
#endif /* D_A_E_BI_H */
@@ -4,10 +4,13 @@
#include "f_op/f_op_actor_mng.h"
/**
* @ingroup actors-enemies
* @brief Bombling Leaf
*
*/
* @ingroup actors-enemies
* @class e_bi_leaf_class
* @brief Bomb Insect - Leaf
*
* @details
*
*/
class e_bi_leaf_class : public fopEn_enemy_c {
public:
/* 0x5AC */ request_of_phase_process_class mPhase;
+21
View File
@@ -1,4 +1,25 @@
#ifndef D_A_E_BS_H
#define D_A_E_BS_H
#include "f_op/f_op_actor_mng.h"
/**
* @ingroup actors-enemies
* @class e_bs_class
* @brief Stalkin
*
* @details
*
*/
class e_bs_class : public fopEn_enemy_c {
private:
/* 0x5ac */ u8 field_0x5ac[0xcfc - 0x5ac];
};
STATIC_ASSERT(sizeof(e_bs_class) == 0xcfc);
class daE_BS_HIO_c {
/* 8068E12C */ daE_BS_HIO_c();
/* 8069091C */ ~daE_BS_HIO_c();
};
#endif /* D_A_E_BS_H */
+21
View File
@@ -1,4 +1,25 @@
#ifndef D_A_E_BU_H
#define D_A_E_BU_H
#include "f_op/f_op_actor_mng.h"
/**
* @ingroup actors-enemies
* @class e_bu_class
* @brief Bubble
*
* @details
*
*/
class e_bu_class : public fopEn_enemy_c {
private:
/* 0x5ac */ u8 field_0x5ac[0xaa4 - 0x5ac];
};
STATIC_ASSERT(sizeof(e_bu_class) == 0xaa4);
class daE_BU_HIO_c {
/* 806911AC */ daE_BU_HIO_c();
/* 806941D4 */ ~daE_BU_HIO_c();
};
#endif /* D_A_E_BU_H */
+26
View File
@@ -2,5 +2,31 @@
#define D_A_E_BUG_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
/**
* @ingroup actors-enemies
* @class e_bug_class
* @brief Poison Mite
*
* @details
*
*/
class e_bug_class : public fopEn_enemy_c {
private:
/* 0x5ac */ u8 field_0x5ac[0x7db0 - 0x5ac];
};
STATIC_ASSERT(sizeof(e_bug_class) == 0x7db0);
class daE_Bug_HIO_c {
/* 80694B8C */ daE_Bug_HIO_c();
/* 80697BEC */ ~daE_Bug_HIO_c();
};
struct bug_s {
/* 80697B4C */ ~bug_s();
/* 80697BB8 */ bug_s();
};
#endif /* D_A_E_BUG_H */
+21
View File
@@ -1,4 +1,25 @@
#ifndef D_A_E_CR_H
#define D_A_E_CR_H
#include "f_op/f_op_actor_mng.h"
/**
* @ingroup actors-enemies
* @class e_cr_class
* @brief Bombskit
*
* @details
*
*/
class e_cr_class : public fopEn_enemy_c {
private:
/* 0x5ac */ u8 field_0x5ac[0xa60 - 0x5ac];
};
STATIC_ASSERT(sizeof(e_cr_class) == 0xa60);
class daE_CR_HIO_c {
/* 8069800C */ daE_CR_HIO_c();
/* 806997F4 */ ~daE_CR_HIO_c();
};
#endif /* D_A_E_CR_H */
@@ -1,4 +1,20 @@
#ifndef D_A_E_CR_EGG_H
#define D_A_E_CR_EGG_H
#include "f_op/f_op_actor_mng.h"
/**
* @ingroup actors-enemies
* @class e_cr_egg_class
* @brief Bombskit Egg
*
* @details
*
*/
class e_cr_egg_class : public fopEn_enemy_c {
private:
/* 0x5ac */ u8 field_0x5ac[0xa0c - 0x5ac];
};
STATIC_ASSERT(sizeof(e_cr_egg_class) == 0xa0c);
#endif /* D_A_E_CR_EGG_H */
+21
View File
@@ -1,4 +1,25 @@
#ifndef D_A_E_DB_H
#define D_A_E_DB_H
#include "f_op/f_op_actor_mng.h"
/**
* @ingroup actors-enemies
* @class e_db_class
* @brief Deku Baba
*
* @details
*
*/
class e_db_class : public fopEn_enemy_c {
private:
/* 0x5ac */ u8 field_0x5ac[0x1270 - 0x5ac];
};
STATIC_ASSERT(sizeof(e_db_class) == 0x1270);
class daE_DB_HIO_c {
/* 8069AAEC */ daE_DB_HIO_c();
/* 806A13D8 */ ~daE_DB_HIO_c();
};
#endif /* D_A_E_DB_H */
@@ -5,10 +5,13 @@
#include "dolphin/types.h"
/**
* @ingroup actors-enemies
* @brief Deku Baba Leaf
*
*/
* @ingroup actors-enemies
* @class e_db_leaf_class
* @brief Deku Baba - Leaf
*
* @details
*
*/
class e_db_leaf_class : public fopEn_enemy_c {
public:
/* 0x5AC */ request_of_phase_process_class mPhase;
+21
View File
@@ -1,4 +1,25 @@
#ifndef D_A_E_DD_H
#define D_A_E_DD_H
#include "f_op/f_op_actor_mng.h"
/**
* @ingroup actors-enemies
* @class e_dd_class
* @brief Dodongo
*
* @details
*
*/
class e_dd_class : public fopEn_enemy_c {
private:
/* 0x5ac */ u8 field_0x5ac[0xe94 - 0x5ac];
};
STATIC_ASSERT(sizeof(e_dd_class) == 0xe94);
class daE_DD_HIO_c {
/* 806A226C */ daE_DD_HIO_c();
/* 806A6D08 */ ~daE_DD_HIO_c();
};
#endif /* D_A_E_DD_H */
+49
View File
@@ -1,4 +1,53 @@
#ifndef D_A_E_DF_H
#define D_A_E_DF_H
#include "f_op/f_op_actor_mng.h"
/**
* @ingroup actors-enemies
* @class daE_DF_c
* @brief Deku Flower
*
* @details
*
*/
class daE_DF_c : public fopEn_enemy_c {
/* 806A7710 */ void CreateHeap();
/* 806A7828 */ void initCcCylinder();
/* 806A78A0 */ void setCcCylinder();
/* 806A78D4 */ void SetAnm(int, int, f32, f32);
/* 806A7980 */ void CameraSet(f32);
/* 806A7B40 */ void DemoStart();
/* 806A7C3C */ void SetReleaseCam();
/* 806A7CE0 */ void ctrlJoint(J3DJoint*, J3DModel*);
/* 806A8030 */ void Link_Eat_Pos();
/* 806A8098 */ void Set_Angle(cXyz*);
/* 806A816C */ void Obj_Damage();
/* 806A8244 */ void DamageAction();
/* 806A8368 */ void BombEatAction();
/* 806A8790 */ void Spid_Out();
/* 806A8938 */ void LinkEatAction();
/* 806A8C80 */ void Mogu_Mogu();
/* 806A8D98 */ void ObjEatAction();
/* 806A8ED4 */ void EatAction();
/* 806A8F2C */ void SearchAction();
/* 806A91B4 */ void WaitAction();
/* 806A9254 */ void MissAction();
/* 806A9304 */ void Action();
/* 806A9384 */ void Execute();
/* 806A949C */ void Yazirushi();
/* 806A94E0 */ void Draw();
/* 806A9550 */ void Delete();
/* 806A95B8 */ void setBaseMtx();
/* 806A9678 */ void Create();
private:
/* 0x5ac */ u8 field_0x5ac[0x838 - 0x5ac];
};
STATIC_ASSERT(sizeof(daE_DF_c) == 0x838);
class daE_DF_HIO_c {
/* 806A76EC */ daE_DF_HIO_c();
/* 806A9A84 */ ~daE_DF_HIO_c();
};
#endif /* D_A_E_DF_H */
+47
View File
@@ -2,5 +2,52 @@
#define D_A_E_DK_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
/**
* @ingroup actors-enemies
* @class daE_DK_c
* @brief Bari
*
* @details
*
*/
class daE_DK_c : public fopEn_enemy_c {
/* 806AA228 */ void draw();
/* 806AA5C8 */ void setBck(int, u8, f32, f32);
/* 806AA68C */ void setBckCore(int, u8, f32, f32);
/* 806AA730 */ void setActionMode(int, int);
/* 806AA73C */ void damage_check();
/* 806AA8B0 */ void checkPlayerSearch();
/* 806AAB18 */ void checkPlayerAttack(f32);
/* 806AAC24 */ void checkWaterHeight();
/* 806AAD68 */ void SphBgcCallBack(dBgS_SphChk*, cBgD_Vtx_t*, int, int, int, cM3dGPla*, void*);
/* 806AAE10 */ void setElectricEffect();
/* 806AB054 */ void setCoreDeadEffect();
/* 806AB158 */ void setBodyDeadEffect();
/* 806AB29C */ void executeWait();
/* 806AB684 */ void executeChase();
/* 806ABA78 */ void executeAttack();
/* 806ABCC8 */ void executeDamage();
/* 806ABE3C */ void BodyDeathMove();
/* 806ABF6C */ void executeDeath();
/* 806AC390 */ void action();
/* 806AC5BC */ void mtx_set();
/* 806AC754 */ void cc_set();
/* 806AC968 */ void execute();
/* 806ACA10 */ void _delete();
/* 806ACAA4 */ void CreateHeap();
/* 806ACE14 */ void create();
/* 806AD0AC */ daE_DK_c();
private:
/* 0x5ac */ u8 field_0x5ac[0xd54 - 0x5ac];
};
STATIC_ASSERT(sizeof(daE_DK_c) == 0xd54);
class daE_DK_HIO_c {
/* 806AA1EC */ daE_DK_HIO_c();
/* 806AD490 */ ~daE_DK_HIO_c();
};
#endif /* D_A_E_DK_H */
+22
View File
@@ -1,4 +1,26 @@
#ifndef D_A_E_DN_H
#define D_A_E_DN_H
#include "f_op/f_op_actor_mng.h"
/**
* @ingroup actors-enemies
* @class e_dn_class
* @brief Lizalfos
*
* @details
*
*/
class e_dn_class : public fopEn_enemy_c {
/* 804EDE58 */ e_dn_class();
private:
/* 0x5ac */ u8 field_0x5ac[0x110c - 0x5ac];
};
STATIC_ASSERT(sizeof(e_dn_class) == 0x110c);
class daE_DN_HIO_c {
/* 804E51AC */ daE_DN_HIO_c();
/* 804EE39C */ ~daE_DN_HIO_c();
};
#endif /* D_A_E_DN_H */
+88
View File
@@ -2,5 +2,93 @@
#define D_A_E_DT_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
/**
* @ingroup actors-enemies
* @class daE_DT_c
* @brief Deku Toad
*
* @details
*
*/
class daE_DT_c : public fopEn_enemy_c {
/* 806AD97C */ void ctrlJoint(J3DJoint*, J3DModel*);
/* 806ADBA0 */ void JointCallBack(J3DJoint*, int);
/* 806ADBEC */ void ctrlJointTuba(J3DJoint*, J3DModel*);
/* 806ADD30 */ void JointCallBackTuba(J3DJoint*, int);
/* 806ADD7C */ void draw();
/* 806AE5C8 */ void demo_skip(int);
/* 806AE618 */ void DemoSkipCallBack(void*, int);
/* 806AE64C */ void setBck(int, u8, f32, f32);
/* 806AE6F0 */ void checkBck(int);
/* 806AE74C */ void setActionMode(int, int);
/* 806AE758 */ void damage_check();
/* 806AEB48 */ void setStabPos();
/* 806AEBD4 */ void checkBeforeBg(f32);
/* 806AED94 */ void checkTongueBg();
/* 806AEEFC */ void checkWaterSurface();
/* 806AEFE8 */ void setSmallWaterEffect();
/* 806AF09C */ void setLargeWaterEffect();
/* 806AF150 */ void setHamonEffect(int);
/* 806AF240 */ void setJumpEffect();
/* 806AF2F4 */ void setJumpSizukuEffect();
/* 806AF3D0 */ void setDamageShibukiEffect(int);
/* 806AF460 */ void setDamageYodareEffect(int);
/* 806AF548 */ void setSwingEffect();
/* 806AF5CC */ void setStepEffect();
/* 806AF740 */ void setBombEffect();
/* 806AF848 */ void setBombSmokeEffect();
/* 806AF924 */ void setDeadShibukiEffect();
/* 806AF9D8 */ void setDeadYodareEffect();
/* 806AFAE0 */ void setBoxTubaEffect();
/* 806AFBBC */ void setBoxTubaLandEffect();
/* 806AFD30 */ void getNumberOfOtama();
/* 806AFE24 */ void setStayOtamaFall();
/* 806AFEAC */ void setStayOtamaDelete();
/* 806B0114 */ void checkBombEat();
/* 806B01B4 */ void isShutterOpen();
/* 806B0200 */ void executeWait();
/* 806B0368 */ void executeCry();
/* 806B063C */ void executeShake();
/* 806B07C4 */ void executeWalk();
/* 806B0E9C */ void executeJump();
/* 806B177C */ void executeDown();
/* 806B1B60 */ void executeSearch();
/* 806B1BEC */ void executeDamage();
/* 806B1D48 */ void executeBombDamage();
/* 806B1F78 */ void executeDeath();
/* 806B28E4 */ void pointInSight(cXyz*);
/* 806B29D4 */ void executeOpening();
/* 806B3B08 */ void calcCamera();
/* 806B40D8 */ void calcBoxAndTuba();
/* 806B4724 */ void action();
/* 806B49F0 */ void mtx_set();
/* 806B4B24 */ void cc_set();
/* 806B4FD8 */ void execute();
/* 806B5158 */ void _delete();
/* 806B5214 */ void CreateHeap();
/* 806B5460 */ void create();
private:
/* 0x5ac */ u8 field_0x5ac[0x1174 - 0x5ac];
};
STATIC_ASSERT(sizeof(daE_DT_c) == 0x1174);
class daE_DT_HIO_c {
/* 806AD90C */ daE_DT_HIO_c();
/* 806B5BDC */ ~daE_DT_HIO_c();
};
struct E_DT_n {
static u8 eDt_ShakeFrame[40];
static u8 eDt_ShakeFrameDemo[40];
static u8 cc_dt_body_src[64];
static u8 cc_dt_tongue_src[64];
static u8 mDt_OtamaNum[4];
static u8 mDt_OtamaNo[80];
static u8 m_fall_no[4];
static u8 m_tongue_pos[12];
};
#endif /* D_A_E_DT_H */
+43
View File
@@ -2,5 +2,48 @@
#define D_A_E_FB_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
/**
* @ingroup actors-enemies
* @class daE_FB_c
* @brief Freezard
*
* @details
*
*/
class daE_FB_c : public fopEn_enemy_c {
/* 806B6520 */ void ctrlJoint(J3DJoint*, J3DModel*);
/* 806B65C0 */ void JointCallBack(J3DJoint*, int);
/* 806B660C */ void draw();
/* 806B67E0 */ void setBck(int, u8, f32, f32);
/* 806B688C */ void setActionMode(int, int);
/* 806B6898 */ void damage_check();
/* 806B6D20 */ void mBgLineCheck();
/* 806B6DF4 */ void search_check();
/* 806B6F40 */ void executeWait();
/* 806B70FC */ void executeAttack();
/* 806B78A0 */ void executeDamage();
/* 806B7B88 */ void executeBullet();
/* 806B7DDC */ void action();
/* 806B80A4 */ void mtx_set();
/* 806B811C */ void cc_set();
/* 806B82B4 */ void normal_eff_set();
/* 806B83F0 */ void dead_eff_set();
/* 806B8518 */ void execute();
/* 806B85C8 */ void _delete();
/* 806B8678 */ void CreateHeap();
/* 806B88E0 */ void create();
/* 806B8C1C */ daE_FB_c();
private:
/* 0x5ac */ u8 field_0x5ac[0xce8 - 0x5ac];
};
STATIC_ASSERT(sizeof(daE_FB_c) == 0xce8);
class daE_FB_HIO_c {
/* 806B64AC */ daE_FB_HIO_c();
/* 806B8EE4 */ ~daE_FB_HIO_c();
};
#endif /* D_A_E_FB_H */

Some files were not shown because too many files have changed in this diff Show More