From 47a1bdea8872c79dd2cd7d75ca7f254b9ed13170 Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 29 Oct 2020 14:27:37 -0400 Subject: match up to func_801DCFE4, add string.h and stdlib.h, add types.h to Makefile include path, and move GameSpy under DWC --- src/code_801DBE90.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/code_801DBE90.cpp') diff --git a/src/code_801DBE90.cpp b/src/code_801DBE90.cpp index 5184c42..2303bdb 100644 --- a/src/code_801DBE90.cpp +++ b/src/code_801DBE90.cpp @@ -1,10 +1,9 @@ -#include "types.h" #include "ctorStruct.h" -#include "Runtime/__mem.h" -#include "SDK/mem.h" -#include "SDK/os.h" -#include "SDK/dvd.h" -#include "SDK/nand.h" +#include +#include +#include +#include +#include #include "code_801DAAE0.h" #include "code_801DCE6C.h" #include "code_80223C54.h" -- cgit v1.2.3 From d96e18f2d6f0c92639929523051d3bd2c787333b Mon Sep 17 00:00:00 2001 From: Max 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 From e5e4451cfcf8b03153fd11a620460f66b4840ba6 Mon Sep 17 00:00:00 2001 From: Max Date: Sat, 31 Oct 2020 18:08:27 -0400 Subject: refactor as code_801DCE6C to C++ --- src/code_801DBE90.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/code_801DBE90.cpp') diff --git a/src/code_801DBE90.cpp b/src/code_801DBE90.cpp index e8a262e..7534f0d 100644 --- a/src/code_801DBE90.cpp +++ b/src/code_801DBE90.cpp @@ -57,7 +57,7 @@ static void func_801DBEA0(void) gUnk8063F324[i].unk0 = 0; } -static gUnkClass5 *func_801DBED0(void) +static gUnkClass5* func_801DBED0(void) { BOOL enable = OSDisableInterrupts(); gUnkClass5* r31 = NULL; @@ -183,7 +183,7 @@ gUnkClass5* func_801DC2D0(const char* fileName) gUnkClass5* fp = func_801DBED0(); if (!fp) return NULL; - if (gUnk8063F338 && func_801DCF74(gUnk8063F338, fileName, fp)) + if (gUnk8063F338 && gUnk8063F338->func_801DCF74(fileName, fp)) return fp; if (!DVDOpen(fileName, &fp->unk4)) { func_801DBF60(fp); @@ -196,7 +196,7 @@ BOOL func_801DC380(const char* fileName) { if (!gUnk8063F31E) return FALSE; - if (gUnk8063F338 && func_801DCF48(gUnk8063F338, fileName)) + if (gUnk8063F338 && gUnk8063F338->func_801DCF48(fileName)) return TRUE; if (DVDConvertPathToEntrynum(fileName) == -1) return FALSE; @@ -218,7 +218,7 @@ s32 func_801DC3FC(gUnkClass5* p1, void* addr, s32 length, s32 offset) return -1; if (gUnk8063F338 && p1->unk1) { - s32 r3 = func_801DD084(gUnk8063F338, p1, addr, length, offset); + s32 r3 = gUnk8063F338->func_801DD084(p1, addr, length, offset); if (r3 > 0) return r3; } @@ -242,7 +242,7 @@ BOOL func_801DC4F0(gUnkClass5* p1, void* addr, u32 len, s32 offset, void (*p5)(s p1->unk48 = addr; p1->unk4C = len; - if (gUnk8063F338 && p1->unk1 && func_801DD220(gUnk8063F338, p1, addr, len, offset)) + if (gUnk8063F338 && p1->unk1 && gUnk8063F338->func_801DD220(p1, addr, len, offset)) return TRUE; return DVDReadAsyncPrio(&p1->unk4, addr, (s32)len, offset, &func_801DBFEC, 2) != 0; } @@ -273,7 +273,7 @@ BOOL func_801DC6C4(gUnkClass5* p1) func_801DC264(); if (!p1) return FALSE; - if (gUnk8063F338 && func_801DCFE4(gUnk8063F338, p1)) { + if (gUnk8063F338 && gUnk8063F338->func_801DCFE4(p1)) { func_801DBF60(p1); return TRUE; } @@ -290,7 +290,7 @@ size_t func_801DC760(gUnkClass5* p1) func_801DC264(); if (!p1) return 0; - if (gUnk8063F338 && func_801DD03C(gUnk8063F338, p1, &fileSz)) + if (gUnk8063F338 && gUnk8063F338->func_801DD03C(p1, &fileSz)) return fileSz; return DVDGetLength(&p1->unk4); } @@ -497,7 +497,7 @@ u8* func_801DCCAC(const char* fileName, MEMHeapHandle heap, u32* fileSz) BOOL func_801DCD94(const char* fileName) { if (gUnk8063F338) - return func_801DD294(gUnk8063F338, fileName, 0); + return gUnk8063F338->func_801DD294(fileName, 0); return 0; } -- cgit v1.2.3