En_Test7 (#628)

* En_Test7

* Clean some stuff

* I hate BSS

* PR

* Fix

* Merge

* Fix

* Match (thanks Anon)

* PR

* PR

* PR

* Fix

assets/xml/objects/gameplay_keep.xml

@@ -1356,7 +1356,8 @@
         <DList Name="gameplay_keep_DL_081620" Offset="0x81620" />
         <DList Name="gameplay_keep_DL_081628" Offset="0x81628" />
         <Texture Name="gameplay_keep_Tex_0816C0" OutName="tex_0816C0" Format="rgba16" Width="16" Height="32" Offset="0x816C0" />
-        <Blob Name="gameplay_keep_Blob_081AC0" Size="0x1A90" Offset="0x81AC0" />
+        <Blob Name="gameplay_keep_Blob_081AC0" Size="0x1A74" Offset="0x81AC0" />
+        <Blob Name="gameplay_keep_Blob_083534" Size="0x125C" Offset="0x83534" />
         <DList Name="gameplay_keep_DL_084790" Offset="0x84790" />
         <DList Name="gameplay_keep_DL_0847E0" Offset="0x847E0" />
         <DList Name="gameplay_keep_DL_084850" Offset="0x84850" />
@@ -1387,7 +1388,8 @@
         <DList Name="gameplay_keep_DL_0853B0" Offset="0x853B0" />
         <DList Name="gameplay_keep_DL_085418" Offset="0x85418" />
         <DList Name="gameplay_keep_DL_085490" Offset="0x85490" />
-        <Blob Name="gameplay_keep_Blob_085510" Size="0x140" Offset="0x85510" />
+        <Blob Name="gameplay_keep_Blob_085510" Size="0x130" Offset="0x85510" />
+        <Blob Name="gameplay_keep_Blob_085640" Size="0x3A30" Offset="0x85640" />
         <DList Name="gameplay_keep_DL_089070" Offset="0x89070" />
         <Texture Name="gameplay_keep_TLUT_08A420" OutName="tlut_08A420" Format="rgba16" Width="16" Height="16" Offset="0x8A420" />
         <Texture Name="gameplay_keep_Tex_08A620" OutName="tex_08A620" Format="rgba16" Width="16" Height="16" Offset="0x8A620" />

include/functions.h

@@ -1559,7 +1559,7 @@ void func_800FD538(Color_RGB8* param_1, Color_RGB8* param_2, f32 param_3, Vec3s*
 void func_800FD59C(GlobalContext* globalCtx, Color_RGB8* pzParm2, f32 fParm3);
 void func_800FD5E0(GlobalContext* globalCtx, Color_RGB8* pzParm2, f32 fParm3);
 void func_800FD654(GlobalContext* globalCtx, Color_RGB8* pzParm2, f32 fParm3);
-// void func_800FD698(void);
+void func_800FD698(GlobalContext* globalCtx, s32 arg1, s32 arg2, f32 arg3);
 // u32 get_days_elapsed(void);
 // void reset_days_elapsed(void);
 // u32 get_current_day(void);
@@ -3161,7 +3161,7 @@ void func_80183070(void);
 // void func_8018340C(void);
 void func_80183430(SkeletonInfo* skeletonInfo, void* arg1, void* arg2, Vec3s* arg3, s16* arg4, UnkKeyframeCallback* callbacks);
 void func_8018349C(UNK_PTR arg0);
-// void func_801834A8(void);
+void func_801834A8(SkeletonInfo* skeletonInfo, void* arg1);
 // void func_80183510(void);
 // void func_80183580(void);
 void func_801835EC(UNK_PTR arg0, UNK_PTR arg1);
@@ -3554,7 +3554,7 @@ void func_801A2C20(void);
 void func_801A2C88(u16 seqId);
 void func_801A2D54(u16 seqId);
 s32 Audio_IsSequencePlaying(u8 seqId);
-void func_801A2E54(s32 param_1);
+void func_801A2E54(s32 bgmId);
 void func_801A2ED8(void);
 // void func_801A2F88(void);
 // void func_801A3000(void);

spec

@@ -3680,9 +3680,7 @@ beginseg
     name "ovl_En_Test7"
     compress
     include "build/src/overlays/actors/ovl_En_Test7/z_en_test7.o"
-    include "build/data/ovl_En_Test7/ovl_En_Test7.data.o"
-    include "build/data/ovl_En_Test7/ovl_En_Test7.bss.o"
-    include "build/data/ovl_En_Test7/ovl_En_Test7.reloc.o"
+    include "build/src/overlays/actors/ovl_En_Test7/ovl_En_Test7_reloc.o"
 endseg
 
 beginseg

src/overlays/actors/ovl_En_Test7/z_en_test7.h

@@ -6,12 +6,60 @@
 struct EnTest7;
 
 typedef void (*EnTest7ActionFunc)(struct EnTest7*, GlobalContext*);
+typedef void (*EnTest7UnkFunc)(struct EnTest7*, GlobalContext*);
+typedef void (*EnTest7UnkDrawFunc)(Actor*, GlobalContext*);
+
+#define ENTEST7_GET(thisx) ((thisx)->params)
+
+#define ENTEST7_MINUS1 -1
+#define ENTEST7_26 0x26
+#define ENTEST7_1C 0x1C
+
+typedef struct {
+    /* 0x00 */ f32 unk_00;
+    /* 0x04 */ f32 unk_04;
+    /* 0x08 */ f32 unk_08;
+    /* 0x0C */ f32 unk_0C;
+    /* 0x10 */ s16 unk_10;
+} EnTest7Struct; // size >= 0x14
+
+typedef struct {
+    /* 0x00 */ s32 unk_00;
+    /* 0x04 */ s32 unk_04;
+    /* 0x08 */ Vec3f unk_08;
+    /* 0x14 */ f32 unk_14;
+    /* 0x18 */ f32 unk_18;
+    /* 0x1C */ f32 unk_1C;
+    /* 0x20 */ f32 unk_20;
+    /* 0x24 */ f32 unk_24;
+    /* 0x28 */ f32 unk_28;
+    /* 0x2C */ f32 unk_2C;
+    /* 0x30 */ Vec3s unk_30;
+    /* 0x36 */ s16 unk_36;
+    /* 0x38 */ s16 unk_38;
+    /* 0x3A */ s16 unk_3A;
+} EnTest7Struct2; // size = 0x3C
 
 typedef struct EnTest7 {
     /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x1D18];
+    /* 0x0144 */ s32 unk_144;
+    /* 0x0148 */ EnTest7Struct unk_148;
+    /* 0x015C */ EnTest7Struct2 unk_15C[100];
+    /* 0x18CC */ SkeletonInfo unk_18CC;
+    /* 0x18FC */ Vec3s unk_18FC[114];
+    /* 0x1BA8 */ s16 unk_1BA8[342];
+    /* 0x1E54 */ s32 unk_1E54;
+    /* 0x1E58 */ EnTest7UnkFunc unk_1E58;
     /* 0x1E5C */ EnTest7ActionFunc actionFunc;
-    /* 0x1E60 */ char unk_1E60[0x3C];
+    /* 0x1E60 */ Vec3f unk_1E60;
+    /* 0x1E6C */ Vec3f unk_1E6C;
+    /* 0x1E78 */ f32 unk_1E78;
+    /* 0x1E7C */ LightNode* lightNode;
+    /* 0x1E80 */ LightInfo lightInfo;
+    /* 0x1E8E */ s16 unk_1E8E;
+    /* 0x1E90 */ f32 unk_1E90;
+    /* 0x1E94 */ f32 unk_1E94;
+    /* 0x1E98 */ EnTest7UnkDrawFunc unk_1E98;
 } EnTest7; // size = 0x1E9C
 
 extern const ActorInit En_Test7_InitVars;

tools/disasm/variables.txt

@@ -13473,10 +13473,9 @@
     0x80AF34F4:("D_80AF34F4","f32","",0x4),
     0x80AF34F8:("D_80AF34F8","f32","",0x4),
     0x80AF38B0:("D_80AF38B0","UNK_TYPE1","",0x1),
-    0x80AF38F0:("D_80AF38F0","f32","",0x4),
-    0x80AF38F4:("D_80AF38F4","f32","",0x4),
-    0x80AF38F8:("D_80AF38F8","f32","",0x4),
-    0x80AF3900:("D_80AF3900","UNK_TYPE1","",0x1),
+    0x80AF38F0:("D_80AF38F0","Vec3f","",0xC),
+    0x80AF38FC:("D_80AF38FC","UNK_TYPE4","",0x4),
+    0x80AF3900:("D_80AF3900","Vec3f","",0xC),
     0x80AF3E80:("Obj_Lightblock_InitVars","UNK_TYPE1","",0x1),
     0x80AF3EA0:("D_80AF3EA0","UNK_TYPE1","",0x1),
     0x80AF3ECC:("D_80AF3ECC","UNK_TYPE1","",0x1),