zant mobile done

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

Hide file tree

Showing 6 changed files with 515 additions and 646 deletions.
diff --git a/config/GZ2E01/rels/d_a_b_zant_magic/symbols.txt b/config/GZ2E01/rels/d_a_b_zant_magic/symbols.txt
@@ -2,24 +2,24 @@ _prolog = .text:0x00000000; // type:function size:0x2C scope:global
 _epilog = .text:0x0000002C; // type:function size:0x2C scope:global
 _unresolved = .text:0x00000058; // type:function size:0x20 scope:global
 draw__11daB_ZANTM_cFv = .text:0x00000078; // type:function size:0x3C scope:global
-daB_ZANTM_Draw__FP11daB_ZANTM_c = .text:0x000000B4; // type:function size:0x20 scope:global
+daB_ZANTM_Draw__FP11daB_ZANTM_c = .text:0x000000B4; // type:function size:0x20 scope:local
 setMagicEffect__11daB_ZANTM_cFv = .text:0x000000D4; // type:function size:0x164 scope:global
 setMagicHitEffect__11daB_ZANTM_cFv = .text:0x00000238; // type:function size:0x118 scope:global
 executeSmall__11daB_ZANTM_cFv = .text:0x00000350; // type:function size:0x31C scope:global
 cc_set__11daB_ZANTM_cFv = .text:0x0000066C; // type:function size:0x100 scope:global
 execute__11daB_ZANTM_cFv = .text:0x0000076C; // type:function size:0x98 scope:global
-daB_ZANTM_Execute__FP11daB_ZANTM_c = .text:0x00000804; // type:function size:0x20 scope:global
-daB_ZANTM_IsDelete__FP11daB_ZANTM_c = .text:0x00000824; // type:function size:0x8 scope:global
+daB_ZANTM_Execute__FP11daB_ZANTM_c = .text:0x00000804; // type:function size:0x20 scope:local
+daB_ZANTM_IsDelete__FP11daB_ZANTM_c = .text:0x00000824; // type:function size:0x8 scope:local
 _delete__11daB_ZANTM_cFv = .text:0x0000082C; // type:function size:0x8 scope:global
-daB_ZANTM_Delete__FP11daB_ZANTM_c = .text:0x00000834; // type:function size:0x20 scope:global
+daB_ZANTM_Delete__FP11daB_ZANTM_c = .text:0x00000834; // type:function size:0x20 scope:local
 create__11daB_ZANTM_cFv = .text:0x00000854; // type:function size:0x154 scope:global
 __ct__11daB_ZANTM_cFv = .text:0x000009A8; // type:function size:0x1A8 scope:global
 __dt__8cM3dGSphFv = .text:0x00000B50; // type:function size:0x48 scope:global
 __dt__8cM3dGAabFv = .text:0x00000B98; // type:function size:0x48 scope:global
 __dt__10dCcD_GSttsFv = .text:0x00000BE0; // type:function size:0x5C scope:global
 __dt__12dBgS_ObjAcchFv = .text:0x00000C3C; // type:function size:0x70 scope:global
 __dt__12dBgS_AcchCirFv = .text:0x00000CAC; // type:function size:0x70 scope:global
-daB_ZANTM_Create__FP11daB_ZANTM_c = .text:0x00000D1C; // type:function size:0x20 scope:global
+daB_ZANTM_Create__FP11daB_ZANTM_c = .text:0x00000D1C; // type:function size:0x20 scope:local
 __dt__10cCcD_GSttsFv = .text:0x00000D3C; // type:function size:0x48 scope:global
 @36@__dt__12dBgS_ObjAcchFv = .text:0x00000D84; // type:function size:0x8 scope:local
 @20@__dt__12dBgS_ObjAcchFv = .text:0x00000D8C; // type:function size:0x8 scope:local
@@ -44,14 +44,14 @@ _dtors = .dtors:0x00000000; // type:label scope:global
 @3939 = .rodata:0x00000044; // type:object size:0x4 scope:local
 @3940 = .rodata:0x00000048; // type:object size:0x4 scope:local
 ...data.0 = .data:0x00000000; // type:label scope:local
-cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global
+cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local
 @1787 = .data:0x0000000C; // type:object size:0x4 scope:local
 cc_zant_src__30@unnamed@d_a_b_zant_magic_cpp@ = .data:0x00000020; // type:object size:0x4C scope:global
 cc_zant_src2__30@unnamed@d_a_b_zant_magic_cpp@ = .data:0x0000006C; // type:object size:0x40 scope:global
 cc_zant_src3__30@unnamed@d_a_b_zant_magic_cpp@ = .data:0x000000AC; // type:object size:0x40 scope:global
 magic_effect_id$3667 = .data:0x000000EC; // type:object size:0x8 scope:local
 magic_effect_id$3729 = .data:0x000000F4; // type:object size:0x8 scope:local
