d_a_e_fz work, doxygen revamp (#2127)

* initial freezard actor struct + setActionMode OK

* daE_FZ_Draw

* setReflectAngle

* mBoundSoundset

* daE_FZ_Execute & execute

* demoDelete

* daE_FZ_Delete & _delete

* CreateHeap

* useHeapInit

* cc_set

* mtx_set

* action WIP

* way_gake_check

* executeRollMove

* executeMove

* draw WIP

* executeDamage

* checkpoint

* create

* checkpoint

* daE_FZ_c::executeWait

* checkpoint

* daE_FZ_c::damage_check almost done

* rm asm

* rm headers

* setup_profile WIP + doxygen update

* fix merge issues

* docs fix?

* fix2

* doxygen updates

* setup g_profile_E_FZ, profile setup script WIP

* update github actions

* update progress.md
This commit is contained in:
Pheenoh
2024-04-12 00:10:30 -06:00
committed by GitHub
parent b36f0f9366
commit a61e3491f7
1245 changed files with 16183 additions and 9396 deletions
-2
View File
@@ -1,6 +1,4 @@
#ifndef D_A_B_BH_H
#define D_A_B_BH_H
#include "dolphin/types.h"
#endif /* D_A_B_BH_H */
-2
View File
@@ -1,6 +1,4 @@
#ifndef D_A_B_BQ_H
#define D_A_B_BQ_H
#include "dolphin/types.h"
#endif /* D_A_B_BQ_H */
+7 -2
View File
@@ -1,8 +1,13 @@
#ifndef D_A_B_DR_H
#define D_A_B_DR_H
#include "f_op/f_op_actor_mng.h"
/**
* @ingroup actors-enemies
* @brief Argorok
*
* City in the Sky dungeon boss.
*
*/
class daB_DR_c : public fopEn_enemy_c {
public:
/* 805BAF80 */ void ctrlJoint(J3DJoint*, J3DModel*);
+7 -4
View File
@@ -1,15 +1,18 @@
#ifndef D_A_B_DS_H
#define D_A_B_DS_H
#include "SSystem/SComponent/c_phase.h"
#include "f_op/f_op_actor.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 "d/msg/d_msg_flow.h"
#include "m_Do/m_Do_ext.h"
/**
* @ingroup actors-enemies
* @brief Stallord
*
* Arbiter's Grounds dungeon boss.
*
*/
class daB_DS_c : public fopEn_enemy_c {
public:
enum Arg0 {
-2
View File
@@ -1,6 +1,4 @@
#ifndef D_A_B_GG_H
#define D_A_B_GG_H
#include "dolphin/types.h"
#endif /* D_A_B_GG_H */
-2
View File
@@ -1,6 +1,4 @@
#ifndef D_A_B_GM_H
#define D_A_B_GM_H
#include "dolphin/types.h"
#endif /* D_A_B_GM_H */
+7 -3
View File
@@ -1,9 +1,6 @@
#ifndef D_A_B_GND_H
#define D_A_B_GND_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 "f_op/f_op_actor_mng.h"
@@ -14,6 +11,13 @@ struct g_himo_s {
/* 0x0 */ cXyz field_0x0[16];
};
/**
* @ingroup actors-enemies
* @brief Ganondorf
*
* Hyrule Castle dungeon boss.
*
*/
class b_gnd_class : public fopEn_enemy_c {
public:
/* 80601960 */ b_gnd_class();
+7 -2
View File
@@ -1,13 +1,18 @@
#ifndef D_A_B_GO_H
#define D_A_B_GO_H
#include "f_op/f_op_actor_mng.h"
#include "Z2AudioLib/Z2Creature.h"
#include "d/cc/d_cc_d.h"
#include "d/cc/d_cc_uty.h"
#define GORON_CHILD_MAX 31
/**
* @ingroup actors-enemies
* @brief Goron Golem
*
* Unused golem boss made up of several small Gorons.
*
*/
class b_go_class : public fopEn_enemy_c {
public:
/* 80603CA0 */ b_go_class();
+7 -1
View File
@@ -2,10 +2,16 @@
#define D_A_B_GOS_H
#include "Z2AudioLib/Z2Creature.h"
#include "d/cc/d_cc_d.h"
#include "d/cc/d_cc_uty.h"
#include "f_op/f_op_actor_mng.h"
/**
* @ingroup actors-enemies
* @brief Goron Golem (small)
*
* Unused golem boss made up of several small Gorons.
*
*/
class b_gos_class : public fopEn_enemy_c {
public:
/* 80605024 */ b_gos_class();
+7
View File
@@ -32,6 +32,13 @@ struct ob_ke_s {
/* 0x1E0 */ cXyz field_0x1e0;
}; // Size: 0x1EC
/**
* @ingroup actors-enemies
* @brief Morpheel (body)
*
* Lakebed Temple dungeon boss. This is the body part of the boss.
*
*/
class b_ob_class : public fopEn_enemy_c {
public:
/* 8061A0C0 */ b_ob_class();
+7
View File
@@ -13,6 +13,13 @@ public:
/* 0xC */ f32 mLength;
};
/**
* @ingroup actors-enemies
* @brief Morpheel (head)
*
* Lakebed Temple dungeon boss. This is the head part of the boss.
*
*/
class b_oh_class : public fopEn_enemy_c {
public:
/* 0x05AC */ request_of_phase_process_class mPhase;
+7
View File
@@ -3,6 +3,13 @@
#include "rel/d/a/b/d_a_b_ob/d_a_b_ob.h"
/**
* @ingroup actors-enemies
* @brief Morpheel (tentacle)
*
* Lakebed Temple dungeon boss. This is the tentacle part of the boss.
*
*/
class b_oh2_class : public fopEn_enemy_c {
public:
/* 0x5AC */ request_of_phase_process_class mPhase;
+7 -1
View File
@@ -1,7 +1,13 @@
#ifndef D_A_B_ZANT_H
#define D_A_B_ZANT_H
/**
* @ingroup actors-enemies
* @brief Zant
*
* Palace of Twilight dungeon boss.
*
*/
class daB_ZANT_c : public fopAc_ac_c {
public:
/* 8063E19C */ void ctrlJoint(J3DJoint*, J3DModel*);
@@ -2,9 +2,15 @@
#define D_A_B_ZANT_SIMA_H
#include "d/bg/d_bg_w.h"
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
/**
* @ingroup actors-enemies
* @brief Zant (Goron Mines Phase)
*
* Palace of Twilight dungeon boss. This is the actor used during the Goron Mines part of the fight.
*
*/
class daB_ZANTS_c : public fopAc_ac_c {
public:
/* 806529D8 */ int draw();
-1
View File
@@ -1,7 +1,6 @@
#ifndef D_A_ANDSW_H
#define D_A_ANDSW_H
#include "f_op/f_op_actor_mng.h"
#include "d/com/d_com_inf_game.h"
class daAndsw_c : public fopAc_ac_c {
-2
View File
@@ -2,9 +2,7 @@
#define D_A_ARROW_H
#include "d/a/d_a_player.h"
#include "d/d_procname.h"
#include "d/cc/d_cc_d.h"
#include "d/bg/d_bg_s_lin_chk.h"
#include "d/particle/d_particle.h"
#include "f_op/f_op_actor_mng.h"
-1
View File
@@ -1,6 +1,5 @@
#ifndef D_A_BD_H
#define D_A_BD_H
#include "dolphin/types.h"
#endif /* D_A_BD_H */
@@ -2,9 +2,6 @@
#define D_A_BOOMERANG_H
#include "JSystem/J2DGraph/J2DScreen.h"
#include "d/bg/d_bg_s_acch.h"
#include "d/bg/d_bg_s_lin_chk.h"
#include "d/cc/d_cc_d.h"
#include "d/particle/d_particle_copoly.h"
#include "f_op/f_op_actor_mng.h"
@@ -62,6 +59,13 @@ private:
class daAlink_c;
/**
* @ingroup actors-items
* @brief Gale Boomerang
*
* Forest Temple dungeon item.
*
*/
class daBoomerang_c : public fopAc_ac_c {
public:
enum daBoomerang_FLG0 {
-1
View File
@@ -4,7 +4,6 @@
#include "f_op/f_op_actor_mng.h"
#include "d/cc/d_cc_d.h"
#include "d/bg/d_bg_s_acch.h"
#include "d/bg/d_bg_s_lin_chk.h"
#include "SSystem/SComponent/c_phase.h"
class daCanoe_c : public fopAc_ac_c {
-1
View File
@@ -1,7 +1,6 @@
#ifndef D_A_COW_H
#define D_A_COW_H
#include "f_op/f_op_actor_mng.h"
class daCow_c : public fopAc_ac_c {
public:
+7
View File
@@ -5,6 +5,13 @@
#include "d/cc/d_cc_d.h"
#include "f_op/f_op_actor_mng.h"
/**
* @ingroup actors-items
* @brief Dominion Rod
*
* Temple of Time dungeon item.
*
*/
class daCrod_c : public fopAc_ac_c {
public:
/* 80141A94 */ void setControllActorData();
-1
View File
@@ -3,7 +3,6 @@
#include "Z2AudioLib/Z2Creature.h"
#include "d/bg/d_bg_s_movebg_actor.h"
#include "d/com/d_com_inf_game.h"
#include "d/particle/d_particle_copoly.h"
class daCstaF_c : public dBgS_MoveBgActor {
@@ -1,10 +1,7 @@
#ifndef D_A_CSTATUE_H
#define D_A_CSTATUE_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/particle/d_particle_copoly.h"
#include "f_op/f_op_actor.h"
-3
View File
@@ -4,9 +4,6 @@
#include "d/a/d_a_item_static.h"
#include "d/a/d_a_player.h"
#include "d/msg/d_msg_flow.h"
#include "dolphin/types.h"
#include "f_op/f_op_actor.h"
#include "m_Do/m_Do_controller_pad.h"
#include "m_Do/m_Do_ext.h"
#include "m_Do/m_Do_mtx.h"
@@ -3,7 +3,6 @@
#include "d/bg/d_bg_s_movebg_actor.h"
#include "d/com/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
class daDsh_c : public dBgS_MoveBgActor {
public:
-1
View File
@@ -1,6 +1,5 @@
#ifndef D_A_EP_H
#define D_A_EP_H
#include "dolphin/types.h"
#endif /* D_A_EP_H */
@@ -1,12 +1,8 @@
#ifndef D_A_FORMATION_MNG_H
#define D_A_FORMATION_MNG_H
#include "dolphin/types.h"
#include "f_op/f_op_actor.h"
#include "f_op/f_op_actor_mng.h"
#include "d/com/d_com_inf_game.h"
#include "d/d_path.h"
#include "d/d_stage.h"
#include "d/a/d_a_player.h"
#include "d/kankyo/d_kankyo.h"
#include "SSystem/SComponent/c_math.h"
@@ -1,7 +1,6 @@
#ifndef D_A_GUARD_MNG_H
#define D_A_GUARD_MNG_H
#include "JSystem/JKernel/JKRHeap.h"
#include "d/a/d_a_player.h"
#include "d/com/d_com_inf_game.h"
#include "rel/d/a/tag/d_a_tag_guard/d_a_tag_guard.h"
-1
View File
@@ -1,7 +1,6 @@
#ifndef D_A_HITOBJ_H
#define D_A_HITOBJ_H
#include "f_op/f_op_actor_mng.h"
#include "d/com/d_com_inf_game.h"
class hitobj_class : public fopAc_ac_c {
-1
View File
@@ -7,7 +7,6 @@
#include "d/bg/d_bg_s_lin_chk.h"
#include "d/cc/d_cc_d.h"
#include "d/msg/d_msg_flow.h"
#include "f_op/f_op_actor.h"
class daHorseRein_c {
public:
@@ -1,7 +1,6 @@
#ifndef D_A_HOZELDA_H
#define D_A_HOZELDA_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
class daHoZelda_matAnm_c : public J3DMaterialAnm {
@@ -3,7 +3,6 @@
#include "d/bg/d_bg_s_movebg_actor.h"
#include "d/com/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
class daIzumiGate_c : public dBgS_MoveBgActor {
public:
-1
View File
@@ -1,7 +1,6 @@
#ifndef D_A_KAGO_H
#define D_A_KAGO_H
#include "f_op/f_op_actor_mng.h"
#include "d/d_path.h"
class daKago_c : public fopAc_ac_c {
@@ -1,7 +1,6 @@
#ifndef D_A_MG_FSHOP_H
#define D_A_MG_FSHOP_H
#include "m_Do/m_Do_ext.h"
#include "d/bg/d_bg_s_acch.h"
#include "f_op/f_op_actor.h"
#include "SSystem/SComponent/c_phase.h"
+5 -2
View File
@@ -1,8 +1,6 @@
#ifndef D_A_MG_ROD_H
#define D_A_MG_ROD_H
#include "d/msg/d_msg_flow.h"
#include "f_op/f_op_actor.h"
#include "Z2AudioLib/Z2Creature.h"
#include "d/bg/d_bg_s_acch.h"
#include "d/cc/d_cc_d.h"
@@ -20,6 +18,11 @@ struct mg_hook_s {
/* 0x18 */ u8 field_0x18[0x20 - 0x18];
};
/**
* @ingroup actors-items
* @brief Fishing Rod
*
*/
class dmg_rod_class : public fopAc_ac_c {
public:
/* 804BAC0C */ dmg_rod_class();
-3
View File
@@ -1,11 +1,8 @@
#ifndef D_A_MIDNA_H
#define D_A_MIDNA_H
#include "SSystem/SComponent/c_phase.h"
#include "JSystem/J3DGraphBase/J3DMatBlock.h"
#include "Z2AudioLib/Z2Creature.h"
#include "f_op/f_op_actor.h"
#include "d/bg/d_bg_s_lin_chk.h"
#include "d/com/d_com_inf_game.h"
#include "d/a/d_a_player.h"
#include "d/msg/d_msg_flow.h"
-2
View File
@@ -1,11 +1,9 @@
#ifndef D_A_MYNA_H
#define D_A_MYNA_H
#include "SSystem/SComponent/c_bg_s_gnd_chk.h"
#include "Z2AudioLib/Z2Creature.h"
#include "d/cc/d_cc_d.h"
#include "d/msg/d_msg_flow.h"
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
#include "m_Do/m_Do_ext.h"
#include "m_Do/m_Do_hostIO.h"
-1
View File
@@ -1,6 +1,5 @@
#ifndef D_A_NBOMB_H
#define D_A_NBOMB_H
#include "dolphin/types.h"
#endif /* D_A_NBOMB_H */
-1
View File
@@ -1,6 +1,5 @@
#ifndef D_A_NI_H
#define D_A_NI_H
#include "f_op/f_op_actor_mng.h"
#endif /* D_A_NI_H */
+7 -1
View File
@@ -1,11 +1,17 @@
#ifndef D_A_SPINNER_H
#define D_A_SPINNER_H
#include "d/com/d_com_inf_game.h"
#include "d/d_path.h"
#include "d/particle/d_particle_copoly.h"
#include "f_op/f_op_actor_mng.h"
/**
* @ingroup actors-items
* @brief Spinner
*
* Arbiter's Grounds dungeon item.
*
*/
class daSpinner_c : public fopAc_ac_c {
public:
/* 804D198C */ int createHeap();
@@ -1,6 +1,5 @@
#ifndef D_A_STARTANDGOAL_H
#define D_A_STARTANDGOAL_H
#include "dolphin/types.h"
#endif /* D_A_STARTANDGOAL_H */
-1
View File
@@ -1,7 +1,6 @@
#ifndef D_A_SWTIME_H
#define D_A_SWTIME_H
#include "f_op/f_op_actor_mng.h"
#include "d/com/d_com_inf_game.h"
class daSwTime_c : public fopAc_ac_c {
-1
View File
@@ -1,6 +1,5 @@
#ifndef D_A_SWHIT0_H
#define D_A_SWHIT0_H
#include "dolphin/types.h"
#endif /* D_A_SWHIT0_H */
-1
View File
@@ -1,7 +1,6 @@
#ifndef D_A_TBOX_H
#define D_A_TBOX_H
#include "SSystem/SComponent/c_phase.h"
#include "d/cc/d_cc_d.h"
#include "d/bg/d_bg_s_acch.h"
#include "d/bg/d_bg_s_movebg_actor.h"
-1
View File
@@ -1,6 +1,5 @@
#ifndef D_A_VRBOX2_H
#define D_A_VRBOX2_H
#include "f_op/f_op_actor_mng.h"
#endif /* D_A_VRBOX2_H */
-5
View File
@@ -1,12 +1,7 @@
#ifndef D_A_YKGR_H
#define D_A_YKGR_H
#include "dolphin/types.h"
#include "JSystem/JParticle/JPAParticle.h"
#include "JSystem/JKernel/JKRHeap.h"
#include "SSystem/SComponent/c_math.h"
#include "f_op/f_op_actor.h"
#include "f_op/f_op_camera_mng.h"
#include "f_op/f_op_actor_mng.h"
#include "d/d_path.h"
#include "d/kankyo/d_kankyo_rain.h"
@@ -6,6 +6,11 @@
#include "d/bg/d_bg_s_acch.h"
#include "d/bg/d_bg_w.h"
/**
* @ingroup actors-doors
* @brief Boss Door
*
*/
class daBdoor_c : public fopAc_ac_c {
public:
enum Action {
@@ -3,7 +3,6 @@
#include "d/bg/d_bg_w.h"
#include "d/com/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
class daDbDoor00_c : public fopAc_ac_c {
public:
@@ -4,7 +4,6 @@
#include "d/a/d_a_player.h"
#include "d/bg/d_bg_s_movebg_actor.h"
#include "d/com/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
class daDoorPush_c : public dBgS_MoveBgActor {
public:
-2
View File
@@ -1,6 +1,4 @@
#ifndef D_A_E_AI_H
#define D_A_E_AI_H
#include "dolphin/types.h"
#endif /* D_A_E_AI_H */
+5 -1
View File
@@ -1,7 +1,6 @@
#ifndef D_A_E_ARROW_H
#define D_A_E_ARROW_H
#include "f_op/f_op_actor_mng.h"
#include "d/com/d_com_inf_game.h"
enum e_arrow_action {
@@ -19,6 +18,11 @@ enum e_arrow_type {
ARROW_TYPE_BOMB,
};
/**
* @ingroup actors-enemies
* @brief Enemy arrow
*
*/
class e_arrow_class : public fopEn_enemy_c {
public:
/* 0x5AC */ request_of_phase_process_class mPhase;
-2
View File
@@ -1,6 +1,4 @@
#ifndef D_A_E_BA_H
#define D_A_E_BA_H
#include "dolphin/types.h"
#endif /* D_A_E_BA_H */
+5 -1
View File
@@ -5,7 +5,6 @@
#include "SSystem/SComponent/c_phase.h"
#include "Z2AudioLib/Z2Creature.h"
#include "d/cc/d_cc_d.h"
#include "dolphin/types.h"
struct bee_s {
enum Action {
@@ -44,6 +43,11 @@ struct bee_s {
STATIC_ASSERT(sizeof(bee_s) == 0x74);
/**
* @ingroup actors-enemies
* @brief Bee
*
*/
class e_bee_class : public fopAc_ac_c {
public:
/* 0x0568 */ request_of_phase_process_class mPhase;
-2
View File
@@ -1,6 +1,4 @@
#ifndef D_A_E_BI_H
#define D_A_E_BI_H
#include "dolphin/types.h"
#endif /* D_A_E_BI_H */
@@ -3,6 +3,11 @@
#include "f_op/f_op_actor_mng.h"
/**
* @ingroup actors-enemies
* @brief Bombling Leaf
*
*/
class e_bi_leaf_class : public fopEn_enemy_c {
public:
/* 0x5AC */ request_of_phase_process_class mPhase;
-2
View File
@@ -1,6 +1,4 @@
#ifndef D_A_E_BS_H
#define D_A_E_BS_H
#include "dolphin/types.h"
#endif /* D_A_E_BS_H */
-2
View File
@@ -1,6 +1,4 @@
#ifndef D_A_E_BU_H
#define D_A_E_BU_H
#include "dolphin/types.h"
#endif /* D_A_E_BU_H */
-2
View File
@@ -1,6 +1,4 @@
#ifndef D_A_E_CR_H
#define D_A_E_CR_H
#include "dolphin/types.h"
#endif /* D_A_E_CR_H */
@@ -1,6 +1,4 @@
#ifndef D_A_E_CR_EGG_H
#define D_A_E_CR_EGG_H
#include "dolphin/types.h"
#endif /* D_A_E_CR_EGG_H */
-2
View File
@@ -1,6 +1,4 @@
#ifndef D_A_E_DB_H
#define D_A_E_DB_H
#include "dolphin/types.h"
#endif /* D_A_E_DB_H */
@@ -1,10 +1,14 @@
#ifndef D_A_E_DB_LEAF_H
#define D_A_E_DB_LEAF_H
#include "f_op/f_op_actor_mng.h"
#include "d/com/d_com_inf_game.h"
#include "dolphin/types.h"
/**
* @ingroup actors-enemies
* @brief Deku Baba Leaf
*
*/
class e_db_leaf_class : public fopEn_enemy_c {
public:
/* 0x5AC */ request_of_phase_process_class mPhase;
-2
View File
@@ -1,6 +1,4 @@
#ifndef D_A_E_DD_H
#define D_A_E_DD_H
#include "dolphin/types.h"
#endif /* D_A_E_DD_H */
-2
View File
@@ -1,6 +1,4 @@
#ifndef D_A_E_DF_H
#define D_A_E_DF_H
#include "dolphin/types.h"
#endif /* D_A_E_DF_H */
-2
View File
@@ -1,6 +1,4 @@
#ifndef D_A_E_DN_H
#define D_A_E_DN_H
#include "dolphin/types.h"
#endif /* D_A_E_DN_H */
-2
View File
@@ -1,6 +1,4 @@
#ifndef D_A_E_FK_H
#define D_A_E_FK_H
#include "dolphin/types.h"
#endif /* D_A_E_FK_H */
-2
View File
@@ -1,6 +1,4 @@
#ifndef D_A_E_FM_H
#define D_A_E_FM_H
#include "dolphin/types.h"
#endif /* D_A_E_FM_H */
-2
View File
@@ -1,6 +1,4 @@
#ifndef D_A_E_FS_H
#define D_A_E_FS_H
#include "dolphin/types.h"
#endif /* D_A_E_FS_H */
+176 -1
View File
@@ -1,6 +1,181 @@
/**
* @file d_a_e_fz.h
* This header contains information about the Mini Freezard actor.
*
*/
#ifndef D_A_E_FZ_H
#define D_A_E_FZ_H
#include "dolphin/types.h"
#include "Z2AudioLib/Z2Creature.h"
#include "d/cc/d_cc_uty.h"
#include "m_Do/m_Do_hostIO.h"
/**
* \enum daE_FZ_Action
* \brief Mini Freezard current action.
*
*/
enum daE_FZ_Action {
ACT_WAIT, /**< Mini Freezard is waiting. */
ACT_MOVE, /**< Mini Freezard is moving to attack. */
ACT_ATTACK, /**< Mini Freezard is attacking. */
ACT_DAMAGE, /**< Mini Freezard is damaged. */
ACT_ROLLMOVE /**< Mini Freezard is spinning around Blizzeta. This action is only taken when actor is loaded in with parameter 3 (aka, during the Blizzeta fight).*/
};
/**
* \brief Temporary HIO struct to get a match. Remove later.
*
*/
struct daE_FZ_HIO_c_tmp {
void* vtable;
/* 0x04 */ s8 field_0x04;
/* 0x05 */ u8 field_0x05[0x06 - 0x05];
/* 0x06 */ s16 field_0x06;
/* 0x08 */ s16 field_0x08;
/* 0x0A */ u8 field_0x0A[0x0C - 0x0A];
/* 0x0C */ f32 field_0x0c;
/* 0x10 */ f32 field_0x10;
/* 0x14 */ f32 field_0x14;
/* 0x18 */ f32 field_0x18;
/* 0x1C */ f32 field_0x1c;
/* 0x20 */ f32 field_0x20;
/* 0x24 */ f32 field_0x24;
/* 0x28 */ f32 field_0x28;
/* 0x2C */ f32 field_0x2c;
/* 0x30 */ f32 field_0x30;
/* 0x34 */ f32 field_0x34;
};
/**
* @ingroup actors-enemies
* @brief Mini Freezard
*
*/
class daE_FZ_c : public fopEn_enemy_c {
public:
/* 806BE9D4 */ s32 draw();
/* 806BEAF8 */ void setActionMode(int, int);
/* 806BEB04 */ void setReflectAngle();
/* 806BEBA0 */ void mBoundSoundset();
/* 806BEC08 */ void deadnextSet(bool);
/* 806BED34 */ void damage_check();
/* 806BF444 */ bool way_gake_check();
/* 806BF58C */ void executeWait();
/* 806BF8E8 */ void executeMove();
/* 806BFA64 */ void executeAttack();
/* 806BFB60 */ void executeDamage();
/* 806BFF94 */ void executeRollMove();
/* 806C0224 */ void action();
/* 806C06DC */ void mtx_set();
/* 806C0760 */ void cc_set();
/* 806C08C4 */ s32 execute();
/* 806C0B20 */ void demoDelete();
/* 806C0B94 */ s32 _delete();
/* 806C0C28 */ s32 CreateHeap();
/* 806C0CD0 */ s32 create();
private:
/* 0x5AC */ request_of_phase_process_class mPhaseReq; /**< Phase request used when creating the actor. */
/* 0x5B4 */ J3DModel* mpModel; /**< Pointer to the Mini Freezard's model. */
/* 0x5B8 */ mDoExt_invisibleModel mInvisibleModel;
/* 0x5C0 */ Z2CreatureEnemy mCreature; /**< Z2CreatureEnemy class used for playing sound effects. */
/* 0x664 */ cXyz field_0x664;
/* 0x670 */ cXyz field_0x670;
/* 0x67C */ cXyz field_0x67c[4];
/* 0x6AC */ cXyz field_0x6ac[4];
/* 0x6DC */ cXyz field_0x6dc;
/* 0x6E8 */ cXyz field_0x6e8;
/* 0x6F4 */ s32 mActionMode; /**< Mini Freezard current action mode. */
/* 0x6F8 */ s32 mActionPhase; /**< Mini Freezard phase of current action mode. */
/* 0x6FC */ f32 field_0x6fc;
/* 0x700 */ f32 mRadiusBase; /**< Base radius value used by mSph1 and mSph2. */
/* 0x704 */ s16 field_0x704;
/* 0x706 */ s16 mAngleFromPlayer; /**< Angle the mini freezard is from the player. */
/* 0x708 */ s16 mLastWallHitAngle; /**< Angle of the last wall the mini freezard hit. */
/* 0x70A */ u8 field_0x70A[0x70C - 0x70A];
/* 0x70C */ s32 field_0x70c;
/* 0x710 */ u8 field_0x710;
/* 0x711 */ u8 field_0x711;
/* 0x712 */ u8 field_0x712;
/* 0x713 */ u8 field_0x713;
/* 0x714 */ u8 field_0x714;
/* 0x715 */ u8 field_0x715;
/* 0x716 */ u8 field_0x716;
/* 0x717 */ u8 field_0x717;
/* 0x718 */ fopAc_ac_c* mpBlizzetaActor; /**< Pointer to Blizzeta's actor (if used). Used to figure out what the mini freezard's angle and positioning should be when Blizzeta is attacking with them.*/
/* 0x71C */ u32 field_0x71c[3];
/* 0x728 */ u8 field_0x728[4];
/* 0x72C */ dBgS_AcchCir mAcchCir;
/* 0x76C */ dBgS_ObjAcch mObjAcch;
/* 0x944 */ dCcD_Stts mStts;
/* 0x980 */ dCcD_Sph mSph1; /**< Mini Freezard's sphere collider used for ? */
/* 0xAB8 */ dCcD_Sph mSph2; /**< Mini Freezard's sphere collider used for attacking. */
/* 0xBF0 */ dCcU_AtInfo mAtInfo;
/* 0xC14 */ u8 field_0xc14;
/* 0xC15 */ u8 field_0xc15;
/* 0xC16 */ u8 field_0xc16;
/* 0xC17 */ u8 field_0xc17;
/* 0xC18 */ u8 field_0xc18;
/* 0xC19 */ u8 field_0xc19;
/* 0xC1A */ u8 field_0xc1a;
/* 0xC1B */ u8 field_0xc1b;
/* 0xC1C */ u8 field_0xc1c;
/* 0xC1D */ u8 field_0xc1d;
/* 0xC1E */ u8 field_0xc1e;
/* 0xC1F */ u8 field_0xc1f;
/* 0xC20 */ u8 field_0xc20;
/* 0xC21 */ u8 field_0xc21;
/* 0xC22 */ u8 field_0xc22;
/* 0xC23 */ u8 field_0xc23;
};
STATIC_ASSERT(sizeof(daE_FZ_c) == 0xC24);
class daE_FZ_HIO_c : public mDoHIO_entry_c {
public:
/* 806BE94C */ daE_FZ_HIO_c();
/* 806C1440 */ virtual ~daE_FZ_HIO_c();
public:
/* 0x04 */ s8 field_0x04;
/* 0x05 */ u8 field_0x05[0x06 - 0x05];
/* 0x06 */ s16 field_0x06;
/* 0x08 */ s16 field_0x08;
/* 0x0A */ u8 field_0x0A[0x0C - 0x0A];
/* 0x0C */ f32 field_0x0c;
/* 0x10 */ f32 field_0x10;
/* 0x14 */ f32 field_0x14;
/* 0x18 */ f32 field_0x18;
/* 0x1C */ f32 field_0x1c;
/* 0x20 */ f32 field_0x20;
/* 0x24 */ f32 field_0x24;
/* 0x28 */ f32 field_0x28;
/* 0x2C */ f32 field_0x2c;
/* 0x30 */ f32 field_0x30;
/* 0x34 */ f32 field_0x34;
};
/**
* \brief Blizzeta's actor class. Reference in proper header later when it has been reversed.
*
*/
class daB_YO_c : public fopEn_enemy_c {
public:
u8 getModelNo() { return mModelNo;}
s16 getFrizadRollAngle() { return mRollAngle;}
f32 getModeRarius() { return mModeRarius;}
u8 getFrizadAttack() { return mFrizadAttack;}
private:
/* 0x5AC */ u8 field_0x5ac[0xF54 - 0x5AC];
/* 0xF54 */ f32 mModeRarius;
/* 0xF58 */ u8 field_0xf58[0xF5C - 0xF58];
/* 0xF5C */ s16 mRollAngle;
/* 0xF5E */ u8 field_0xf5e[0xFA8 - 0xF5E];
/* 0xFA8 */ u8 mModelNo;
/* 0xFA9 */ u8 field_0xfa9[0xFAD - 0xFA9];
/* 0xFAD */ u8 mFrizadAttack;
};
#endif /* D_A_E_FZ_H */
-2
View File
@@ -1,6 +1,4 @@
#ifndef D_A_E_GB_H
#define D_A_E_GB_H
#include "dolphin/types.h"
#endif /* D_A_E_GB_H */
+5
View File
@@ -8,6 +8,11 @@ struct daE_GE_HIO_c {
/* 806CCA58 */ ~daE_GE_HIO_c();
};
/**
* @ingroup actors-enemies
* @brief Guay
*
*/
class daE_GE_c : public fopEn_enemy_c {
public:
u8 getGroupNo() {
-2
View File
@@ -1,6 +1,4 @@
#ifndef D_A_E_GOB_H
#define D_A_E_GOB_H
#include "dolphin/types.h"
#endif /* D_A_E_GOB_H */
-2
View File
@@ -1,6 +1,4 @@
#ifndef D_A_E_HB_H
#define D_A_E_HB_H
#include "dolphin/types.h"
#endif /* D_A_E_HB_H */
@@ -3,6 +3,11 @@
#include "f_op/f_op_actor_mng.h"
/**
* @ingroup actors-enemies
* @brief Snake Baba Leaf
*
*/
class e_hb_leaf_class : public fopEn_enemy_c {
public:
/* 0x5AC */ request_of_phase_process_class mPhase;
-2
View File
@@ -1,6 +1,4 @@
#ifndef D_A_E_HZ_H
#define D_A_E_HZ_H
#include "dolphin/types.h"
#endif /* D_A_E_HZ_H */
@@ -1,6 +1,4 @@
#ifndef D_A_E_HZELDA_H
#define D_A_E_HZELDA_H
#include "dolphin/types.h"
#endif /* D_A_E_HZELDA_H */
-2
View File
@@ -1,6 +1,4 @@
#ifndef D_A_E_IS_H
#define D_A_E_IS_H
#include "dolphin/types.h"
#endif /* D_A_E_IS_H */
-2
View File
@@ -1,6 +1,4 @@
#ifndef D_A_E_KG_H
#define D_A_E_KG_H
#include "dolphin/types.h"
#endif /* D_A_E_KG_H */
-2
View File
@@ -1,6 +1,4 @@
#ifndef D_A_E_KR_H
#define D_A_E_KR_H
#include "dolphin/types.h"
#endif /* D_A_E_KR_H */
-2
View File
@@ -1,6 +1,4 @@
#ifndef D_A_E_MB_H
#define D_A_E_MB_H
#include "dolphin/types.h"
#endif /* D_A_E_MB_H */
-2
View File
@@ -1,6 +1,4 @@
#ifndef D_A_E_MD_H
#define D_A_E_MD_H
#include "dolphin/types.h"
#endif /* D_A_E_MD_H */
-2
View File
@@ -1,6 +1,4 @@
#ifndef D_A_E_MF_H
#define D_A_E_MF_H
#include "dolphin/types.h"
#endif /* D_A_E_MF_H */
-2
View File
@@ -1,6 +1,4 @@
#ifndef D_A_E_MK_H
#define D_A_E_MK_H
#include "dolphin/types.h"
#endif /* D_A_E_MK_H */
@@ -1,6 +1,4 @@
#ifndef D_A_E_MK_BO_H
#define D_A_E_MK_BO_H
#include "dolphin/types.h"
#endif /* D_A_E_MK_BO_H */
-2
View File
@@ -1,6 +1,4 @@
#ifndef D_A_E_MM_H
#define D_A_E_MM_H
#include "dolphin/types.h"
#endif /* D_A_E_MM_H */
@@ -1,6 +1,4 @@
#ifndef D_A_E_MM_MT_H
#define D_A_E_MM_MT_H
#include "dolphin/types.h"
#endif /* D_A_E_MM_MT_H */
-2
View File
@@ -1,6 +1,4 @@
#ifndef D_A_E_MS_H
#define D_A_E_MS_H
#include "dolphin/types.h"
#endif /* D_A_E_MS_H */
+5 -3
View File
@@ -1,9 +1,6 @@
#ifndef D_A_E_NEST_H
#define D_A_E_NEST_H
#include "f_op/f_op_actor.h"
#include "SSystem/SComponent/c_phase.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"
@@ -33,6 +30,11 @@ struct nest_hahen_s {
STATIC_ASSERT(sizeof(nest_hahen_s) == 0x58);
/**
* @ingroup actors-enemies
* @brief Beehive
*
*/
class e_nest_class : public fopAc_ac_c {
public:
enum Type {
-2
View File
@@ -1,6 +1,4 @@
#ifndef D_A_E_NZ_H
#define D_A_E_NZ_H
#include "dolphin/types.h"
#endif /* D_A_E_NZ_H */
@@ -9,6 +9,11 @@
#include "d/cc/d_cc_uty.h"
#include "SSystem/SComponent/c_phase.h"
/**
* @ingroup actors-enemies
* @brief Morpheel Bomb Fish
*
*/
struct daE_OctBg_c : public fopEn_enemy_c {
typedef void (daE_OctBg_c::*actionFunc)();
+5 -1
View File
@@ -4,8 +4,12 @@
#include "Z2AudioLib/Z2Creature.h"
#include "d/cc/d_cc_uty.h"
#include "d/d_path.h"
#include "f_op/f_op_actor_mng.h"
/**
* @ingroup actors-enemies
* @brief Peahat
*
*/
class daE_PH_c : public fopEn_enemy_c {
public:
/* 8073D48C */ void initCcSph();
+5 -2
View File
@@ -1,8 +1,11 @@
#ifndef D_A_E_PM_H
#define D_A_E_PM_H
#include "f_op/f_op_actor_mng.h"
/**
* @ingroup actors-enemies
* @brief Skull Kid
*
*/
class daE_PM_c : public fopEn_enemy_c {
public:
/* 80741FB4 */ void DemoSkip(int);
-2
View File
@@ -1,6 +1,4 @@
#ifndef D_A_E_PO_H
#define D_A_E_PO_H
#include "dolphin/types.h"
#endif /* D_A_E_PO_H */
-2
View File
@@ -1,6 +1,4 @@
#ifndef D_A_E_RB_H
#define D_A_E_RB_H
#include "dolphin/types.h"
#endif /* D_A_E_RB_H */
-2
View File
@@ -1,6 +1,4 @@
#ifndef D_A_E_RD_H
#define D_A_E_RD_H
#include "dolphin/types.h"
#endif /* D_A_E_RD_H */
-2
View File
@@ -1,6 +1,4 @@
#ifndef D_A_E_RDB_H
#define D_A_E_RDB_H
#include "dolphin/types.h"
#endif /* D_A_E_RDB_H */
-2
View File
@@ -1,6 +1,4 @@
#ifndef D_A_E_RDY_H
#define D_A_E_RDY_H
#include "dolphin/types.h"
#endif /* D_A_E_RDY_H */
-2
View File
@@ -1,6 +1,4 @@
#ifndef D_A_E_S1_H
#define D_A_E_S1_H
#include "dolphin/types.h"
#endif /* D_A_E_S1_H */
-2
View File
@@ -1,6 +1,4 @@
#ifndef D_A_E_SB_H
#define D_A_E_SB_H
#include "dolphin/types.h"
#endif /* D_A_E_SB_H */
-2
View File
@@ -1,6 +1,4 @@
#ifndef D_A_E_SF_H
#define D_A_E_SF_H
#include "dolphin/types.h"
#endif /* D_A_E_SF_H */
-2
View File
@@ -1,6 +1,4 @@
#ifndef D_A_E_SG_H
#define D_A_E_SG_H
#include "dolphin/types.h"
#endif /* D_A_E_SG_H */

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