From 2e329c9f4832159aabdaedf9b9bbb9d1304b51a9 Mon Sep 17 00:00:00 2001 From: Max Date: Sat, 24 Oct 2020 17:05:32 -0400 Subject: match first three functions in code_801DCE6C --- src/code_801DBE90.cpp | 24 ++++++++++++++---------- src/code_801DCE6C.cpp | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 10 deletions(-) create mode 100644 src/code_801DCE6C.cpp (limited to 'src') diff --git a/src/code_801DBE90.cpp b/src/code_801DBE90.cpp index 2f57aae..6e7b54c 100644 --- a/src/code_801DBE90.cpp +++ b/src/code_801DBE90.cpp @@ -5,7 +5,7 @@ #include "SDK/dvd.h" #include "SDK/nand.h" #include "code_801DAAE0.h" - +#include "code_801DCE6C.h" namespace { @@ -68,24 +68,28 @@ void func_801DBEA0(void) //static unkClass *func_801DBED0(void) { - int new_var; - OSDisableInterrupts(); + + OSDisableInterrupts(); + unkClass *r31 = 0; size_t i; for (i = 0; i < lbl_8063F320; i++) { if (lbl_8063F324[i].unk0 != 1) { - new_var = 1; - lbl_8063F324[i].unk0 = new_var; + lbl_8063F324[i].unk0 = 1; lbl_8063F324[i].unk1 = 0; r31 = &lbl_8063F324[i]; break; } } -OSRestoreInterrupts(); -return r31; + + + OSRestoreInterrupts(); + return r31; + + } #else asm unkClass* func_801DBED0(void) @@ -133,7 +137,6 @@ lbl_801DBF44: } #pragma peephole on #endif - //static void func_801DBF60(unkClass* p1) { @@ -207,6 +210,7 @@ void lbl_801DC068(u32 p1, unkClass2* p2) } } +#if 0 BOOL func_801DC0C8(size_t p1) { if (lbl_8063F31E != 1) { @@ -214,14 +218,14 @@ BOOL func_801DC0C8(size_t p1) lbl_8063F338 = 0; NANDInit(); if (!lbl_8063F338) { + // lbl_8063F338 = new ...; // new , 801DCE7C constructor } } else { return FALSE; } } - - +#endif diff --git a/src/code_801DCE6C.cpp b/src/code_801DCE6C.cpp new file mode 100644 index 0000000..553b6fc --- /dev/null +++ b/src/code_801DCE6C.cpp @@ -0,0 +1,37 @@ +#include "types.h" +#include "ctorStruct.h" +#include "code_801DCE6C.h" +#include "Runtime/__mem.h" + +extern "C" { + +//static +char* func_801DCE6C(gUnkClass4* p1) +{ + return p1->unk7; +} + +//static +char* func_801DCE74(gUnkClass4* p1) +{ + return p1->unk2; +} + +gUnkClass4::gUnkClass4(void) +{ + memset(this, 0, sizeof(gUnkClass4)); +} + + + + + + + + + + + + + +} //extern "C" -- cgit v1.2.3