diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index 66b9b74d..cb9d97dc 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -2236,9 +2236,9 @@ __sinit_\d_heap_cpp = .text:0x80054F00; // type:function size:0x30 scope:local getCurrentLanguage1__Fv = .text:0x80054F30; // type:function size:0x4 getCurrentLanguage2__Fv = .text:0x80054F40; // type:function size:0x4 getCurrentLanguage__Fv = .text:0x80054F50; // type:function size:0x38 -fn_80054F90__5dMainFUl = .text:0x80054F90; // type:function size:0x18 -fn_80054FB0__5dMainFUl = .text:0x80054FB0; // type:function size:0x24 -fn_80054FE0__5dMainFUl = .text:0x80054FE0; // type:function size:0x20 +isStopFlagSet__5dMainFUl = .text:0x80054F90; // type:function size:0x18 +setStopFlag__5dMainFUl = .text:0x80054FB0; // type:function size:0x24 +clearStopFlag__5dMainFUl = .text:0x80054FE0; // type:function size:0x20 Create__5dMainFv = .text:0x80055000; // type:function size:0x28 Execute__5dMainFv = .text:0x80055030; // type:function size:0x14 main01__5dMainFPv = .text:0x80055050; // type:function size:0x28 @@ -42183,7 +42183,7 @@ layoutEx2Heap__5dHeap = .sbss:0x805751BC; // type:object size:0x4 data:4byte 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 +sStopFlags = .sbss:0x805751D0; // type:object size:0x4 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 diff --git a/include/d/d_main.h b/include/d/d_main.h index 6fc6f4c7..e2025659 100644 --- a/include/d/d_main.h +++ b/include/d/d_main.h @@ -5,9 +5,9 @@ namespace dMain { -bool fn_80054F90(u32 val); -void fn_80054FB0(u32 val); -void fn_80054FE0(u32 val); +bool isStopFlagSet(u32 val); +void setStopFlag(u32 val); +void clearStopFlag(u32 val); void Create(); void Execute(); diff --git a/src/d/d_main.cpp b/src/d/d_main.cpp index 653f1051..febdf279 100644 --- a/src/d/d_main.cpp +++ b/src/d/d_main.cpp @@ -7,15 +7,14 @@ #include "rvl/OS.h" -u32 lbl_805751D0; -OSTime g_InitialTime; +u32 sStopFlags; -bool dMain::fn_80054F90(u32 val) { - return lbl_805751D0 & val; +bool dMain::isStopFlagSet(u32 val) { + return sStopFlags & val; } -void dMain::fn_80054FB0(u32 val) { - u32 flags = lbl_805751D0; +void dMain::setStopFlag(u32 val) { + u32 flags = sStopFlags; if (!flags) { fManager_c::setStopProcFlags( @@ -24,13 +23,13 @@ void dMain::fn_80054FB0(u32 val) { ); } - lbl_805751D0 = flags | val; + sStopFlags = flags | val; } -void dMain::fn_80054FE0(u32 val) { - lbl_805751D0 &= ~val; +void dMain::clearStopFlag(u32 val) { + sStopFlags &= ~val; - if (!lbl_805751D0) { + if (!sStopFlags) { fManager_c::maskStopProcFlags(fManager_c::PROC_FLAG_DRAW); } } @@ -54,7 +53,8 @@ void *dMain::main01(void *arg) { #define STACK_SIZE 0xF000 -static OSThread MAIN_THREAD; +OSTime g_InitialTime; +OSThread MAIN_THREAD; void main(int argc, char **argv) { u8 pStackBase[STACK_SIZE] __attribute__((aligned(32))); diff --git a/src/d/d_state.cpp b/src/d/d_state.cpp index 12209932..1d5417cc 100644 --- a/src/d/d_state.cpp +++ b/src/d/d_state.cpp @@ -10,13 +10,13 @@ void dState::fn_80062E50() { m3d::mState::fn_802EE0B0(); if (m3d::mState::fn_802EE0D0()) { - if (dMain::fn_80054F90(1)) { - dMain::fn_80054FE0(1); + if (dMain::isStopFlagSet(1)) { + dMain::clearStopFlag(1); } } else { - if (!dMain::fn_80054F90(1)) { - dMain::fn_80054FB0(1); + if (!dMain::isStopFlagSet(1)) { + dMain::setStopFlag(1); } } }