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
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_Y_TAIHOU_H
#define D_A_OBJ_Y_TAIHOU_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_Y_TAIHOU_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_ARI_H
#define D_A_OBJ_ARI_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_ARI_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_AUTOMATA_H
#define D_A_OBJ_AUTOMATA_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_AUTOMATA_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_BALLOON_H
#define D_A_OBJ_BALLOON_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_BALLOON_H */
+28 -28
View File
@@ -1,28 +1,28 @@
#ifndef D_A_OBJ_BBOX_H
#define D_A_OBJ_BBOX_H
#include "d/bg/d_bg_s_movebg_actor.h"
#include "d/cc/d_cc_d.h"
#include "f_op/f_op_actor_mng.h"
class daObjBBox_c : public dBgS_MoveBgActor {
public:
/* 80BACD38 */ void initBaseMtx();
/* 80BACD74 */ void setBaseMtx();
/* 80BACDD8 */ int Create();
/* 80BACE50 */ int CreateHeap();
/* 80BACEC0 */ int create1st();
/* 80BAD0C0 */ int Execute(Mtx**);
/* 80BAD234 */ int Draw();
/* 80BAD2D8 */ int Delete();
u32 getSwNo() { return fopAcM_GetParamBit(this, 0, 8); }
private:
/* 0x5A0 */ request_of_phase_process_class mPhaseReq;
/* 0x5A8 */ J3DModel* mpModel;
/* 0x5AC */ dCcD_Stts mStts;
/* 0x5E8 */ dCcD_Cyl mCyl;
}; // Size: 0x724
#endif /* D_A_OBJ_BBOX_H */
#ifndef D_A_OBJ_BBOX_H
#define D_A_OBJ_BBOX_H
#include "d/bg/d_bg_s_movebg_actor.h"
#include "d/cc/d_cc_d.h"
#include "f_op/f_op_actor_mng.h"
class daObjBBox_c : public dBgS_MoveBgActor {
public:
/* 80BACD38 */ void initBaseMtx();
/* 80BACD74 */ void setBaseMtx();
/* 80BACDD8 */ int Create();
/* 80BACE50 */ int CreateHeap();
/* 80BACEC0 */ int create1st();
/* 80BAD0C0 */ int Execute(Mtx**);
/* 80BAD234 */ int Draw();
/* 80BAD2D8 */ int Delete();
u32 getSwNo() { return fopAcM_GetParamBit(this, 0, 8); }
private:
/* 0x5A0 */ request_of_phase_process_class mPhaseReq;
/* 0x5A8 */ J3DModel* mpModel;
/* 0x5AC */ dCcD_Stts mStts;
/* 0x5E8 */ dCcD_Cyl mCyl;
}; // Size: 0x724
#endif /* D_A_OBJ_BBOX_H */
@@ -1,10 +1,8 @@
#ifndef D_A_OBJ_BED_H
#define D_A_OBJ_BED_H
#include "JSystem/J3DGraphAnimator/J3DModel.h"
#include "SSystem/SComponent/c_phase.h"
#include "d/bg/d_bg_s_acch.h"
#include "d/bg/d_bg_s_gnd_chk.h"
#include "f_op/f_op_actor.h"
#include "dolphin/types.h"
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_BEMOS_H
#define D_A_OBJ_BEMOS_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_BEMOS_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_BHASHI_H
#define D_A_OBJ_BHASHI_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_BHASHI_H */
@@ -1,8 +1,6 @@
#ifndef D_A_OBJ_BK_LEAF_H
#define D_A_OBJ_BK_LEAF_H
#include "SSystem/SComponent/c_phase.h"
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
class daBkLeaf_c : public fopAc_ac_c {
@@ -3,7 +3,6 @@
#include "d/bg/d_bg_s_movebg_actor.h"
#include "SSystem/SComponent/c_phase.h"
#include "dolphin/types.h"
class J3DModel;
@@ -1,7 +1,6 @@
#ifndef D_A_OBJ_BOSSWARP_H
#define D_A_OBJ_BOSSWARP_H
#include "SSystem/SComponent/c_phase.h"
#include "f_op/f_op_actor_mng.h"
#include "d/msg/d_msg_flow.h"
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_BOUMATO_H
#define D_A_OBJ_BOUMATO_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_BOUMATO_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_BRAKEEFF_H
#define D_A_OBJ_BRAKEEFF_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_BRAKEEFF_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_BRG_H
#define D_A_OBJ_BRG_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_BRG_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_BURNBOX_H
#define D_A_OBJ_BURNBOX_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_BURNBOX_H */
@@ -1,8 +1,6 @@
#ifndef D_A_OBJ_CARRY_H
#define D_A_OBJ_CARRY_H
#include "d/bg/d_bg_s_acch.h"
#include "d/cc/d_cc_d.h"
#include "d/d_jnt_col.h"
#include "f_op/f_op_actor_mng.h"
#include "d/com/d_com_inf_game.h"
@@ -18,23 +16,31 @@ struct daObjCarry_Data {
/* 0x0044 */ u8 field_0x0044[0x94-0x44];
};
/**
* @ingroup actors-objects
* @brief Carryable Object
*
* This is a multi-use class for carryable objects.
* It's used by: small and large blue pot, small and large red pot, box, cannon ball, barrel, skull, deku nut, Sols, small and large Twilight pots.
*
*/
class daObjCarry_c : public fopAc_ac_c {
public:
enum {
/* 0x0 */ TYPE_TSUBO, // Small Blue Pot
/* 0x1 */ TYPE_OOTSUBO, // Big Red Pot
/* 0x2 */ TYPE_KIBAKO, // Box
/* 0x3 */ TYPE_IRON_BALL, // Cannon Ball
/* 0x4 */ TYPE_TARU, // Barrel
/* 0x5 */ TYPE_DOKURO, // Skull
/* 0x6 */ TYPE_BOKKURI, // Deku Nut
/* 0x7 */ TYPE_TSUBO_2, // Small Red Pot
/* 0x8 */ TYPE_BALL_S, // Light Ball A
/* 0x9 */ TYPE_BALL_S_2, // Light Ball B
/* 0xA */ TYPE_AOTSUBO, // Big Blue Pot
/* 0xB */ TYPE_LV8_BALL, // Light Ball? Probably unused
/* 0xC */ TYPE_TSUBO_S, // Small pot - Twilight
/* 0xD */ TYPE_TSUBO_B, // Big pot - Twilight
/* 0x0 */ TYPE_TSUBO, /**< Small Blue Pot */
/* 0x1 */ TYPE_OOTSUBO, /**< Big Red Pot */
/* 0x2 */ TYPE_KIBAKO, /**< Box */
/* 0x3 */ TYPE_IRON_BALL, /**< Cannon Ball */
/* 0x4 */ TYPE_TARU, /**< Barrel */
/* 0x5 */ TYPE_DOKURO, /**< Skull */
/* 0x6 */ TYPE_BOKKURI, /**< Deku Nut */
/* 0x7 */ TYPE_TSUBO_2, /**< Small Red Pot */
/* 0x8 */ TYPE_BALL_S, /**< Light Ball A */
/* 0x9 */ TYPE_BALL_S_2, /**< Light Ball B */
/* 0xA */ TYPE_AOTSUBO, /**< Big Blue Pot */
/* 0xB */ TYPE_LV8_BALL, /**< Light Ball? Probably unused */
/* 0xC */ TYPE_TSUBO_S, /**< Small pot - Twilight */
/* 0xD */ TYPE_TSUBO_B, /**< Big pot - Twilight */
};
/* 80031CF8 */ static void clrSaveFlag();
@@ -1,9 +1,7 @@
#ifndef D_A_OBJ_CATDOOR_H
#define D_A_OBJ_CATDOOR_H
#include "f_op/f_op_actor.h"
#include "f_op/f_op_actor_mng.h"
#include "SSystem/SComponent/c_phase.h"
#include "d/bg/d_bg_w.h"
struct daObjCatDoor_Door_c {
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_CBLOCK_H
#define D_A_OBJ_CBLOCK_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_CBLOCK_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 daObjBoard_c : public dBgS_MoveBgActor {
public:
@@ -3,7 +3,6 @@
#include "d/bg/d_bg_s_movebg_actor.h"
#include "f_op/f_op_actor_mng.h"
#include "SSystem/SComponent/c_phase.h"
class daObjChandelier_c;
typedef void (daObjChandelier_c::*daObjChandelier_proc)();
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_CHEST_H
#define D_A_OBJ_CHEST_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_CHEST_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 daCowdoor_c : public dBgS_MoveBgActor {
public:
@@ -1,7 +1,6 @@
#ifndef D_A_OBJ_CROPE_H
#define D_A_OBJ_CROPE_H
#include "d/cc/d_cc_d.h"
#include "f_op/f_op_actor_mng.h"
class daObjCrope_c : public fopAc_ac_c {
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_CRVLH_DOWN_H
#define D_A_OBJ_CRVLH_DOWN_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_CRVLH_DOWN_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_CWALL_H
#define D_A_OBJ_CWALL_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_CWALL_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_DAN_H
#define D_A_OBJ_DAN_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_DAN_H */
@@ -1,7 +1,6 @@
#ifndef D_A_OBJ_DIGSNOW_H
#define D_A_OBJ_DIGSNOW_H
#include "SSystem/SComponent/c_phase.h"
#include "d/bg/d_bg_s_movebg_actor.h"
#include "f_op/f_op_actor_mng.h"
#include "d/bg/d_bg_s_acch.h"
@@ -3,6 +3,5 @@
#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"
#endif /* D_A_OBJ_DMELEVATOR_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_DROP_H
#define D_A_OBJ_DROP_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_DROP_H */
@@ -2,7 +2,6 @@
#define D_A_OBJ_EFF_H
#include "f_op/f_op_actor_mng.h"
#include "d/d_procname.h"
namespace daObjEff {
class Act_c : public fopAc_ac_c {
@@ -3,6 +3,5 @@
#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"
#endif /* D_A_OBJ_FALLOBJ_H */
@@ -1,10 +1,8 @@
#ifndef D_A_OBJ_FAN_H
#define D_A_OBJ_FAN_H
#include "dolphin/types.h"
#include "d/bg/d_bg_s_movebg_actor.h"
#include "d/cc/d_cc_d.h"
#include "SSystem/SComponent/c_phase.h"
#include "f_op/f_op_actor_mng.h"
struct daObjFan_c : public dBgS_MoveBgActor {
@@ -1,9 +1,7 @@
#ifndef D_A_OBJ_FIREWOOD_H
#define D_A_OBJ_FIREWOOD_H
#include "d/cc/d_cc_d.h"
#include "d/com/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
#include "m_Do/m_Do_hostIO.h"
#endif /* D_A_OBJ_FIREWOOD_H */
@@ -2,6 +2,5 @@
#define D_A_OBJ_FIREWOOD2_H
#include "d/com/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
#endif /* D_A_OBJ_FIREWOOD2_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_FIREPILLAR_H
#define D_A_OBJ_FIREPILLAR_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_FIREPILLAR_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_FIREPILLAR2_H
#define D_A_OBJ_FIREPILLAR2_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_FIREPILLAR2_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_FLAG2_H
#define D_A_OBJ_FLAG2_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_FLAG2_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_FOOD_H
#define D_A_OBJ_FOOD_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_FOOD_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_GADGET_H
#define D_A_OBJ_GADGET_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_GADGET_H */
@@ -2,6 +2,5 @@
#define D_A_OBJ_GANONWALL_H
#include "d/com/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
#endif /* D_A_OBJ_GANONWALL_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_GEYSER_H
#define D_A_OBJ_GEYSER_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_GEYSER_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_GM_H
#define D_A_OBJ_GM_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_GM_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_GOMIKABE_H
#define D_A_OBJ_GOMIKABE_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_GOMIKABE_H */
@@ -1,7 +1,6 @@
#ifndef D_A_OBJ_GRAWALL_H
#define D_A_OBJ_GRAWALL_H
#include "d/cc/d_cc_d.h"
#include "d/com/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
@@ -1,8 +1,6 @@
#ifndef D_A_OBJ_GRAVE_STONE_H
#define D_A_OBJ_GRAVE_STONE_H
#include "SSystem/SComponent/c_phase.h"
#include "d/bg/d_bg_s_acch.h"
#include "d/bg/d_bg_s_movebg_actor.h"
#include "d/cc/d_cc_d.h"
#include "d/particle/d_particle_copoly.h"
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_HB_H
#define D_A_OBJ_HB_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_HB_H */
@@ -1,11 +1,9 @@
#ifndef D_A_OBJ_HEAVYSW_H
#define D_A_OBJ_HEAVYSW_H
#include "d/bg/d_bg_s.h"
#include "d/bg/d_bg_s_movebg_actor.h"
#include "d/bg/d_bg_w.h"
#include "d/com/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
#include "m_Do/m_Do_hostIO.h"
class daHeavySw_c : public dBgS_MoveBgActor {
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_HHASHI_H
#define D_A_OBJ_HHASHI_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_HHASHI_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_ICEBLOCK_H
#define D_A_OBJ_ICEBLOCK_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_ICEBLOCK_H */
@@ -1,7 +1,6 @@
#ifndef D_A_OBJ_ICELEAF_H
#define D_A_OBJ_ICELEAF_H
#include "f_op/f_op_actor_mng.h"
#include "d/cc/d_cc_d.h"
class daObjIceLeaf_c : public fopAc_ac_c {
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_INOBONE_H
#define D_A_OBJ_INOBONE_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_INOBONE_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_ITAMATO_H
#define D_A_OBJ_ITAMATO_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_ITAMATO_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_ITO_H
#define D_A_OBJ_ITO_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_ITO_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_KAGO_H
#define D_A_OBJ_KAGO_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_KAGO_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_KAISOU_H
#define D_A_OBJ_KAISOU_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_KAISOU_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_KAMAKIRI_H
#define D_A_OBJ_KAMAKIRI_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_KAMAKIRI_H */
@@ -1,6 +1,4 @@
#ifndef D_A_OBJ_KANTERA_H
#define D_A_OBJ_KANTERA_H
#include "d/a/d_a_itembase.h"
#endif /* D_A_OBJ_KANTERA_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_KATATSUMURI_H
#define D_A_OBJ_KATATSUMURI_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_KATATSUMURI_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_KAZENEKO_H
#define D_A_OBJ_KAZENEKO_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_KAZENEKO_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_KBACKET_H
#define D_A_OBJ_KBACKET_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_KBACKET_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_KBOX_H
#define D_A_OBJ_KBOX_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_KBOX_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 daObjKJgjs_c : public dBgS_MoveBgActor, public request_of_phase_process_class {
public:
@@ -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 daObjKKanban_c : public dBgS_MoveBgActor {
public:
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_KLIFT00_H
#define D_A_OBJ_KLIFT00_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_KLIFT00_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_KNBULLET_H
#define D_A_OBJ_KNBULLET_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_KNBULLET_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_KUWAGATA_H
#define D_A_OBJ_KUWAGATA_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_KUWAGATA_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_KWHEEL00_H
#define D_A_OBJ_KWHEEL00_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_KWHEEL00_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_LAUNDRY_H
#define D_A_OBJ_LAUNDRY_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_LAUNDRY_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_LAUNDRY_ROPE_H
#define D_A_OBJ_LAUNDRY_ROPE_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_LAUNDRY_ROPE_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_LIFE_CONTAINER_H
#define D_A_OBJ_LIFE_CONTAINER_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_LIFE_CONTAINER_H */
@@ -1,9 +1,7 @@
#ifndef D_A_OBJ_LV2CANDLE_H
#define D_A_OBJ_LV2CANDLE_H
#include "SSystem/SComponent/c_phase.h"
#include "d/cc/d_cc_d.h"
#include "f_op/f_op_actor_mng.h"
#include "m_Do/m_Do_hostIO.h"
#include "rel/d/a/obj/d_a_obj_lv4CandleTag/d_a_obj_lv4CandleTag.h"
@@ -1,7 +1,6 @@
#ifndef D_A_OBJ_LV3CANDLE_H
#define D_A_OBJ_LV3CANDLE_H
#include "Z2AudioLib/Z2SoundObject.h"
#include "d/cc/d_cc_d.h"
#include "f_op/f_op_actor_mng.h"
#include "m_Do/m_Do_hostIO.h"
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_LV4CANDLEDEMOTAG_H
#define D_A_OBJ_LV4CANDLEDEMOTAG_H
#include "f_op/f_op_actor_mng.h"
#endif /* D_A_OBJ_LV4CANDLEDEMOTAG_H */
@@ -1,50 +1,50 @@
#ifndef D_A_OBJ_LV4GATE_H
#define D_A_OBJ_LV4GATE_H
#include "d/bg/d_bg_s_movebg_actor.h"
#include "f_op/f_op_actor_mng.h"
#include "m_Do/m_Do_hostIO.h"
class daLv4Gate_c : public dBgS_MoveBgActor {
public:
enum Mode_e {
MODE_WAIT_e,
MODE_MOVE_e,
MODE_MOVE_END_e,
};
/* 80C5EBE4 */ void setBaseMtx();
/* 80C5ECEC */ int create();
/* 80C5EEA4 */ void moveGate();
/* 80C5EF48 */ void init_modeWait();
/* 80C5EF54 */ void modeWait();
/* 80C5EFB0 */ void init_modeMove();
/* 80C5EFBC */ void modeMove();
/* 80C5F0C4 */ void init_modeMoveEnd();
/* 80C5F1E4 */ void modeMoveEnd();
/* 80C5EC80 */ virtual int CreateHeap();
/* 80C5EE54 */ virtual int Execute(Mtx**);
/* 80C5F1E8 */ virtual int Draw();
/* 80C5F28C */ virtual int Delete();
/* 0x5A0 */ request_of_phase_process_class mPhase;
/* 0x5A8 */ J3DModel* mpModel;
/* 0x5AC */ u8 mMode;
/* 0x5AD */ u8 mGateOpened;
/* 0x5AE */ u8 mInitMove;
/* 0x5AF */ u8 mMoveType;
/* 0x5B0 */ f32 mMoveTarget;
/* 0x5B4 */ f32 mMoveValue;
};
class daLv4Gate_HIO_c : public mDoHIO_entry_c {
public:
/* 80C5EB6C */ daLv4Gate_HIO_c();
/* 80C5F348 */ virtual ~daLv4Gate_HIO_c() {}
/* 0x4 */ f32 mMoveSpeed;
/* 0x8 */ u8 mShockStrength;
};
#endif /* D_A_OBJ_LV4GATE_H */
#ifndef D_A_OBJ_LV4GATE_H
#define D_A_OBJ_LV4GATE_H
#include "d/bg/d_bg_s_movebg_actor.h"
#include "f_op/f_op_actor_mng.h"
#include "m_Do/m_Do_hostIO.h"
class daLv4Gate_c : public dBgS_MoveBgActor {
public:
enum Mode_e {
MODE_WAIT_e,
MODE_MOVE_e,
MODE_MOVE_END_e,
};
/* 80C5EBE4 */ void setBaseMtx();
/* 80C5ECEC */ int create();
/* 80C5EEA4 */ void moveGate();
/* 80C5EF48 */ void init_modeWait();
/* 80C5EF54 */ void modeWait();
/* 80C5EFB0 */ void init_modeMove();
/* 80C5EFBC */ void modeMove();
/* 80C5F0C4 */ void init_modeMoveEnd();
/* 80C5F1E4 */ void modeMoveEnd();
/* 80C5EC80 */ virtual int CreateHeap();
/* 80C5EE54 */ virtual int Execute(Mtx**);
/* 80C5F1E8 */ virtual int Draw();
/* 80C5F28C */ virtual int Delete();
/* 0x5A0 */ request_of_phase_process_class mPhase;
/* 0x5A8 */ J3DModel* mpModel;
/* 0x5AC */ u8 mMode;
/* 0x5AD */ u8 mGateOpened;
/* 0x5AE */ u8 mInitMove;
/* 0x5AF */ u8 mMoveType;
/* 0x5B0 */ f32 mMoveTarget;
/* 0x5B4 */ f32 mMoveValue;
};
class daLv4Gate_HIO_c : public mDoHIO_entry_c {
public:
/* 80C5EB6C */ daLv4Gate_HIO_c();
/* 80C5F348 */ virtual ~daLv4Gate_HIO_c() {}
/* 0x4 */ f32 mMoveSpeed;
/* 0x8 */ u8 mShockStrength;
};
#endif /* D_A_OBJ_LV4GATE_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_LV4CHANDELIER_H
#define D_A_OBJ_LV4CHANDELIER_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_LV4CHANDELIER_H */
@@ -1,7 +1,6 @@
#ifndef D_A_OBJ_LV4GEAR_H
#define D_A_OBJ_LV4GEAR_H
#include "f_op/f_op_actor_mng.h"
#include "rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.h"
class daObjLv4Gear_c : public fopAc_ac_c {
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_LV5YCHNDLR_H
#define D_A_OBJ_LV5YCHNDLR_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_LV5YCHNDLR_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_LV5YIBLLTRAY_H
#define D_A_OBJ_LV5YIBLLTRAY_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_LV5YIBLLTRAY_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_LV6BEMOS_H
#define D_A_OBJ_LV6BEMOS_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_LV6BEMOS_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_LV6BEMOS2_H
#define D_A_OBJ_LV6BEMOS2_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_LV6BEMOS2_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_LV6EGATE_H
#define D_A_OBJ_LV6EGATE_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_LV6EGATE_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_LV7BRIDGE_H
#define D_A_OBJ_LV7BRIDGE_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_LV7BRIDGE_H */
@@ -2,6 +2,5 @@
#define D_A_OBJ_MAGLIFTROT_H
#include "d/bg/d_bg_s_movebg_actor.h"
#include "f_op/f_op_actor_mng.h"
#endif /* D_A_OBJ_MAGLIFTROT_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_MAKI_H
#define D_A_OBJ_MAKI_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_MAKI_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_MASTER_SWORD_H
#define D_A_OBJ_MASTER_SWORD_H
#include "f_op/f_op_actor_mng.h"
#endif /* D_A_OBJ_MASTER_SWORD_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 daObjMGate_c : public dBgS_MoveBgActor {
public:
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_MHOLE_H
#define D_A_OBJ_MHOLE_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_MHOLE_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_MIE_H
#define D_A_OBJ_MIE_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_MIE_H */
@@ -1,8 +1,6 @@
#ifndef D_A_OBJ_MOVEBOX_H
#define D_A_OBJ_MOVEBOX_H
#include "d/bg/d_bg_s_movebg_actor.h"
#include "d/bg/d_bg_w.h"
#include "d/com/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_NAMEPLATE_H
#define D_A_OBJ_NAMEPLATE_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_NAMEPLATE_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_NDOOR_H
#define D_A_OBJ_NDOOR_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_NDOOR_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_OCTHASHI_H
#define D_A_OBJ_OCTHASHI_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_OCTHASHI_H */
@@ -1,7 +1,6 @@
#ifndef D_A_OBJ_OILTUBO_H
#define D_A_OBJ_OILTUBO_H
#include "f_op/f_op_actor_mng.h"
#include "d/com/d_com_inf_game.h"
class daObj_Oiltubo_c : public fopAc_ac_c {
@@ -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 daObjOnsen_c : public dBgS_MoveBgActor {
public:
@@ -1,7 +1,6 @@
#ifndef D_A_OBJ_ONSENFIRE_H
#define D_A_OBJ_ONSENFIRE_H
#include "f_op/f_op_actor_mng.h"
#include "d/com/d_com_inf_game.h"
class daObjOnsenFire_c : public fopAc_ac_c {
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_PDTILE_H
#define D_A_OBJ_PDTILE_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_PDTILE_H */
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_PILLAR_H
#define D_A_OBJ_PILLAR_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_PILLAR_H */
@@ -1,8 +1,6 @@
#ifndef D_A_OBJ_PLEAF_H
#define D_A_OBJ_PLEAF_H
#include "d/bg/d_bg_s.h"
#include "d/cc/d_cc_d.h"
#include "d/com/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
@@ -2,7 +2,6 @@
#define D_A_OBJ_PROP_H
#include "d/com/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
class daObjProp_c : public fopAc_ac_c, public request_of_phase_process_class {
public:
@@ -1,6 +1,5 @@
#ifndef D_A_OBJ_PUMPKIN_H
#define D_A_OBJ_PUMPKIN_H
#include "dolphin/types.h"
#endif /* D_A_OBJ_PUMPKIN_H */

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