En_Dns (#241)

* En_Dns

* NBS

* PR

* PR

* Fix warnings

* PR

Co-authored-by: Angie <angheloalf95@gmail.com>

include/functions.h

@@ -2087,7 +2087,7 @@ void func_8010A33C(GlobalContext* globalCtx, s16 param_2);
 // void func_8010BEBC(void);
 // void func_8010BEF0(void);
 // void func_8010BF24(void);
-s32 func_8010BF58(Actor* actor, GlobalContext* globalCtx, s32* param_3, s32 param_4, s32* param_5);
+s32 func_8010BF58(Actor* actor, GlobalContext* globalCtx, s32* param_3, UNK_PTR param_4, s32* param_5);
 // void Nmi_Init(void);
 // void Nmi_SetPrenmiStart(void);
 // s32 Nmi_GetPrenmiHasStarted(void);
@@ -2700,7 +2700,7 @@ s32 func_8013BC6C(SkelAnime* skelAnime, ActorAnimationEntryS* arg1, s32 arg2);
 // void func_8013C068(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5);
 // void func_8013C624(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6);
 // void func_8013C8B8(void);
-void func_8013C964(Actor* actor, GlobalContext* globalCtx, f32 arg2, f32 arg3, s32 arg4, s32 arg5);
+void func_8013C964(Actor* actor, GlobalContext* globalCtx, f32 param_3, f32 param_4, s32 param_5, s16 param_6);
 // void func_8013CC2C(void);
 // void func_8013CD64(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE1 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7);
 // void func_8013CF04(void);

spec

@@ -1471,8 +1471,7 @@ beginseg
     name "ovl_En_Dns"
     compress
     include "build/src/overlays/actors/ovl_En_Dns/z_en_dns.o"
-    include "build/data/ovl_En_Dns/ovl_En_Dns.data.o"
-    include "build/data/ovl_En_Dns/ovl_En_Dns.reloc.o"
+    include "build/src/overlays/actors/ovl_En_Dns/ovl_En_Dns_reloc.o"
 endseg
 
 beginseg

src/overlays/actors/ovl_En_Dai/z_en_dai.c

@@ -440,7 +440,7 @@ void func_80B3EEDC(EnDai* this, GlobalContext* globalCtx) {
 }
 
 void func_80B3EF90(EnDai* this, GlobalContext* globalCtx) {
-    if (func_8010BF58(&this->actor, globalCtx, D_80B3FC8C, 0, &this->unk_1D0)) {
+    if (func_8010BF58(&this->actor, globalCtx, D_80B3FC8C, NULL, &this->unk_1D0)) {
         func_8013AED4(&this->unk_1CE, 3, 7);
         this->unk_1D0 = 0;
         this->actionFunc = func_80B3F00C;

src/overlays/actors/ovl_En_Dnp/z_en_dnp.c

@@ -321,7 +321,7 @@ void func_80B3D338(EnDnp* this, GlobalContext* globalCtx) {
 }
 
 void func_80B3D3F8(EnDnp* this, GlobalContext* globalCtx) {
-    if (func_8010BF58(&this->actor, globalCtx, D_80B3DE58, 0, &this->unk_328)) {
+    if (func_8010BF58(&this->actor, globalCtx, D_80B3DE58, NULL, &this->unk_328)) {
         func_8013AED4(&this->unk_322, 3, 7);
         this->unk_322 &= ~8;
         this->actionFunc = func_80B3D2D4;

src/overlays/actors/ovl_En_Dnq/z_en_dnq.c

@@ -379,7 +379,7 @@ void func_80A52DC8(EnDnq* this, GlobalContext* globalCtx) {
 void func_80A52FB8(EnDnq* this, GlobalContext* globalCtx) {
     s16 sp2E = this->actor.yawTowardsPlayer;
 
-    if (func_8010BF58(&this->actor, globalCtx, this->unk_380, 0, &this->unk_1E0)) {
+    if (func_8010BF58(&this->actor, globalCtx, this->unk_380, NULL, &this->unk_1E0)) {
         func_8013AED4(&this->unk_37C, 3, 7);
         this->unk_386 = 0;
         this->actionFunc = func_80A52DC8;

src/overlays/actors/ovl_En_Dns/z_en_dns.h

@@ -6,12 +6,54 @@
 struct EnDns;
 
 typedef void (*EnDnsActionFunc)(struct EnDns*, GlobalContext*);
+typedef s32 (*EnDnsFunc)(struct EnDns*, GlobalContext*);
+
+#define ENDNS_GET_7(thisx) ((thisx)->params & 7)
+#define ENDNS_GET_4000(thisx) ((thisx)->params & 0x4000)
+#define ENDNS_GET_8000(thisx) ((thisx)->params & 0x8000)
+
+enum {
+    /* 0x0 */ ENDNS_GET_7_0,
+    /* 0x1 */ ENDNS_GET_7_1,
+    /* 0x2 */ ENDNS_GET_7_2,
+    /* 0x3 */ ENDNS_GET_7_3,
+};
 
 typedef struct EnDns {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x44];
-    /* 0x0188 */ EnDnsActionFunc actionFunc;
-    /* 0x018C */ char unk_18C[0x174];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ EnDnsActionFunc actionFunc;
+    /* 0x18C */ ColliderCylinder collider;
+    /* 0x1D8 */ u8 unk_1D8;
+    /* 0x1D9 */ UNK_TYPE1 unk_1D9[0x3];
+    /* 0x1DC */ s32 unk_1DC;
+    /* 0x1E0 */ s32* unk_1E0;
+    /* 0x1E4 */ Gfx* unk_1E4[13];
+    /* 0x218 */ Vec3f unk_218;
+    /* 0x224 */ Vec3s unk_224;
+    /* 0x22A */ Vec3s jointTable[13];
+    /* 0x278 */ Vec3s morphTable[13];
+    /* 0x2C6 */ u16 unk_2C6;
+    /* 0x2C8 */ u16 unk_2C8;
+    /* 0x2CA */ UNK_TYPE1 unk_2CA[0x2];
+    /* 0x2CC */ s16 unk_2CC;
+    /* 0x2CE */ s16 unk_2CE;
+    /* 0x2D0 */ s16 unk_2D0;
+    /* 0x2D2 */ s16 unk_2D2;
+    /* 0x2D4 */ s16 unk_2D4;
+    /* 0x2D6 */ s16 unk_2D6;
+    /* 0x2D8 */ s16 unk_2D8;
+    /* 0x2DA */ s16 unk_2DA;
+    /* 0x2DC */ s16 unk_2DC;
+    /* 0x2DE */ s16 unk_2DE;
+    /* 0x2E0 */ s16 unk_2E0;
+    /* 0x2E4 */ f32 unk_2E4;
+    /* 0x2E8 */ UNK_TYPE1 unk_2E8[0x4];
+    /* 0x2EC */ f32 unk_2EC;
+    /* 0x2F0 */ f32 unk_2F0;
+    /* 0x2F4 */ EnDnsFunc unk_2F4;
+    /* 0x2F8 */ s32 unk_2F8;
+    /* 0x2FC */ s32 unk_2FC;
 } EnDns; // size = 0x300
 
 extern const ActorInit En_Dns_InitVars;

tools/disasm/variables.txt

@@ -8359,7 +8359,7 @@
     0x8092DD08:("En_Dns_InitVars","UNK_TYPE1","",0x1),
     0x8092DD28:("D_8092DD28","UNK_TYPE1","",0x1),
     0x8092DD54:("D_8092DD54","UNK_PTR","",0x4),
-    0x8092DD60:("D_8092DD60","UNK_TYPE1","",0x1),
+    0x8092DD60:("sAnimations","UNK_TYPE1","",0x1),
     0x8092DE00:("D_8092DE00","UNK_TYPE1","",0x1),
     0x8092DE0C:("D_8092DE0C","UNK_TYPE1","",0x1),
     0x8092DE1C:("D_8092DE1C","UNK_TYPE1","",0x1),

undefined_syms.txt

@@ -1962,6 +1962,18 @@ D_06003DBC = 0x06003DBC;
 
 D_06002C48 = 0x06002C48;
 D_06002DD8 = 0x06002DD8;
+D_06003310 = 0x06003310;
+D_060034EC = 0x060034EC;
+D_060008F4 = 0x060008F4;
+D_06000BD8 = 0x06000BD8;
+D_06000D58 = 0x06000D58;
+D_06000FEC = 0x06000FEC;
+D_060002A8 = 0x060002A8;
+D_06000734 = 0x06000734;
+D_060028E8 = 0x060028E8;
+D_06002968 = 0x06002968;
+D_060029E8 = 0x060029E8;
+D_06002968 = 0x06002968;
 
 // ovl_En_Dodongo