summaryrefslogtreecommitdiff
path: root/src/d
diff options
context:
space:
mode:
Diffstat (limited to 'src/d')
-rw-r--r--src/d/d_main.cpp22
-rw-r--r--src/d/d_state.cpp8
2 files changed, 15 insertions, 15 deletions
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);
}
}
}