-l_daB_ZANTM_Method = .data:0x000000FC; // type:object size:0x20 scope:global
+l_daB_ZANTM_Method = .data:0x000000FC; // type:object size:0x20 scope:local
 g_profile_B_ZANTM = .data:0x0000011C; // type:object size:0x30 scope:global
 __vt__12dBgS_AcchCir = .data:0x0000014C; // type:object size:0xC scope:global
 __vt__10cCcD_GStts = .data:0x00000158; // type:object size:0xC scope:global

diff --git a/config/GZ2E01/rels/d_a_b_zant_mobile/symbols.txt b/config/GZ2E01/rels/d_a_b_zant_mobile/symbols.txt
@@ -5,7 +5,7 @@ __register_global_object = .text:0x00000078; // type:function size:0x1C scope:gl
 __destroy_global_chain = .text:0x00000094; // type:function size:0x58 scope:global
 __ct__15daB_ZANTZ_HIO_cFv = .text:0x000000EC; // type:function size:0x24 scope:global
 draw__11daB_ZANTZ_cFv = .text:0x00000110; // type:function size:0x84 scope:global
-daB_ZANTZ_Draw__FP11daB_ZANTZ_c = .text:0x00000194; // type:function size:0x20 scope:global
+daB_ZANTZ_Draw__FP11daB_ZANTZ_c = .text:0x00000194; // type:function size:0x20 scope:local
 setSnortEffect__11daB_ZANTZ_cFi = .text:0x000001B4; // type:function size:0x8C scope:global
 calcSnortEffect__11daB_ZANTZ_cFv = .text:0x00000240; // type:function size:0x29C scope:global
 setMouthMode__11daB_ZANTZ_cFUc = .text:0x000004DC; // type:function size:0x190 scope:global
@@ -15,13 +15,13 @@ __dt__14dBgS_ObjGndChkFv = .text:0x00000B64; // type:function size:0x78 scope:gl
 action__11daB_ZANTZ_cFv = .text:0x00000BDC; // type:function size:0x8A0 scope:global
 cc_set__11daB_ZANTZ_cFv = .text:0x0000147C; // type:function size:0x104 scope:global
 execute__11daB_ZANTZ_cFv = .text:0x00001580; // type:function size:0xD4 scope:global
-daB_ZANTZ_Execute__FP11daB_ZANTZ_c = .text:0x00001654; // type:function size:0x20 scope:global
-daB_ZANTZ_IsDelete__FP11daB_ZANTZ_c = .text:0x00001674; // type:function size:0x8 scope:global
+daB_ZANTZ_Execute__FP11daB_ZANTZ_c = .text:0x00001654; // type:function size:0x20 scope:local
+daB_ZANTZ_IsDelete__FP11daB_ZANTZ_c = .text:0x00001674; // type:function size:0x8 scope:local
 _delete__11daB_ZANTZ_cFv = .text:0x0000167C; // type:function size:0x88 scope:global
-daB_ZANTZ_Delete__FP11daB_ZANTZ_c = .text:0x00001704; // type:function size:0x20 scope:global
+daB_ZANTZ_Delete__FP11daB_ZANTZ_c = .text:0x00001704; // type:function size:0x20 scope:local
 CreateHeap__11daB_ZANTZ_cFv = .text:0x00001724; // type:function size:0x20C scope:global
 __dt__12J3DFrameCtrlFv = .text:0x00001930; // type:function size:0x48 scope:global
-useHeapInit__FP10fopAc_ac_c = .text:0x00001978; // type:function size:0x20 scope:global
+useHeapInit__FP10fopAc_ac_c = .text:0x00001978; // type:function size:0x20 scope:local
 create__11daB_ZANTZ_cFv = .text:0x00001998; // type:function size:0x2BC scope:global
 __dt__8dCcD_CylFv = .text:0x00001C54; // type:function size:0xCC scope:global
 __ct__8dCcD_CylFv = .text:0x00001D20; // type:function size:0x84 scope:global
@@ -30,7 +30,7 @@ __dt__8cM3dGAabFv = .text:0x00001DEC; // type:function size:0x48 scope:global
 __dt__8dCcD_SphFv = .text:0x00001E34; // type:function size:0xCC scope:global
 __ct__8dCcD_SphFv = .text:0x00001F00; // type:function size:0x84 scope:global
 __dt__8cM3dGSphFv = .text:0x00001F84; // type:function size:0x48 scope:global
-daB_ZANTZ_Create__FP11daB_ZANTZ_c = .text:0x00001FCC; // type:function size:0x20 scope:global
+daB_ZANTZ_Create__FP11daB_ZANTZ_c = .text:0x00001FCC; // type:function size:0x20 scope:local
 __dt__15daB_ZANTZ_HIO_cFv = .text:0x00001FEC; // type:function size:0x48 scope:global
 __sinit_d_a_b_zant_mobile_cpp = .text:0x00002034; // type:function size:0x3C scope:local
 @20@__dt__14dBgS_ObjGndChkFv = .text:0x00002070; // type:function size:0x8 scope:local
@@ -77,9 +77,9 @@ _dtors = .dtors:0x00000000; // type:label scope:global
 @4373 = .rodata:0x0000008C; // type:object size:0x4 scope:local
 @4374 = .rodata:0x00000090; // type:object size:0x4 scope:local
 @stringBase0 = .rodata:0x00000094; // type:object size:0xB scope:local data:string_table
-cc_zant_src__31@unnamed@d_a_b_zant_mobile_cpp@ = .data:0x00000000; // type:object size:0x40 scope:global
-cc_zant_snort_src__31@unnamed@d_a_b_zant_mobile_cpp@ = .data:0x00000040; // type:object size:0x44 scope:global
-l_daB_ZANTZ_Method = .data:0x00000084; // type:object size:0x20 scope:global
+cc_zant_src__31@unnamed@d_a_b_zant_mobile_cpp@ = .data:0x00000000; // type:object size:0x40 scope:local
+cc_zant_snort_src__31@unnamed@d_a_b_zant_mobile_cpp@ = .data:0x00000040; // type:object size:0x44 scope:local
+l_daB_ZANTZ_Method = .data:0x00000084; // type:object size:0x20 scope:local
 g_profile_B_ZANTZ = .data:0x000000A4; // type:object size:0x30 scope:global
 __vt__8cM3dGSph = .data:0x000000D4; // type:object size:0xC scope:global
 __vt__8cM3dGAab = .data:0x000000E0; // type:object size:0xC scope:global
@@ -88,6 +88,6 @@ __vt__12J3DFrameCtrl = .data:0x000000F8; // type:object size:0xC scope:global
 __vt__14dBgS_ObjGndChk = .data:0x00000104; // type:object size:0x30 scope:global
 __vt__15daB_ZANTZ_HIO_c = .data:0x00000134; // type:object size:0xC scope:global
 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
-lbl_157_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte
+lbl_157_bss_8 = .bss:0x00000008; // type:object size:0x1 scope:local data:byte
 @3644 = .bss:0x0000000C; // type:object size:0xC scope:local
 l_HIO = .bss:0x00000018; // type:object size:0xC scope:global data:byte
diff --git a/configure.py b/configure.py
@@ -1521,8 +1521,8 @@ def MatchingFor(*versions):
     ActorRel(Equivalent, "d_a_b_yo"),
     ActorRel(Equivalent, "d_a_b_yo_ice"),
     ActorRel(NonMatching, "d_a_b_zant"),
-    ActorRel(NonMatching, "d_a_b_zant_magic"),
-    ActorRel(NonMatching, "d_a_b_zant_mobile"),
+    ActorRel(Equivalent, "d_a_b_zant_magic"),  # matches in objdiff, unknown issue
+    ActorRel(Matching, "d_a_b_zant_mobile"),
     ActorRel(Matching, "d_a_b_zant_sima"),
     ActorRel(NonMatching, "d_a_balloon_2D"),
     ActorRel(NonMatching, "d_a_bullet"),

diff --git a/include/d/actor/d_a_b_zant_mobile.h b/include/d/actor/d_a_b_zant_mobile.h
@@ -2,40 +2,66 @@
 #define D_A_B_ZANT_MOBILE_H
 
 #include "f_op/f_op_actor_mng.h"
