Match func_8005CC74, func_8005CDFC

Author: Francessco121

include/sys/gfx/gx.h

@@ -49,8 +49,7 @@ typedef struct _UnkHeapVidStruct {
     f32 unk0x5c;
 } UnkHeapVidStruct;
 
-#define UNKNOWN_VIDEO_STRUCT_2_SIZE 0x14
-
+// size: 0x14
 typedef struct _UnkVidStruct2 {
 /*0000*/    f32 unk0x0;
 /*0004*/    f32 unk0x4;
@@ -60,28 +59,33 @@ typedef struct _UnkVidStruct2 {
 /*0010*/    f32 *unk0x10;
 } UnkVidStruct2;
 
-#define UNKNOWN_VIDEO_STRUCT_SIZE 0x90
+typedef struct {
+    s16 x;
+    s16 y;
+    s16 z;
+    s16 unk6;
+    s16 unk8;
+    s16 unka;
+    s8 unkc;
+    s8 unkd;
+    s8 unke;
+    s8 unkf;
+} UnkVidStruct_0x18;
+
+typedef struct {
+    u8 _unk0x0[0x46];
+    s16 unk0x46;
+} UnkVidStruct4;
 
+// size: 0x90
 typedef struct _UnkVidStruct {
     Gfx dl;
     u8 unk0x8_pad[16];
-    s16 unk0x18;
-    s16 unk0x1a;
-    s16 unk0x1c;
-    u8 unk0x1e_pad[10];
-    s16 unk0x28;
-    s16 unk0x2a;
-    s16 unk0x2c;
-    u8 unk0x2e_pad[10];
-    s16 unk0x38;
-    s16 unk0x3a;
-    s16 unk0x3c;
-    u8 unk0x3e_pad[10];
-    s16 unk0x48[4];
-    u8 unk0x4c_pad[40];
+    UnkVidStruct_0x18 unk0x18[4];
+    u8 unk0x58_pad[0x20];
     f32 unk0x78;
     f32 unk0x7c;
-    void *unk0x80;
+    UnkVidStruct4 *unk0x80;
     OSViMode *viMode;
     s16 unk0x88;
     u8 unk0x8a_padd[6];
@@ -92,11 +96,6 @@ typedef struct _UnkVidStruct3 {
     s32 unk0x4;
 } UnkVidStruct3;
 
-typedef struct {
-    u8 _unk0x0[0x46];
-    s16 unk0x46;
-} UnkVidStruct4;
-
 // Length of gUnknownVideoStructs
 #define UNKNOWN_VIDEO_STRUCTS_COUNT 40
 
@@ -125,6 +124,8 @@ extern s32 D_800BCC68;
 extern s32 D_800BCC6C;
 extern u32 D_800BCC70;
 extern u8 D_800BCC78;
+extern f32 D_800BCC80;
+extern f32 D_800BCC84;
 
 extern OSViMode gOSViModeCustom;
 

src/video.c

@@ -177,42 +177,61 @@ void func_8005CB10(Gfx **gdl, UnkVidStruct4 *param2) {
 static s32 D_80092FFC = 1;
 static s32 D_80093000 = 0;
 #pragma GLOBAL_ASM("asm/nonmatchings/video/func_8005CC74.s")
-
+#if 0
 #pragma GLOBAL_ASM("asm/nonmatchings/video/func_8005CD80.s")
+#else
+void func_8005CD80() {
+    s32 i;
+    s32 k;
+    UnkVidStruct_0x18 *ptr;
 
-#if 1
+    for (i = 0; i < UNKNOWN_VIDEO_STRUCTS_COUNT; i++) {
+        ptr = &gUnknownVideoStructs[i].unk0x18[0];
+        
+        if (gUnknownVideoStructs[i].viMode != NULL) {
+            gUnknownVideoStructs[i].unk0x88 -= 5;
+
+            if (gUnknownVideoStructs[i].unk0x88 < 0) {
+                gUnknownVideoStructs[i].unk0x88 = 0;
+            }
+
+            for (k = 0; k < 4; k++) {
+                (ptr++)->unkf = gUnknownVideoStructs[i].unk0x88;
+            }
+        }
+    }
+}
+#endif
+
+#if 0
 #pragma GLOBAL_ASM("asm/nonmatchings/video/func_8005CDFC.s")
 #else
-// Functionally equivalent, mainly regalloc, see TODO
 void func_8005CDFC(int _) {
     float var1;
     float var2;
-    s16 *var3;
     s32 i;
+    s32 k;
+    UnkVidStruct_0x18 *ptr;
+
+    var1 = 0;
+    var2 = 0;
 
     for (i = 0; i < UNKNOWN_VIDEO_STRUCTS_COUNT; i++) {
-        if (gUnknownVideoStructs[i].viMode == NULL) {
-            continue;
+        if (gUnknownVideoStructs[i].viMode != NULL) {
+            ptr = &gUnknownVideoStructs[i].unk0x18[0];
+            
+            var1 = gWorldX - gUnknownVideoStructs[i].unk0x78;
+            var2 = gWorldZ - gUnknownVideoStructs[i].unk0x7c;
+
+            gUnknownVideoStructs[i].unk0x78 += var1;
+            gUnknownVideoStructs[i].unk0x7c += var2;
+
+            for (k = 0; k < 4; k++) {
+                ptr->x -= var1;
+                ptr->z -= var2;
+                ptr++;
+            }
         }
-
-        // TODO: The order of loads and stores here are slightly out of order
-        var1 = gWorldX - gUnknownVideoStructs[i].unk0x78;
-        var2 = gWorldZ - gUnknownVideoStructs[i].unk0x7c;
-
-        var3 = &gUnknownVideoStructs[i].unk0x48[0];
-
-        gUnknownVideoStructs[i].unk0x78 += var1;
-        gUnknownVideoStructs[i].unk0x7c += var2;
-        
-        gUnknownVideoStructs[i].unk0x18 -= var1;
-        gUnknownVideoStructs[i].unk0x1c -= var2;
-        gUnknownVideoStructs[i].unk0x28 -= var1;
-        gUnknownVideoStructs[i].unk0x2c -= var2;
-        gUnknownVideoStructs[i].unk0x38 -= var1;
-        gUnknownVideoStructs[i].unk0x3c -= var2;
-
-        var3[2] = var3[2] - var2;
-        var3[0] = var3[0] - var1;
     }
 }
 #endif