zant_magic done

zeldaret · Nov 13, 2024 · 80fe223 · 80fe223
1 parent ebd7e3f
commit 80fe223
Show file tree

Hide file tree

Showing 4 changed files with 257 additions and 433 deletions.
diff --git a/include/d/actor/d_a_b_zant.h b/include/d/actor/d_a_b_zant.h
@@ -41,8 +41,8 @@ class daB_ZANT_c : public fopEn_enemy_c {
     /* 80640310 */ void setWaterBubble();
     /* 806403D4 */ void setMonkeyFallEffect();
     /* 80640478 */ void setLastRollEffect();
-    /* 80640654 */ void getMagicSpeed();
-    /* 80640664 */ void getMagicWaterSpeed();
+    /* 80640654 */ f32 getMagicSpeed();
+    /* 80640664 */ f32 getMagicWaterSpeed();
     /* 80640674 */ void executeSmallAttack();
     /* 80640C20 */ void calcScale(int);
     /* 80640D14 */ void executeWarp();

diff --git a/include/d/actor/d_a_b_zant_magic.h b/include/d/actor/d_a_b_zant_magic.h
@@ -2,6 +2,8 @@
 #define D_A_B_ZANT_MAGIC_H
 
 #include "f_op/f_op_actor_mng.h"
+#include "d/d_cc_d.h"
+#include "d/d_bg_s_acch.h"
 
 /**
  * @ingroup actors-enemies
@@ -13,18 +15,29 @@
  */
 class daB_ZANTM_c : public fopEn_enemy_c {
 public:
-    /* 8064F778 */ void draw();
+    /* 8064F778 */ int draw();
     /* 8064F7D4 */ void setMagicEffect();
     /* 8064F938 */ void setMagicHitEffect();
     /* 8064FA50 */ void executeSmall();
     /* 8064FD6C */ void cc_set();
-    /* 8064FE6C */ void execute();
-    /* 8064FF2C */ bool _delete();
-    /* 8064FF54 */ void create();
-    /* 806500A8 */ daB_ZANTM_c();
+    /* 8064FE6C */ int execute();
+    /* 8064FF2C */ int _delete();
+    /* 8064FF54 */ int create();
 
 private:
-    /* 0x5ac */ u8 field_0x5ac[0xc0c - 0x5ac];
+    /* 0x5AC */ Mtx field_0x5ac;
+    /* 0x5DC */ cXyz field_0x5dc;
+    /* 0x5E8 */ f32 field_0x5e8;
+    /* 0x5EC */ int mAliveTimer;
+    /* 0x5F0 */ u8 mPrm;
+    /* 0x5F1 */ u8 mMode;
+    /* 0x5F4 */ dBgS_AcchCir mAcchCir;
+    /* 0x634 */ dBgS_ObjAcch mAcch;
+    /* 0x80C */ dCcD_Stts mCcStts;
+    /* 0x848 */ dCcD_Sph field_0x848;
+    /* 0x980 */ dCcD_Sph mTgCollider;
+    /* 0xAB8 */ dCcD_Cps mAtCollider;
+    /* 0xBFC */ u32 field_0xbfc[4];
 };
 
 STATIC_ASSERT(sizeof(daB_ZANTM_c) == 0xc0c);

diff --git a/src/d/actor/d_a_b_zant.cpp b/src/d/actor/d_a_b_zant.cpp
@@ -1376,13 +1376,13 @@ static void s_pillar_sub(void* param_0, void* param_1) {
 }
 
 /* 80640654-80640664 002634 0010+00 0/0 0/0 1/1 .text            getMagicSpeed__10daB_ZANT_cFv */
-void daB_ZANT_c::getMagicSpeed() {
+f32 daB_ZANT_c::getMagicSpeed() {
     // NONMATCHING
 }
 
 /* 80640664-80640674 002644 0010+00 0/0 0/0 1/1 .text            getMagicWaterSpeed__10daB_ZANT_cFv
  */
-void daB_ZANT_c::getMagicWaterSpeed() {
+f32 daB_ZANT_c::getMagicWaterSpeed() {
     // NONMATCHING
 }
 
@@ -3013,4 +3013,4 @@ static u8 data_8064F6F4[4];
 static u8 data_8064F6F8[4];
 #pragma pop
 
-/* 8064EE60-8064EE60 000344 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
+/* 8064EE60-8064EE60 000344 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */