En_Zot (#320)

* En_Zot

* PR

include/functions.h

@@ -807,8 +807,8 @@ s32 func_800B863C(Actor* actor, GlobalContext* globalCtx);
 u32 func_800B867C(Actor* actor, GlobalContext* globalCtx);
 UNK_TYPE4 func_800B86C8(Actor* actor1, GlobalContext* globalCtx, Actor* actor2);
 s32 func_800B8708(GlobalContext* globalCtx);
-// void func_800B8718(void);
+s32 func_800B8718(Actor* actor, GlobalContext* globalCtx);
-// void func_800B874C(void);
+void func_800B874C(Actor* actor, GlobalContext* globalCtx, f32 arg2, f32 arg3);
 // void func_800B8804(void);
 // void func_800B882C(void);
 // void func_800B886C(void);
@@ -3792,7 +3792,7 @@ void func_8019AEC0(UNK_PTR param_1, UNK_PTR param_2);
 // void func_8019B38C(void);
 // void func_8019B3D0(void);
 // void func_8019B4B8(void);
-// void func_8019B544(void);
+void func_8019B544(u16 arg0);
 // void func_8019B568(void);
 // void func_8019B5AC(void);
 // void func_8019B5EC(void);
@@ -3804,7 +3804,7 @@ void func_8019AEC0(UNK_PTR param_1, UNK_PTR param_2);
 // void func_8019C1D0(void);
 // void func_8019C268(void);
 // void func_8019C2E4(void);
-// void func_8019C300(void);
+void func_8019C300(s32 arg0);
 // void func_8019C398(void);
 // void func_8019C5A0(void);
 // void func_8019C8D8(void);

include/macros.h

@@ -56,6 +56,7 @@
 #define TAKE_EQUIPPED_ITEM(equip) (gSaveContext.equips.equipment = ((((void)0, gSaveContext.equips.equipment) & (gEquipNegMasks[equip])) | (u16)(0 << gEquipShifts[equip])))
 #define CUR_FORM_EQUIP(button) (gSaveContext.equips.buttonItems[gSaveContext.playerForm == PLAYER_FORM_HUMAN ? 0 : gSaveContext.playerForm][button])
 #define CHECK_QUEST_ITEM(item) (((void)0, gSaveContext.inventory.questItems) & gBitFlags[item])
+#define REMOVE_QUEST_ITEM(item) (gSaveContext.inventory.questItems = (((void)0, gSaveContext.inventory.questItems) & (-1 - gBitFlags[item])))
 
 #define CAPACITY(upg, value) gUpgradeCapacities[upg][value]
 #define CUR_CAPACITY(upg) CAPACITY(upg, CUR_UPG_VALUE(upg) - 4)

spec

@@ -4484,8 +4484,7 @@ beginseg
     name "ovl_En_Zot"
     compress
     include "build/src/overlays/actors/ovl_En_Zot/z_en_zot.o"
-    include "build/data/ovl_En_Zot/ovl_En_Zot.data.o"
+    include "build/src/overlays/actors/ovl_En_Zot/ovl_En_Zot_reloc.o"
-    include "build/data/ovl_En_Zot/ovl_En_Zot.reloc.o"
 endseg
 
 beginseg

src/overlays/actors/ovl_En_Zot/z_en_zot.h

@@ -7,9 +7,25 @@ struct EnZot;
 
 typedef void (*EnZotActionFunc)(struct EnZot*, GlobalContext*);
 
+#define ENZOT_GET_1F(thisx) ((thisx)->params & 0x1F)
+#define ENZOT_GET_FC00(thisx) (((thisx)->params & 0xFC00) >> 0xA)
+
 typedef struct EnZot {
     /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x1B4];
+    /* 0x0144 */ SkelAnime skelAnime;
+    /* 0x0188 */ ColliderCylinder collider;
+    /* 0x01D4 */ Vec3s jointTable[20];
+    /* 0x024C */ Vec3s morphTable[20];
+    /* 0x02C4 */ Vec3s unk_2C4;
+    /* 0x02CA */ Vec3s unk_2CA;
+    /* 0x02D0 */ Path* path;
+    /* 0x02D4 */ s32 unk_2D4;
+    /* 0x02D8 */ Actor* unk_2D8[5];
+    /* 0x02EC */ s16 unk_2EC;
+    /* 0x02EE */ s16 unk_2EE;
+    /* 0x02F0 */ s16 unk_2F0;
+    /* 0x02F2 */ u16 unk_2F2;
+    /* 0x02F4 */ s16 unk_2F4;
     /* 0x02F8 */ EnZotActionFunc actionFunc;
 } EnZot; // size = 0x2FC
 

tools/disasm/functions.txt

@@ -14940,8 +14940,8 @@
     0x80B99384:("func_80B99384",),
     0x80B99394:("EnZot_Update",),
     0x80B99580:("func_80B99580",),
-    0x80B995A4:("func_80B995A4",),
+    0x80B995A4:("EnZot_OverrideLimbDraw",),
-    0x80B99758:("func_80B99758",),
+    0x80B99758:("EnZot_PostLimbDraw",),
     0x80B99798:("EnZot_Draw",),
     0x80B9A0B0:("ObjTree_Init",),
     0x80B9A1BC:("ObjTree_Destroy",),

undefined_syms.txt

@@ -3783,9 +3783,20 @@ D_06015238 = 0x06015238;
 
 // ovl_En_Zot
 
+D_06002898 = 0x06002898;
 D_06004248 = 0x06004248;
+D_060050A0 = 0x060050A0;
+D_060058A0 = 0x060058A0;
+D_060060A0 = 0x060060A0;
 D_0600D208 = 0x0600D208;
 D_0600DE20 = 0x0600DE20;
+D_0600DF54 = 0x0600DF54;
+D_0600E400 = 0x0600E400;
+D_0600EDF0 = 0x0600EDF0;
+D_0600F4E8 = 0x0600F4E8;
+D_0600FDF0 = 0x0600FDF0;
+D_06010B18 = 0x06010B18;
+D_06011424 = 0x06011424;
 
 // ovl_En_Zov