From d96e18f2d6f0c92639929523051d3bd2c787333b Mon Sep 17 00:00:00 2001
From: Max <mparisi@stevens.edu>
Date: Fri, 30 Oct 2020 02:05:35 -0400
Subject: match up to func_801DD294

---
 src/code_801DBE90.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/code_801DBE90.cpp')

diff --git a/src/code_801DBE90.cpp b/src/code_801DBE90.cpp
index 2303bdb..e8a262e 100644
--- a/src/code_801DBE90.cpp
+++ b/src/code_801DBE90.cpp
@@ -94,9 +94,9 @@ static void func_801DBFEC(s32 p1, DVDFileInfo* p2)
 {
     if (gUnk8063F31F == 0) {
         gUnkClass5* r31 = func_801DBF98(p2);
-        if (r31 && r31->unk4.unk40) {
-            DCInvalidateRange(r31->unk4.unk44, r31->unk4.unk48);
-            r31->unk4.unk40(p1, r31);
+        if (r31 && r31->unk44) {
+            DCInvalidateRange(r31->unk48, r31->unk4C);
+            r31->unk44(p1, r31);
         }
     }
 }
@@ -105,8 +105,8 @@ static void func_801DC068(s32 p1, DVDFileInfo* p2)
 {
     if (gUnk8063F31F == 0) {
         gUnkClass5* r3 = func_801DBF98(p2);
-        if (r3 && r3->unk4.unk40)
-            r3->unk4.unk40(p1, r3);
+        if (r3 && r3->unk44)
+            r3->unk44(p1, r3);
     }
 }
 
@@ -232,7 +232,7 @@ BOOL func_801DC4F0(gUnkClass5* p1, void* addr, u32 len, s32 offset, void (*p5)(s
     func_801DC264();
     if (!p1)
         return FALSE;
-    p1->unk4.unk40 = p5;
+    p1->unk44 = p5;
     if ((u32)addr & 0x1F)
         return FALSE;
     if (len & 0x1F)
@@ -240,8 +240,8 @@ BOOL func_801DC4F0(gUnkClass5* p1, void* addr, u32 len, s32 offset, void (*p5)(s
     if (offset & 0x3)
         return FALSE;
 
-    p1->unk4.unk44 = addr;
-    p1->unk4.unk48 = len;
+    p1->unk48 = addr;
+    p1->unk4C = len;
     if (gUnk8063F338 && p1->unk1 && func_801DD220(gUnk8063F338, p1, addr, len, offset))
         return TRUE;
     return DVDReadAsyncPrio(&p1->unk4, addr, (s32)len, offset, &func_801DBFEC, 2) != 0;
@@ -292,7 +292,7 @@ size_t func_801DC760(gUnkClass5* p1)
         return 0;
     if (gUnk8063F338 && func_801DD03C(gUnk8063F338, p1, &fileSz))
         return fileSz;
-    return p1->unk4.unk34;
+    return DVDGetLength(&p1->unk4);
 }
 
 static s32 func_801DC7DC(void)
@@ -307,7 +307,7 @@ BOOL func_801DC7F8(gUnkClass5* p1, s32 offset, void (*p3)(s32, void*))
     func_801DC264();
     if (!p1)
         return FALSE;
-    p1->unk4.unk40 = p3;
+    p1->unk44 = p3;
     return DVDSeekAsyncPrio(&p1->unk4, offset, &func_801DC068, 2) != 0;
 }
 
@@ -470,7 +470,7 @@ u8* func_801DCBC0(const char* fileName, u32* fileSz)
     return buf;
 }
 
-void* func_801DCCAC(const char* fileName, MEMHeapHandle heap, u32* fileSz)
+u8* func_801DCCAC(const char* fileName, MEMHeapHandle heap, u32* fileSz)
 {
     if (!func_801DC380(fileName))
         return NULL;
@@ -530,7 +530,7 @@ void func_801DCE38(void)
     gUnk8063F31F = 1;
 }
 
-u8 func_801DCE44(void)
+BOOL func_801DCE44(void)
 {
     return gUnk8063F31F;
 }
-- 
cgit v1.2.3