+#include "d/d_cc_d.h"
+#include "d/d_bg_w.h"
 
 /**
  * @ingroup actors-enemies
  * @class daB_ZANTZ_c
  * @brief Zant (Mobile)
  *
- * @details Palace of Twilight dungeon boss (mobile form?).
+ * @details Palace of Twilight dungeon boss (Moving Helmet Structure).
  *
  */
 class daB_ZANTZ_c : public fopEn_enemy_c {
 public:
-    /* 806507B0 */ void draw();
+    /* 806507B0 */ int draw();
     /* 80650854 */ void setSnortEffect(int);
     /* 806508E0 */ void calcSnortEffect();
     /* 80650B7C */ void setMouthMode(u8);
     /* 80650D0C */ void setAppearMode(u8);
-    /* 806510C0 */ void getGroundPos();
+    /* 806510C0 */ f32 getGroundPos();
     /* 8065127C */ void action();
     /* 80651B1C */ void cc_set();
-    /* 80651C20 */ void execute();
-    /* 80651D1C */ void _delete();
-    /* 80651DC4 */ void CreateHeap();
-    /* 80652038 */ void create();
+    /* 80651C20 */ int execute();
+    /* 80651D1C */ int _delete();
+    /* 80651DC4 */ int CreateHeap();
+    /* 80652038 */ int create();
 
 private:
-    /* 0x5ac */ u8 field_0x5ac[0xd14 - 0x5ac];
+    /* 0x5AC */ request_of_phase_process_class mPhase;
+    /* 0x5B4 */ mDoExt_McaMorfSO* mpMorf;
+    /* 0x5B8 */ mDoExt_brkAnm* mpBrk;
+    /* 0x5BC */ Z2CreatureEnemy mSound;
+    /* 0x660 */ f32 field_0x660;
+    /* 0x664 */ f32 field_0x664;
+    /* 0x668 */ int field_0x668;
+    /* 0x66C */ u8 mMouthMode;
+    /* 0x66D */ u8 mAppearMode;
+    /* 0x66E */ u8 field_0x66e;
+    /* 0x66F */ u8 field_0x66f;
+    /* 0x670 */ u8 field_0x670;
+    /* 0x671 */ u8 mSearchContinue;
+    /* 0x674 */ Mtx mBgMtx;
+    /* 0x6A4 */ dBgW* mpBgW;
+    /* 0x6A8 */ dCcD_Stts mCcStts;
+    /* 0x6E4 */ dCcD_Sph field_0x6e4[3];
+    /* 0xA8C */ dCcD_Cyl mSnortColliders[2];
+    /* 0xD04 */ u32 field_0xd04;
+    /* 0xD08 */ u32 field_0xd08;
+    /* 0xD0C */ u32 field_0xd0c;
+    /* 0xD10 */ u8 mInitHIO;
 };
 
 STATIC_ASSERT(sizeof(daB_ZANTZ_c) == 0xd14);
 
 class daB_ZANTZ_HIO_c {
 public:
     /* 8065078C */ daB_ZANTZ_HIO_c();
-    /* 8065268C */ ~daB_ZANTZ_HIO_c();
+    /* 8065268C */ virtual ~daB_ZANTZ_HIO_c() {}
+
+    /* 0x4 */ s8 field_0x4;
+    /* 0x8 */ f32 mModelSize;
 };
 
 

diff --git a/src/d/actor/d_a_b_zant_magic.cpp b/src/d/actor/d_a_b_zant_magic.cpp
@@ -26,7 +26,7 @@ UNK_REL_DATA
 namespace {
 /* 80650508-80650554 000020 004C+00 0/1 0/0 0/0 .data
  * cc_zant_src__30@unnamed@d_a_b_zant_magic_cpp@                */
-static dCcD_SrcCps cc_zant_src = {
+dCcD_SrcCps cc_zant_src = {
     {
         {0, {{AT_TYPE_CSTATUE_SWING, 2, 0x1D}, {0xD8FBFDFF, 0}, 0}},
         {dCcD_SE_13, 0, 1, 0, {0}},
@@ -42,7 +42,7 @@ static dCcD_SrcCps cc_zant_src = {
 
 /* 80650554-80650594 00006C 0040+00 0/1 0/0 0/0 .data
  * cc_zant_src2__30@unnamed@d_a_b_zant_magic_cpp@               */
-static dCcD_SrcSph cc_zant_src2 = {
+dCcD_SrcSph cc_zant_src2 = {
     {
         {0x0, {{0x400, 0x2, 0x0}, {0x6000, 0x3}, 0x0}}, // mObj
         {dCcD_SE_METAL, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
@@ -56,7 +56,7 @@ static dCcD_SrcSph cc_zant_src2 = {
 
 /* 80650594-806505D4 0000AC 0040+00 0/1 0/0 0/0 .data
  * cc_zant_src3__30@unnamed@d_a_b_zant_magic_cpp@               */
-static dCcD_SrcSph cc_zant_src3 = {
+dCcD_SrcSph cc_zant_src3 = {
     {
         {0x0, {{0x400, 0x2, 0x0}, {0x2, 0x3}, 0x0}}, // mObj
         {dCcD_SE_METAL, 0x0, 0x0, 0x0, 0x0}, // mGObjAt