En_Test6 (#627)

* En_Test6

* ArrCount

* Always forget params

* PR

* Move defs

* PR

* Fix

* PR

* Merge

* Merge

* PR

* Fix

* PR

* PR

* Fix bss

* Match (thanks Anon)

* bss

* PR

* Merge

* bss

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>

include/functions.h

@@ -1556,7 +1556,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(GlobalContext* globalCtx, s32 arg1, s32 arg2, f32 arg3);
+void func_800FD698(GlobalContext* globalCtx, s16 arg1, s16 arg2, f32 arg3);
 // u32 get_days_elapsed(void);
 // void reset_days_elapsed(void);
 // u32 get_current_day(void);
@@ -2654,10 +2654,10 @@ void ShrinkWindow_Destroy(void);
 void ShrinkWindow_Update(s32 framerateDivisor);
 void ShrinkWindow_Draw(GraphicsContext* gfxCtx);
 // void func_80161180(void);
-void func_8016119C(Camera* camera, struct_801F4D48* arg1);
+s32 func_8016119C(Camera* camera, DbCameraUnkStruct* arg1);
 // void func_8016122C(void);
 // void func_801612B8(void);
-s32 func_80161998(UNK_PTR arg0, struct_801F4D48* arg1);
+s32 func_80161998(u8* cmd, DbCameraUnkStruct* arg1);
 // s32 func_80161BAC(void);
 void func_80161BE0(s16 arg0);
 void func_80161C0C(void);
@@ -2723,7 +2723,7 @@ void func_80165438(UNK_PTR param_1);
 // void func_80165608(void);
 // void func_80165630(void);
 void func_80165658(u32 arg0);
-void func_8016566C(s32 arg0);
+void func_8016566C(u32 arg0);
 void func_80165690(void);
 // void func_801656A4(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7, UNK_TYPE4 param_8);
 // void func_80165DCC(void);

include/z64.h

@@ -1495,6 +1495,20 @@ enum fram_mode {
     FRAM_MODE_STATUS
 };
 
+typedef struct {
+    /* 0x00 */ UNK_TYPE1 unk_00[0x14];
+    /* 0x14 */ s16 unk_14;
+    /* 0x16 */ s16 unk_16;
+    /* 0x18 */ s16 unk_18;
+    /* 0x1A */ UNK_TYPE1 unk_1A[0x3];
+    /* 0x0C */ u8 unk_1D;
+    /* 0x1E */ UNK_TYPE1 unk_1E[0xC];
+    /* 0x2A */ s16 unk_2A;
+    /* 0x1E */ UNK_TYPE1 unk_2C[0x1];
+    /* 0x2D */ u8 unk_2D;
+    /* 0x2E */ UNK_TYPE1 unk_2E[2];
+} DbCameraUnkSubStruct; // size = 0x30
+
 typedef struct {
     /* 0x00 */ s16 unk_00;
     /* 0x02 */ s16 unk_02;
@@ -1504,18 +1518,12 @@ typedef struct {
     /* 0x0A */ s16 unk_0A;
     /* 0x0C */ s16 unk_0C;
     /* 0x0E */ UNK_TYPE1 unk_0E[0x02];
-    /* 0x10 */ UNK_TYPE1 unk_10[0x2C];
-    /* 0x3C */ UNK_TYPE1 unk_3C[0x01];
-    /* 0x3D */ u8 unk_3D;
-    /* 0x3E */ UNK_TYPE1 unk_3E[0x02];
-    /* 0x40 */ UNK_TYPE1 unk_40[0x2C];
-    /* 0x6C */ UNK_TYPE1 unk_6C[0x01];
-    /* 0x6D */ u8 unk_6D;
-    /* 0x6E */ UNK_TYPE1 unk_6E[0x02];
+    /* 0x10 */ DbCameraUnkSubStruct unk_10;
+    /* 0x40 */ DbCameraUnkSubStruct unk_40;
     /* 0x70 */ UNK_PTR unk_70;
     /* 0x74 */ UNK_PTR unk_74;
     /* 0x78 */ UNK_PTR unk_78;
     /* 0x7C */ Camera* camera;
-} struct_801F4D48; // size = 0x80
+} DbCameraUnkStruct; // size = 0x80
 
 #endif

spec

@@ -3145,9 +3145,7 @@ beginseg
     name "ovl_En_Test6"
     compress
     include "build/src/overlays/actors/ovl_En_Test6/z_en_test6.o"
-    include "build/data/ovl_En_Test6/ovl_En_Test6.data.o"
-    include "build/data/ovl_En_Test6/ovl_En_Test6.bss.o"
-    include "build/data/ovl_En_Test6/ovl_En_Test6.reloc.o"
+    include "build/src/overlays/actors/ovl_En_Test6/ovl_En_Test6_reloc.o"
 endseg
 
 beginseg

src/code/z_demo.c

@@ -22,7 +22,7 @@ u8 sCutsceneStoredPlayerForm = 0;
 static u16 seqId;
 #endif
 s16 sCutsceneQuakeIndex;
-struct_801F4D48 sCutsceneCameraInfo;
+DbCameraUnkStruct sCutsceneCameraInfo;
 u16 D_801F4DC8[10];
 UNK_TYPE D_801F4DDC;
 u8 D_801F4DE0;

src/overlays/actors/ovl_Boss_02/z_boss_02.c

@@ -9,6 +9,7 @@
 #include "overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h"
 #include "objects/object_boss02/object_boss02.h"
 #include "objects/gameplay_keep/gameplay_keep.h"
+#include "prevent_bss_reordering.h"
 
 #define FLAGS (ACTOR_FLAG_1 | ACTOR_FLAG_4 | ACTOR_FLAG_10 | ACTOR_FLAG_20)
 

src/overlays/actors/ovl_En_Test6/z_en_test6.h

@@ -7,10 +7,46 @@ struct EnTest6;
 
 typedef void (*EnTest6ActionFunc)(struct EnTest6*, GlobalContext*);
 
+#define ENTEST6_GET(thisx) ((thisx)->params)
+
+enum {
+    /* 24 */ ENTEST6_24 = 24,
+    /* 25 */ ENTEST6_25,
+    /* 26 */ ENTEST6_26,
+};
+
+typedef struct {
+    /* 0x00 */ LightNode* node;
+    /* 0x04 */ LightInfo info;
+} EnTest6Light;
+
 typedef struct EnTest6 {
     /* 0x0000 */ Actor actor;
     /* 0x0144 */ EnTest6ActionFunc actionFunc;
-    /* 0x0148 */ char unk_148[0x140];
+    /* 0x0148 */ Gfx* unk_148;
+    /* 0x014C */ f32 unk_14C;
+    /* 0x0150 */ f32 unk_150;
+    /* 0x0154 */ f32 unk_154;
+    /* 0x0158 */ f32 unk_158;
+    /* 0x015C */ f32 unk_15C;
+    /* 0x0160 */ f32 unk_160;
+    /* 0x0164 */ EnTest6Light lights[2];
+    /* 0x018C */ DbCameraUnkStruct unk_18C;
+    /* 0x020C */ Vec3f unk_20C[6];
+    /* 0x0254 */ Vec3f (*unk_254)[64];
+    /* 0x0258 */ Vec3f unk_258;
+    /* 0x0264 */ Vec3f unk_264;
+    /* 0x0270 */ f32 unk_270;
+    /* 0x0274 */ s16 unk_274;
+    /* 0x0276 */ s16 unk_276;
+    /* 0x0278 */ s16 unk_278;
+    /* 0x027A */ s16 unk_27A;
+    /* 0x027C */ s16 unk_27C;
+    /* 0x027E */ s16 unk_27E;
+    /* 0x0280 */ s16 unk_280;
+    /* 0x0282 */ s16 unk_282;
+    /* 0x0284 */ s16 unk_284;
+    /* 0x0286 */ s16 unk_286;
 } EnTest6; // size = 0x288
 
 extern const ActorInit En_Test6_InitVars;

tools/actorfixer.py

@@ -439,6 +439,9 @@ animdict = {
     "func_80114E90": "Interface_HasEmptyBottle",
     "func_80114F2C": "Interface_HasItemInBottle",
     "func_80123C90": "Player_SetEquipmentData",
+    "Quake2_ClearType": "Distortion_ClearType",
+    "Quake2_SetType": "Distortion_SetType",
+    "Quake2_SetCountdown": "Distortion_SetCountdown",
     "func_800BE680": "Actor_DrawDamageEffects",
     "func_8013E2D4": "SubS_StartActorCutscene",
     "func_8013E3B8": "SubS_FillCutscenesList",