Misc decomp

Author: Francessco121

include/functions.h

@@ -62,5 +62,6 @@ s32 func_8000F44C();
 void set_menu_page(s32);
 void func_8001442C();
 s8 func_80048498();
+void set_textures_on_gdl(Gfx **gdl, Texture *tex0, Texture *tex1, u32 flags, s32 level, u32 force, u32 setModes);
 
 #endif //_FUNCTIONS_H

include/sys/gfx/gx.h

@@ -63,8 +63,7 @@ typedef struct _UnkVidStruct2 {
 #define UNKNOWN_VIDEO_STRUCT_SIZE 0x90
 
 typedef struct _UnkVidStruct {
-    struct _UnkHeapVidStruct *ptrToUnknown1;
-    f32 *ptrToUnknown2;
+    Gfx dl;
     u8 unk0x8_pad[16];
     s16 unk0x18;
     s16 unk0x1a;
@@ -82,7 +81,7 @@ typedef struct _UnkVidStruct {
     u8 unk0x4c_pad[40];
     f32 unk0x78;
     f32 unk0x7c;
-    u8 unk0x80_pad[4];
+    void *unk0x80;
     OSViMode *viMode;
     s16 unk0x88;
     u8 unk0x8a_padd[6];
@@ -93,6 +92,11 @@ typedef struct _UnkVidStruct3 {
     s32 unk0x4;
 } UnkVidStruct3;
 
+typedef struct {
+    u8 _unk0x0[0x46];
+    s16 unk0x46;
+} UnkVidStruct4;
+
 // Length of gUnknownVideoStructs
 #define UNKNOWN_VIDEO_STRUCTS_COUNT 40
 
@@ -108,8 +112,6 @@ extern void *D_80092F54;
 extern void *D_80092F9C;
 extern void *D_80092FE4;
 
-extern s32 D_80092FF8;
-
 extern s8 D_80093060;
 extern UnkVidStruct3 *D_80093068;
 
@@ -119,8 +121,6 @@ extern f32 gMPalAspectRatio; // 1.333333_ (4/3)
 extern f32 gNtscAspectRatio; // 1.333333_ (4/3)
 
 extern UnkVidStruct gUnknownVideoStructs[UNKNOWN_VIDEO_STRUCTS_COUNT];
-extern UnkHeapVidStruct *D_800BCC10;
-extern UnkVidStruct2 D_800BCC18[4]; // size:0x50
 extern s32 D_800BCC68;
 extern s32 D_800BCC6C;
 extern u32 D_800BCC70;

splat.yaml

@@ -257,6 +257,8 @@ segments:
     - [0x8BD60, bin, ucode_gspF3DEX2_xbusText]
     - [0x92370, .data, crash]
     - [0x92380, bin]
+    - [0x93BF8, .data, video]
+    - [0x93C08, bin]
     - [0x93CB8, .data, libultra/io/vimgr]
     - [0x93CD0, bin]
     - [0x97840, .data, libultra/os/initialize]
@@ -299,6 +301,10 @@ segments:
     - [0xA3470, bin]
     - [0xA3A00, bin, ucode_aspMainData]
     - [0xA4550, bin, ucode_gspF3DEX2_xbusData]
+    - [0xA4970, bin]
+    
+    - [0xA69B8]
+    - [auto, all_bss]
 
   - type: code
     start: 0xA4970

src/dlls/engine/21_gametext/gametext.c

@@ -1,6 +1,9 @@
 #include <PR/ultratypes.h>
-#include "common.h"
+#include "sys/fs.h"
+#include "sys/memory.h"
 #include "dlls/engine/21_gametext.h"
+#include "variables.h"
+#include "functions.h"
 #include "prevent_bss_reordering.h"
 
 static s8 sCurrentBankIndex = -1;

src/input.c

@@ -308,6 +308,7 @@ void controller_thread_entry(void *_) {
 #pragma GLOBAL_ASM("asm/nonmatchings/input/init_virtual_cont_port_map.s")
 #else
 // Functionally equivalent
+// Making gVirtualContPortMap static fixes it
 void _init_virtual_cont_port_map() {
     int i;
 

src/video.c

@@ -1,5 +1,8 @@
 #include "common.h"
 
+UnkHeapVidStruct *D_800BCC10;
+UnkVidStruct2 D_800BCC18[4]; // size:0x50
+
 // func_8005BC38 is from segment_5C470
 /**
  * If param1 isn't null, sets it to gPossiblyScreenWidthOrHeight.
@@ -13,39 +16,32 @@ void initialize_framebuffers(int someBool, s32 width, s32 height);
 void swap_framebuffer_pointers();
 void set_custom_vi_mode();
 
-#if 1
+#if 0
 #pragma GLOBAL_ASM("asm/nonmatchings/video/func_8005C780.s")
 #else
-// Functionally equivalent, see TODOs
 void func_8005C780() {
-    UnkVidStruct2 *vidStruct2;
-    UnkVidStruct *vidStruct;
-    UnkHeapVidStruct *vidHeapStruct;
     s32 i;
 
-    vidHeapStruct = D_800BCC10;
-
-    if (vidHeapStruct != NULL) {
-        free(vidHeapStruct);
+    if (D_800BCC10 != NULL) {
+        free(D_800BCC10);
     }
 
     D_800BCC10 = malloc(UNKNOWN_HEAP_VIDEO_STRUCT_SIZE, 0x13, 0);
 
     for (i = 0; i < UNKNOWN_VIDEO_STRUCTS_COUNT; i++)
     {
-        gUnknownVideoStructs[i].ptrToUnknown1 = (UnkHeapVidStruct*)0xdf000000;
-        gUnknownVideoStructs[i].ptrToUnknown2 = NULL;
+        gSPEndDisplayList(&gUnknownVideoStructs[i].dl);
         gUnknownVideoStructs[i].viMode = NULL;
         gUnknownVideoStructs[i].unk0x88 = 0;
     }
 
     for (i = 0; i < 4; i++)
     {
         D_800BCC18[i].unk0x10 = NULL;
-        D_800BCC18[i].unk0x0 = 0.0f;
-        D_800BCC18[i].unk0x4 = 0.0f;
+        D_800BCC18[i].unk0x0 = 0;
+        D_800BCC18[i].unk0x4 = 0;
+        D_800BCC18[i].unk0x8 = 0;
         D_800BCC18[i].unk0xc = 0;
-        D_800BCC18[i].unk0x8 = 0.0f;
     }
 
     D_800BCC10->unk0x0 = -3.0f;
@@ -54,18 +50,21 @@ void func_8005C780() {
     D_800BCC10->unk0xc = -3.0f;
     D_800BCC10->unk0x10 = 0.0f;
     D_800BCC10->unk0x14 = 3.0f;
+    
     D_800BCC10->unk0x18 = 3.0f;
     D_800BCC10->unk0x1c = 0.0f;
     D_800BCC10->unk0x20 = 3.0f;
     D_800BCC10->unk0x24 = 3.0f;
     D_800BCC10->unk0x28 = 0.0f;
     D_800BCC10->unk0x2c = -3.0f;
+    
     D_800BCC10->unk0x30 = -3.0f;
     D_800BCC10->unk0x34 = 0.0f;
     D_800BCC10->unk0x38 = -3.0f;
     D_800BCC10->unk0x3c = -3.0f;
     D_800BCC10->unk0x40 = 0.0f;
     D_800BCC10->unk0x44 = 3.0f;
+    
     D_800BCC10->unk0x48 = 3.0f;
     D_800BCC10->unk0x4c = 0.0f;
     D_800BCC10->unk0x50 = 3.0f;
@@ -81,61 +80,26 @@ void func_8005C780() {
 }
 #endif
 
-#if 1
+#if 0
 #pragma GLOBAL_ASM("asm/nonmatchings/video/func_8005C998.s")
 void func_8005C998();
 #else
-// Functionally equivalent, see TODOs
-void _func_8005C998() {
-    UnkVidStruct2 *vidStruct2;
-    UnkVidStruct *vidStruct = &gUnknownVideoStructs[0];
-
-    do {
-        vidStruct->ptrToUnknown1 = (UnkHeapVidStruct*)0xdf000000;
-        vidStruct->ptrToUnknown2 = NULL;
-        goto label_1; label_1: // TODO: This probably shouldn't be necessary
-        vidStruct->viMode = NULL;
-        vidStruct->unk0x88 = 0;
-    } while (++vidStruct < &gUnknownVideoStructs[UNKNOWN_VIDEO_STRUCTS_COUNT]);
-
-    // TODO: Figure out how to get this to match in a way that it weaves in `lui   at,0x800c`
-    vidStruct2 = &D_800BCC18[0];
-    vidStruct2->unk0x10 = 0;
-    // lui   at,0x800c
-    vidStruct2->unk0x0 = 0.0f;
-    vidStruct2->unk0x4 = 0.0f;
-    // lui   at,0x800c
-    vidStruct2->unk0xc = (u8)0;
-    vidStruct2->unk0x8 = 0.0f;
-    // lui   at,0x800c
-    vidStruct2 = &D_800BCC18[1];
-    vidStruct2->unk0x10 = 0;
-    // lui   at,0x800c
-    vidStruct2->unk0x0 = 0.0f;
-    // lui   at,0x800c
-    vidStruct2->unk0x4 = 0.0f;
-    vidStruct2->unk0x8 = 0.0f;
-    // lui   at,0x800c
-    vidStruct2->unk0xc = (u8)0;
-    // lui   at,0x800c
-    vidStruct2 = &D_800BCC18[2];
-    vidStruct2->unk0x10 = 0;
-    // lui   at,0x800c
-    vidStruct2->unk0x0 = 0.0f;
-    vidStruct2->unk0x4 = 0.0f;
-    // lui   at,0x800c
-    vidStruct2->unk0xc = (u8)0;
-    vidStruct2->unk0x8 = 0.0f;
-    // lui   at,0x800c
-    vidStruct2 = &D_800BCC18[3];
-    vidStruct2->unk0x10 = 0;
-    // lui   at,0x800c
-    vidStruct2->unk0x0 = 0.0f;
-    // lui   at,0x800c
-    vidStruct2->unk0x4 = 0.0f;
-    vidStruct2->unk0x8 = 0.0f;
-    // lui   at,0x800c
-    vidStruct2->unk0xc = (u8)0;
+void func_8005C998() {
+    s32 i;
+
+    for (i = 0; i < UNKNOWN_VIDEO_STRUCTS_COUNT; i++) {
+        gSPEndDisplayList(&gUnknownVideoStructs[i].dl);
+        gUnknownVideoStructs[i].viMode = NULL;
+        gUnknownVideoStructs[i].unk0x88 = 0;
+    }
+
+    for (i = 0; i < 4; i++) {
+        D_800BCC18[i].unk0x10 = 0;
+        D_800BCC18[i].unk0x0 = 0.0f;
+        D_800BCC18[i].unk0x4 = 0.0f;
+        D_800BCC18[i].unk0x8 = 0.0f;
+        D_800BCC18[i].unk0xc = 0;
+    }
 }
 #endif
 
@@ -151,41 +115,62 @@ void func_8005CA5C(u32 param1) {
 }
 #endif
 
-#if 1
+#if 0
 #pragma GLOBAL_ASM("asm/nonmatchings/video/func_8005CA88.s")
 #else
-// Functionally equivalent, not quite regalloc only but extremely close
-void func_8005CA88(f32 *a0, f32 *a1, u8 a2)
-{
-    s32 temp1;
-    s32 temp2;
-
-    if (D_800BCC78 != 0)
-    {
-        temp1 = D_80092FF8;
-
-        D_800BCC18[temp1].unk0x10 = a0;
-        D_800BCC18[temp1].unk0x0 = a1[0];
+void func_8005CA88(f32 *a0, f32 *a1, u8 a2) {
+    static s32 D_80092FF8 = 0;
 
-        temp2 = temp1 + 1;
-        if (1); // TODO: skeptical about this
+    if (D_800BCC78 != 0) {
+        D_800BCC18[D_80092FF8].unk0x10 = a0;
+        D_800BCC18[D_80092FF8].unk0x0 = a1[0];
+        D_800BCC18[D_80092FF8].unk0x4 = a0[4] + a1[1];
+        D_800BCC18[D_80092FF8].unk0x8 = a1[2];
+        D_800BCC18[D_80092FF8].unk0xc = a2;
 
-        D_800BCC18[temp1].unk0x4 = a0[4] + a1[1];
-        D_800BCC18[temp1].unk0x8 = a1[2];
-        D_800BCC18[temp1].unk0xc = a2;
+        D_80092FF8 = D_80092FF8 + 1;
 
-        D_80092FF8 = temp2;
-
-        if (D_80092FF8 == 4)
-        {
+        if (D_80092FF8 == 4) {
             D_80092FF8 = 0;
         }
     }
 }
 #endif
 
+#if 0
 #pragma GLOBAL_ASM("asm/nonmatchings/video/func_8005CB10.s")
+#else
+void func_8005CB10(Gfx **gdl, UnkVidStruct4 *param2) {
+    s32 i;
+    Texture *tex;
+
+    switch (param2->unk0x46) {
+        case 0:
+            tex = D_800BCC68;
+            break;
+        case 0x1f:
+            tex = D_800BCC6C;
+            break;
+        default:
+            tex = D_800BCC68;
+            break;
+    }
 
+    set_textures_on_gdl(gdl, tex, NULL, 0x1a, 0, 0, 1);
+
+    i = 0;
+
+    while (i < UNKNOWN_VIDEO_STRUCTS_COUNT) {
+        if (param2 == gUnknownVideoStructs[i].unk0x80) {
+            gSPDisplayList((*gdl)++, &gUnknownVideoStructs[i].dl);
+        }
+
+        i++;
+    }
+}
+#endif
+
+static s32 D_80092FFC = 1;
 #pragma GLOBAL_ASM("asm/nonmatchings/video/func_8005CC74.s")
 
 #pragma GLOBAL_ASM("asm/nonmatchings/video/func_8005CD80.s")
@@ -195,37 +180,35 @@ void func_8005CA88(f32 *a0, f32 *a1, u8 a2)
 #else
 // Functionally equivalent, mainly regalloc, see TODO
 void func_8005CDFC(int _) {
-    UnkVidStruct *vidStruct;
     float var1;
     float var2;
     s16 *var3;
+    s32 i;
 
-    vidStruct = &gUnknownVideoStructs[0];
-
-    do {
-        if (vidStruct->viMode == NULL) {
+    for (i = 0; i < UNKNOWN_VIDEO_STRUCTS_COUNT; i++) {
+        if (gUnknownVideoStructs[i].viMode == NULL) {
             continue;
         }
 
         // TODO: The order of loads and stores here are slightly out of order
-        var1 = gWorldX - vidStruct->unk0x78;
-        var2 = gWorldZ - vidStruct->unk0x7c;
+        var1 = gWorldX - gUnknownVideoStructs[i].unk0x78;
+        var2 = gWorldZ - gUnknownVideoStructs[i].unk0x7c;
 
-        var3 = &vidStruct->unk0x48[0];
+        var3 = &gUnknownVideoStructs[i].unk0x48[0];
 
-        vidStruct->unk0x78 = vidStruct->unk0x78 + var1;
-        vidStruct->unk0x7c = vidStruct->unk0x7c + var2;
-
-        vidStruct->unk0x18 = vidStruct->unk0x18 - var1;
-        vidStruct->unk0x1c = vidStruct->unk0x1c - var2;
-        vidStruct->unk0x28 = vidStruct->unk0x28 - var1;
-        vidStruct->unk0x2c = vidStruct->unk0x2c - var2;
-        vidStruct->unk0x38 = vidStruct->unk0x38 - var1;
-        vidStruct->unk0x3c = vidStruct->unk0x3c - var2;
+        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;
-    } while (++vidStruct != &gUnknownVideoStructs[UNKNOWN_VIDEO_STRUCTS_COUNT]);
+    }
 }
 #endif