Setup d_a_obj Actors (#2161)

* checkpoint * checkpoint * checkpoint * checkpoint * checkpoint * checkpoint * checkpoint * finish * add class comments * checkpoint * checkpoint * checkpoint * checkpoint * checkpoint * checkpoint * checkpoint * checkpoint * checkpoint * checkpoint * checkpoint * checkpoint * finish * add class comments * rm duplicate comments * fix build
zeldaret · May 29, 2024 · 2e7510d · 2e7510d
1 parent 7c7bc7f
commit 2e7510d
Show file tree

Hide file tree

Showing 634 changed files with 17,956 additions and 37,461 deletions.
diff --git a/Progress.md b/Progress.md
@@ -21,8 +21,8 @@ Total |  54.954197% | 2209528 | 4020672
 Section | Percentage | Decompiled (bytes) | Total (bytes)
 ---|---|---|---
 main.dol |  54.954197% | 2209528 | 4020672
-RELs |  38.787290% | 4460664 | 11500324
-Total |  42.975283% | 6670192 | 15520996
+RELs |  38.789690% | 4460940 | 11500324
+Total |  42.977062% | 6670468 | 15520996
 
 ## RELs
 
@@ -378,7 +378,7 @@ d_a_obj_chandelier | 100.000000% | 5504 | 5504
 d_a_obj_chest | 100.000000% | 7220 | 7220
 d_a_obj_cho | 100.000000% | 13220 | 13220
 d_a_obj_cowdoor | 100.000000% | 2188 | 2188
-d_a_obj_crope |  26.014689% | 2692 | 10348
+d_a_obj_crope |  28.681871% | 2968 | 10348
 d_a_obj_crvfence |  37.146893% | 3156 | 8496
 d_a_obj_crvgate |  27.603513% | 4400 | 15940
 d_a_obj_crvhahen |  37.120623% | 1908 | 5140
@@ -785,4 +785,4 @@ d_a_vrbox2 |  44.907111% | 2804 | 6244
 d_a_warp_bug | 100.000000% | 2024 | 2024
 d_a_ykgr |  44.400631% | 2252 | 5072
 f_pc_profile_lst | 100.000000% | 28156 | 28156
-Total |  38.787290% | 4460664 | 11500324
+Total |  38.789690% | 4460940 | 11500324
diff --git a/include/rel/d/a/b/d_a_b_yo/d_a_b_yo.h b/include/rel/d/a/b/d_a_b_yo/d_a_b_yo.h
@@ -1,7 +1,6 @@
 #ifndef D_A_B_YO_H
 #define D_A_B_YO_H
 
-#include "dolphin/types.h"
 #include "f_op/f_op_actor_mng.h"
 
 /**

diff --git a/include/rel/d/a/e/d_a_e_bg/d_a_e_bg.h b/include/rel/d/a/e/d_a_e_bg/d_a_e_bg.h
@@ -1,7 +1,6 @@
 #ifndef D_A_E_BG_H
 #define D_A_E_BG_H
 
-#include "dolphin/types.h"
 #include "f_op/f_op_actor_mng.h"
 
 /**

diff --git a/include/rel/d/a/e/d_a_e_bug/d_a_e_bug.h b/include/rel/d/a/e/d_a_e_bug/d_a_e_bug.h
@@ -1,7 +1,6 @@
 #ifndef D_A_E_BUG_H
 #define D_A_E_BUG_H
 
-#include "dolphin/types.h"
 #include "f_op/f_op_actor_mng.h"
 
 /**

diff --git a/include/rel/d/a/e/d_a_e_dk/d_a_e_dk.h b/include/rel/d/a/e/d_a_e_dk/d_a_e_dk.h
@@ -1,7 +1,6 @@
 #ifndef D_A_E_DK_H
 #define D_A_E_DK_H
 
-#include "dolphin/types.h"
 #include "f_op/f_op_actor_mng.h"
 
 /**

diff --git a/include/rel/d/a/e/d_a_e_dt/d_a_e_dt.h b/include/rel/d/a/e/d_a_e_dt/d_a_e_dt.h
@@ -1,7 +1,6 @@
 #ifndef D_A_E_DT_H
 #define D_A_E_DT_H
 
-#include "dolphin/types.h"
 #include "f_op/f_op_actor_mng.h"
 
 /**

diff --git a/include/rel/d/a/e/d_a_e_fb/d_a_e_fb.h b/include/rel/d/a/e/d_a_e_fb/d_a_e_fb.h
@@ -1,7 +1,6 @@
 #ifndef D_A_E_FB_H
 #define D_A_E_FB_H
 
-#include "dolphin/types.h"
 #include "f_op/f_op_actor_mng.h"
 
 /**

diff --git a/include/rel/d/a/e/d_a_e_ga/d_a_e_ga.h b/include/rel/d/a/e/d_a_e_ga/d_a_e_ga.h
@@ -1,7 +1,6 @@
 #ifndef D_A_E_GA_H
 #define D_A_E_GA_H
 
-#include "dolphin/types.h"
 #include "f_op/f_op_actor_mng.h"
 
 struct ga_s {

diff --git a/include/rel/d/a/e/d_a_e_gi/d_a_e_gi.h b/include/rel/d/a/e/d_a_e_gi/d_a_e_gi.h
@@ -1,7 +1,6 @@
 #ifndef D_A_E_GI_H
 #define D_A_E_GI_H
 
-#include "dolphin/types.h"
 #include "f_op/f_op_actor_mng.h"
 
 /**

diff --git a/include/rel/d/a/e/d_a_e_gm/d_a_e_gm.h b/include/rel/d/a/e/d_a_e_gm/d_a_e_gm.h
@@ -1,7 +1,6 @@
 #ifndef D_A_E_GM_H
 #define D_A_E_GM_H
 
-#include "dolphin/types.h"
 #include "f_op/f_op_actor_mng.h"
 
 /**

diff --git a/include/rel/d/a/e/d_a_e_gs/d_a_e_gs.h b/include/rel/d/a/e/d_a_e_gs/d_a_e_gs.h
@@ -1,7 +1,6 @@
 #ifndef D_A_E_GS_H
 #define D_A_E_GS_H
 
-#include "dolphin/types.h"
 #include "f_op/f_op_actor_mng.h"
 
 /**

diff --git a/include/rel/d/a/e/d_a_e_hm/d_a_e_hm.h b/include/rel/d/a/e/d_a_e_hm/d_a_e_hm.h
@@ -1,7 +1,6 @@
 #ifndef D_A_E_HM_H
 #define D_A_E_HM_H
 
-#include "dolphin/types.h"
 #include "f_op/f_op_actor_mng.h"
 
 /**

diff --git a/include/rel/d/a/e/d_a_e_hp/d_a_e_hp.h b/include/rel/d/a/e/d_a_e_hp/d_a_e_hp.h
@@ -1,7 +1,6 @@
 #ifndef D_A_E_HP_H
 #define D_A_E_HP_H
 
-#include "dolphin/types.h"
 #include "f_op/f_op_actor_mng.h"
 
 /**

diff --git a/include/rel/d/a/e/d_a_e_kk/d_a_e_kk.h b/include/rel/d/a/e/d_a_e_kk/d_a_e_kk.h
@@ -1,7 +1,6 @@
 #ifndef D_A_E_KK_H
 #define D_A_E_KK_H
 
-#include "dolphin/types.h"
 #include "f_op/f_op_actor_mng.h"
 
 /**

diff --git a/include/rel/d/a/e/d_a_e_oc/d_a_e_oc.h b/include/rel/d/a/e/d_a_e_oc/d_a_e_oc.h
@@ -1,7 +1,6 @@
 #ifndef D_A_E_OC_H
 #define D_A_E_OC_H
 
-#include "dolphin/types.h"
 #include "f_op/f_op_actor_mng.h"
 
 /**

diff --git a/include/rel/d/a/e/d_a_e_ot/d_a_e_ot.h b/include/rel/d/a/e/d_a_e_ot/d_a_e_ot.h
@@ -1,7 +1,6 @@
 #ifndef D_A_E_OT_H
 #define D_A_E_OT_H
 
-#include "dolphin/types.h"
 #include "f_op/f_op_actor_mng.h"
 
 /**

diff --git a/include/rel/d/a/e/d_a_e_pz/d_a_e_pz.h b/include/rel/d/a/e/d_a_e_pz/d_a_e_pz.h
@@ -1,7 +1,6 @@
 #ifndef D_A_E_PZ_H
 #define D_A_E_PZ_H
 
-#include "dolphin/types.h"
 #include "f_op/f_op_actor_mng.h"
 
 /**

diff --git a/include/rel/d/a/e/d_a_e_sw/d_a_e_sw.h b/include/rel/d/a/e/d_a_e_sw/d_a_e_sw.h
@@ -1,7 +1,6 @@
 #ifndef D_A_E_SW_H
 #define D_A_E_SW_H
 
-#include "dolphin/types.h"
 #include "f_op/f_op_actor_mng.h"
 
 /**

diff --git a/include/rel/d/a/e/d_a_e_tt/d_a_e_tt.h b/include/rel/d/a/e/d_a_e_tt/d_a_e_tt.h
@@ -1,7 +1,6 @@
 #ifndef D_A_E_TT_H
 #define D_A_E_TT_H
 
-#include "dolphin/types.h"
 #include "f_op/f_op_actor_mng.h"
 
 /**

diff --git a/include/rel/d/a/e/d_a_e_vt/d_a_e_vt.h b/include/rel/d/a/e/d_a_e_vt/d_a_e_vt.h
@@ -146,6 +146,7 @@ class daE_VA_c : public fopEn_enemy_c {
     /* 807CD668 */ int create();
     /* 807CDAD8 */ daE_VA_c();
 
+private:
     /* 0x005AC */ request_of_phase_process_class mPhase;
     /* 0x005B4 */ mDoExt_McaMorfSO* mpMorf;
     /* 0x005B8 */ mDoExt_McaMorfSO* mpEndEfMorf;
@@ -286,6 +287,7 @@ class daE_VA_HIO_c {
     /* 807C25EC */ daE_VA_HIO_c();
     /* 807CE2AC */ virtual ~daE_VA_HIO_c();
 
+private:
     /* 0x04 */ s8 field_0x04;
     /* 0x08 */ f32 mModelSize;
     /* 0x0C */ f32 mAttackRange;

diff --git a/include/rel/d/a/e/d_a_e_warpappear/d_a_e_warpappear.h b/include/rel/d/a/e/d_a_e_warpappear/d_a_e_warpappear.h
@@ -1,7 +1,6 @@
 #ifndef D_A_E_WARPAPPEAR_H
 #define D_A_E_WARPAPPEAR_H
 
-#include "dolphin/types.h"
 #include "f_op/f_op_actor_mng.h"
 
 /**

diff --git a/include/rel/d/a/e/d_a_e_ws/d_a_e_ws.h b/include/rel/d/a/e/d_a_e_ws/d_a_e_ws.h
@@ -1,7 +1,6 @@
 #ifndef D_A_E_WS_H
 #define D_A_E_WS_H
 
-#include "dolphin/types.h"
 #include "f_op/f_op_actor_mng.h"
 
 /**

diff --git a/include/rel/d/a/e/d_a_e_ww/d_a_e_ww.h b/include/rel/d/a/e/d_a_e_ww/d_a_e_ww.h
@@ -1,7 +1,6 @@
 #ifndef D_A_E_WW_H
 #define D_A_E_WW_H
 
-#include "dolphin/types.h"
 #include "f_op/f_op_actor_mng.h"
 
 /**

diff --git a/include/rel/d/a/e/d_a_e_ymb/d_a_e_ymb.h b/include/rel/d/a/e/d_a_e_ymb/d_a_e_ymb.h
@@ -1,7 +1,6 @@
 #ifndef D_A_E_YMB_H
 #define D_A_E_YMB_H
 
-#include "dolphin/types.h"
 #include "f_op/f_op_actor_mng.h"
 
 /**

diff --git a/include/rel/d/a/e/d_a_e_zh/d_a_e_zh.h b/include/rel/d/a/e/d_a_e_zh/d_a_e_zh.h
@@ -1,7 +1,6 @@
 #ifndef D_A_E_ZH_H
 #define D_A_E_ZH_H
 
-#include "dolphin/types.h"
 #include "f_op/f_op_actor_mng.h"
 
 /**

diff --git a/include/rel/d/a/e/d_a_e_zm/d_a_e_zm.h b/include/rel/d/a/e/d_a_e_zm/d_a_e_zm.h
@@ -1,7 +1,6 @@
 #ifndef D_A_E_ZM_H
 #define D_A_E_ZM_H
 
-#include "dolphin/types.h"
 #include "f_op/f_op_actor_mng.h"
 
 /**

diff --git a/include/rel/d/a/e/d_a_e_zs/d_a_e_zs.h b/include/rel/d/a/e/d_a_e_zs/d_a_e_zs.h
@@ -1,7 +1,6 @@
 #ifndef D_A_E_ZS_H
 #define D_A_E_ZS_H
 
-#include "dolphin/types.h"
 #include "f_op/f_op_actor_mng.h"
 
 /**

diff --git a/include/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.h b/include/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.h
@@ -1,10 +1,21 @@
 #ifndef D_A_OBJ_LV5KEY_H
 #define D_A_OBJ_LV5KEY_H
 
-#include "dolphin/types.h"
-#include "f_op/f_op_actor.h"
+#include "f_op/f_op_actor_mng.h"
 
-struct daObjLv5Key_c : public fopAc_ac_c {
+
+
+
+/**
+ * @ingroup actors-objects
+ * @class daObjLv5Key_c
+ * @brief Snowpeak Ruins Key
+ *
+ * @details
+ *
+ */
+class daObjLv5Key_c : public fopAc_ac_c {
+public:
     /* 80B9B9B8 */ void CreateHeap();
     /* 80B9BA94 */ void Init();
     /* 80B9BB5C */ void setBgc();
@@ -29,8 +40,12 @@ struct daObjLv5Key_c : public fopAc_ac_c {
     void keylock_shake_start() { setStatus(1); }
     bool is_open() { return mStatus == 3; }
 
+private:
     /* 0x568 */ u8 field_0x568[0x945 - 0x568];
     /* 0x945 */ s8 mStatus;
+    /* 0x946 */ u8 field_0x946[0x97c - 0x946];
 };
+STATIC_ASSERT(sizeof(daObjLv5Key_c) == 0x97c);
+
 
 #endif /* D_A_OBJ_LV5KEY_H */
diff --git a/include/rel/d/a/obj/d_a_obj_Turara/d_a_obj_Turara.h b/include/rel/d/a/obj/d_a_obj_Turara/d_a_obj_Turara.h
@@ -1,6 +1,52 @@
 #ifndef D_A_OBJ_TURARA_H
 #define D_A_OBJ_TURARA_H
 
-#include "dolphin/types.h"
+#include "f_op/f_op_actor_mng.h"
+
+/**
+ * @ingroup actors-objects
+ * @class daTurara_c
+ * @brief Icicle
+ *
+ * @details
+ *
+ */
+class daTurara_c : public fopAc_ac_c {
+public:
+    /* 80B9CC9C */ void setBaseMtx();
+    /* 80B9CD74 */ void CreateHeap();
+    /* 80B9CED8 */ void create();
+    /* 80B9D468 */ void setFallStat();
+    /* 80B9D4CC */ void Execute(f32 (**)[3][4]);
+    /* 80B9D548 */ void move();
+    /* 80B9D72C */ void init_modeWait();
+    /* 80B9D738 */ void modeWait();
+    /* 80B9D998 */ void eventStart();
+    /* 80B9D9BC */ void init_modeDropInit();
+    /* 80B9DA00 */ void modeDropInit();
+    /* 80B9DA44 */ void init_modeDrop();
+    /* 80B9DB44 */ void modeDrop();
+    /* 80B9DB90 */ void bgCheck();
+    /* 80B9DBD0 */ void init_modeDropEnd();
+    /* 80B9DE48 */ void modeDropEnd();
+    /* 80B9E078 */ void init_modeDropEnd2();
+    /* 80B9E338 */ void modeDropEnd2();
+    /* 80B9E388 */ void Draw();
+    /* 80B9E478 */ void Delete();
+    /* 80B9E710 */ ~daTurara_c();
+
+    static u8 const mCcDObjInfo[48];
+    static u8 mCcDCyl[68];
+
+private:
+    /* 0x568 */ u8 field_0x568[0x998 - 0x568];
+};
+STATIC_ASSERT(sizeof(daTurara_c) == 0x998);
+
+class daTurara_HIO_c {
+public:
+    /* 80B9CB8C */ daTurara_HIO_c();
+    /* 80B9E5B4 */ ~daTurara_HIO_c();
+};
 
 #endif /* D_A_OBJ_TURARA_H */
diff --git a/include/rel/d/a/obj/d_a_obj_TvCdlst/d_a_obj_TvCdlst.h b/include/rel/d/a/obj/d_a_obj_TvCdlst/d_a_obj_TvCdlst.h
@@ -1,6 +1,43 @@
 #ifndef D_A_OBJ_TVCDLST_H
 #define D_A_OBJ_TVCDLST_H
 
-#include "dolphin/types.h"
+#include "f_op/f_op_actor_mng.h"
+
+/**
+ * @ingroup actors-objects
+ * @class daTvCdlst_c
+ * @brief Ordon Torch Stand
+ *
+ * @details
+ *
+ */
+class daTvCdlst_c : public fopAc_ac_c {
+public:
+    /* 80B9ED40 */ void setBaseMtx();
+    /* 80B9EDC8 */ void CreateHeap();
+    /* 80B9EE34 */ void create();
+    /* 80B9F144 */ void createHeapCallBack(fopAc_ac_c*);
+    /* 80B9F164 */ void lightInit();
+    /* 80B9F1F0 */ void setLight();
+    /* 80B9F220 */ void cutLight();
+    /* 80B9F250 */ void pointLightProc();
+    /* 80B9F300 */ void Execute();
+    /* 80B9F634 */ void Draw();
+    /* 80B9F6D8 */ void Delete();
+
+    static u8 const mCcDObjInfo[48];
+    static u8 mCcDCyl[68];
+
+private:
+    /* 0x568 */ u8 field_0x568[0x754 - 0x568];
+};
+STATIC_ASSERT(sizeof(daTvCdlst_c) == 0x754);
+
+class daTvCdlst_HIO_c {
+public:
+    /* 80B9ECCC */ daTvCdlst_HIO_c();
+    /* 80B9F7B0 */ ~daTvCdlst_HIO_c();
+};
+
 
 #endif /* D_A_OBJ_TVCDLST_H */