diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index 6c0a8333..6932abb4 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -42184,7 +42184,7 @@ layoutResHeap__5dHeap = .sbss:0x805751C0; // type:object size:0x4 data:4byte fontHeap__5dHeap = .sbss:0x805751C4; // type:object size:0x4 data:4byte HBMHeap__5dHeap = .sbss:0x805751C8; // type:object size:0x4 data:4byte lbl_805751D0 = .sbss:0x805751D0; // type:object size:0x4 data:4byte -g_InitialTime__5dMain = .sbss:0x805751D8; // type:object size:0x8 data:4byte +g_InitialTime = .sbss:0x805751D8; // type:object size:0x8 data:4byte m_connected__Q24dPad4ex_c = .sbss:0x805751E0; // type:object size:0x4 sInstance__13dPadManager_c = .sbss:0x805751E8; // type:object size:0x8 data:4byte LINK_ROT = .sbss:0x805751F0; // type:object size:0x2 data:2byte diff --git a/include/d/d_main.h b/include/d/d_main.h index 2eca2708..57332fe9 100644 --- a/include/d/d_main.h +++ b/include/d/d_main.h @@ -5,8 +5,6 @@ namespace dMain { -OSTime g_InitialTime; - void Create(); void Execute(); void *main01(void *arg); diff --git a/src/d/d_main.cpp b/src/d/d_main.cpp index 58a24e61..28118b10 100644 --- a/src/d/d_main.cpp +++ b/src/d/d_main.cpp @@ -8,6 +8,7 @@ #include "rvl/OS.h" u32 lbl_805751D0; +OSTime g_InitialTime; bool fn_80054F90(u32 val) { return lbl_805751D0 & val; @@ -59,7 +60,7 @@ void main(int argc, char **argv) { u8 pStackBase[STACK_SIZE] __attribute__((aligned(32))); unknownStub(); - dMain::g_InitialTime = OSGetTime(); + g_InitialTime = OSGetTime(); dSystem::fixHeaps(); Mpls::initialize(argc, argv); diff --git a/src/d/d_sys.cpp b/src/d/d_sys.cpp index 89c78cff..b6910303 100644 --- a/src/d/d_sys.cpp +++ b/src/d/d_sys.cpp @@ -395,6 +395,7 @@ void System::initialize() { DvdFile::initialize(); + // TODO Determine significance of the constant CoreControllerMgr::setWPADWorkSize(WPADGetWorkMemorySize() + 228); CoreControllerMgr::createInstance();