summaryrefslogtreecommitdiff
path: root/include/rel
diff options
context:
space:
mode:
authorTakaRikka <38417346+TakaRikka@users.noreply.github.com>2023-01-15 11:10:23 -0800
committerGitHub <noreply@github.com>2023-01-15 12:10:23 -0700
commit5e05ae38f8541fddd79341bdcf75488b07ca9122 (patch)
tree57e2806b6e48586e0d9bbde6d221236888137d04 /include/rel
parentc90f9dfde9a3ee5dfa13475e2199ee491671507b (diff)
d_a_b_oh2 / d_a_obj_web0 / d_a_obj_web1 (#243)
* d_a_obj_web0 / d_a_obj_web1 * remove asm * d_a_set_bgobj * d_cc_s work * remove asm * build fix * fix tp.py progress check and rel sha1 check * clean up some bg files
Diffstat (limited to 'include/rel')
-rw-r--r--include/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.h39
-rw-r--r--include/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.h13
-rw-r--r--include/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.h31
-rw-r--r--include/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.h36
4 files changed, 115 insertions, 4 deletions
diff --git a/include/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.h b/include/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.h
index 97db1a0e0f..9dae6051e7 100644
--- a/include/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.h
+++ b/include/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.h
@@ -1,6 +1,43 @@
#ifndef D_A_B_OH2_H
#define D_A_B_OH2_H
-#include "dolphin/types.h"
+#include "d/com/d_com_inf_game.h"
+
+// fix/move to d_a_b_ob later
+class b_ob_class : public fopEn_enemy_c {
+public:
+ /* 0x05AC */ u8 field_0x5ac[0x5c0 - 0x5ac];
+ /* 0x05C0 */ mDoExt_McaMorf* field_0x5c0;
+ /* 0x05C4 */ u8 field_0x5c4[0x4752 - 0x5c4];
+ /* 0x4752 */ s16 field_0x4752;
+ /* 0x4754 */ u8 field_0x4754[0x47a0 - 0x4754];
+ /* 0x47A0 */ f32 field_0x47a0;
+ /* 0x47A4 */ u8 field_0x47a4[0x5d04 - 0x47a4];
+ /* 0x5D04 */ f32 field_0x5d04;
+};
+
+class b_oh2_class : public fopEn_enemy_c {
+public:
+ /* 0x5AC */ request_of_phase_process_class mPhase;
+ /* 0x5B4 */ mDoExt_McaMorfSO* mpMorf;
+ /* 0x5B8 */ mDoExt_invisibleModel mInvisModel;
+ /* 0x5C0 */ mDoExt_btkAnm* mpBtk;
+ /* 0x5C4 */ mDoExt_brkAnm* mpBrk;
+ /* 0x5C8 */ int field_0x5c8;
+ /* 0x5CC */ s16 field_0x5cc;
+ /* 0x5CE */ s16 field_0x5ce;
+ /* 0x5D0 */ u8 field_0x5d0;
+ /* 0x5D2 */ s16 field_0x5d2[4];
+ /* 0x5DA */ s16 field_0x5da;
+ /* 0x5DC */ s16 field_0x5dc;
+ /* 0x5E0 */ f32 field_0x5e0;
+ /* 0x5E4 */ f32 field_0x5e4;
+ /* 0x5E8 */ f32 field_0x5e8[30];
+ /* 0x660 */ cXyz field_0x660[31];
+ /* 0x7D4 */ csXyz field_0x7d4[31];
+ /* 0x88E */ u8 field_0x88e[0x898 - 0x88e];
+ /* 0x898 */ Z2CreatureEnemy mZ2Enemy;
+ /* 0x93C */ u8 field_0x93c[0x948 - 0x93C];
+};
#endif /* D_A_B_OH2_H */
diff --git a/include/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.h b/include/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.h
index debd03f284..da1aa2f64e 100644
--- a/include/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.h
+++ b/include/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.h
@@ -1,6 +1,17 @@
#ifndef D_A_SET_BGOBJ_H
#define D_A_SET_BGOBJ_H
-#include "dolphin/types.h"
+#include "d/com/d_com_inf_game.h"
+
+class daSetBgObj_c : public fopAc_ac_c {
+public:
+ /* 80031870 */ static const char* getArcName(fopAc_ac_c*);
+ /* 80485D78 */ int CreateInit();
+ /* 80485DFC */ int create();
+ /* 80485E88 */ int Delete();
+
+ /* 0x568 */ request_of_phase_process_class mPhase;
+ /* 0x570 */ const char mArcName[16];
+};
#endif /* D_A_SET_BGOBJ_H */
diff --git a/include/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.h b/include/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.h
index 1c34e122af..0bebd778e9 100644
--- a/include/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.h
+++ b/include/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.h
@@ -1,6 +1,35 @@
#ifndef D_A_OBJ_WEB0_H
#define D_A_OBJ_WEB0_H
-#include "dolphin/types.h"
+#include "d/com/d_com_inf_game.h"
+
+class obj_web0_class : public fopAc_ac_c {
+public:
+ /* 0x568 */ request_of_phase_process_class mPhase;
+ /* 0x570 */ u8 mPrm0;
+ /* 0x571 */ u8 mScaleXY;
+ /* 0x574 */ J3DModel* mpModel;
+ /* 0x578 */ mDoExt_brkAnm* mpBrk;
+ /* 0x57C */ s16 field_0x57c;
+ /* 0x57E */ u8 field_0x57e[0x582 - 0x57e];
+ /* 0x582 */ s16 mReboundTimer;
+ /* 0x584 */ s16 field_0x584[2];
+ /* 0x588 */ s16 mHitTimer;
+ /* 0x58A */ u8 field_0x58a[0x590 - 0x58a];
+ /* 0x590 */ Mtx mMtx;
+ /* 0x5C0 */ dBgW* mpBgW;
+ /* 0x5C4 */ dCcD_Stts mStts;
+ /* 0x600 */ dCcD_Sph mSphCc;
+ /* 0x738 */ u8 mDeleteTimer;
+ /* 0x739 */ u8 field_0x739;
+}; // Size: 0x73C
+
+class daObj_Web0_HIO_c {
+public:
+ /* 80D3452C */ daObj_Web0_HIO_c();
+ /* 80D350E4 */ virtual ~daObj_Web0_HIO_c() {}
+
+ /* 0x4 */ s8 field_0x4;
+};
#endif /* D_A_OBJ_WEB0_H */
diff --git a/include/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.h b/include/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.h
index f343cdd036..54f73702cc 100644
--- a/include/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.h
+++ b/include/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.h
@@ -1,6 +1,40 @@
#ifndef D_A_OBJ_WEB1_H
#define D_A_OBJ_WEB1_H
-#include "dolphin/types.h"
+#include "d/com/d_com_inf_game.h"
+
+class obj_web1_class : public fopAc_ac_c {
+public:
+ /* 0x568 */ request_of_phase_process_class mPhase;
+ /* 0x570 */ u8 mPrm0;
+ /* 0x571 */ u8 mScaleX;
+ /* 0x574 */ J3DModel* mpModel;
+ /* 0x578 */ mDoExt_brkAnm* mpBrk;
+ /* 0x57C */ Z2SoundObjSimple mZ2SoundObj;
+ /* 0x59C */ s16 field_0x59c;
+ /* 0x59E */ s16 mActionMode;
+ /* 0x5A0 */ u8 field_0x5a0[2];
+ /* 0x5A2 */ s16 field_0x5a2[2];
+ /* 0x5A6 */ s16 mHitTimer;
+ /* 0x5A8 */ s16 mReboundTimer;
+ /* 0x5AA */ s16 field_0x5aa;
+ /* 0x5AC */ f32 mDistToActor;
+ /* 0x5B0 */ f32 field_0x5b0;
+ /* 0x5B4 */ s8 mDeleteTimer;
+ /* 0x5B5 */ u8 field_0x5b5[0x5C0 - 0x5B5];
+ /* 0x5C0 */ Mtx mMtx;
+ /* 0x5F0 */ dBgW* mpBgW;
+ /* 0x5F4 */ dCcD_Stts mStts;
+ /* 0x630 */ dCcD_Cyl mCylCc;
+ /* 0x76C */ u8 field_0x76c;
+}; // Size: 0x770
+
+class daObj_Web1_HIO_c {
+public:
+ /* 80D353AC */ daObj_Web1_HIO_c();
+ /* 80D36028 */ virtual ~daObj_Web1_HIO_c() {}
+
+ /* 0x4 */ s8 field_0x4;
+};
#endif /* D_A_OBJ_WEB1_H */