Fix incorrect/poor names, missing import

7 files changed, 18 insertions, 17 deletions

diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt
index f86f4b86..b9469861 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 = .text:0x80054F90; // type:function size:0x18
-fn_80054FB0 = .text:0x80054FB0; // type:function size:0x24
-fn_80054FE0 = .text:0x80054FE0; // type:function size:0x20
+fn_80054F90__FUl = .text:0x80054F90; // type:function size:0x18
+fn_80054FB0__FUl = .text:0x80054FB0; // type:function size:0x24
+fn_80054FE0__FUl = .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
@@ -2842,7 +2842,7 @@ fixHeaps__7dSystemFv = .text:0x80064DA0; // type:function size:0xB8
 __sinit_\d_sys_cpp = .text:0x80064E60; // type:function size:0x34
 initRenderMode__Q23EGG129TSystem<Q23EGG5Video,Q23EGG12AsyncDisplay,Q23EGG10XfbManager,Q23EGG14SimpleAudioMgr,Q23EGG12SceneManager,Q23EGG15PerformanceView>Fv = .text:0x80064EA0; // type:function size:0x4
 getVideo__Q23EGG129TSystem<Q23EGG5Video,Q23EGG12AsyncDisplay,Q23EGG10XfbManager,Q23EGG14SimpleAudioMgr,Q23EGG12SceneManager,Q23EGG15PerformanceView>Fv = .text:0x80064EB0; // type:function size:0x8
-getSysHeap__Q23EGG129TSystem<Q23EGG5Video,Q23EGG12AsyncDisplay,Q23EGG10XfbManager,Q23EGG14SimpleAudioMgr,Q23EGG12SceneManager,Q23EGG15PerformanceView>Fv = .text:0x80064EC0; // type:function size:0x8
+getSystemHeap__Q23EGG129TSystem<Q23EGG5Video,Q23EGG12AsyncDisplay,Q23EGG10XfbManager,Q23EGG14SimpleAudioMgr,Q23EGG12SceneManager,Q23EGG15PerformanceView>Fv = .text:0x80064EC0; // type:function size:0x8
 getDisplay__Q23EGG129TSystem<Q23EGG5Video,Q23EGG12AsyncDisplay,Q23EGG10XfbManager,Q23EGG14SimpleAudioMgr,Q23EGG12SceneManager,Q23EGG15PerformanceView>Fv = .text:0x80064ED0; // type:function size:0x8
 getXfbMgr__Q23EGG129TSystem<Q23EGG5Video,Q23EGG12AsyncDisplay,Q23EGG10XfbManager,Q23EGG14SimpleAudioMgr,Q23EGG12SceneManager,Q23EGG15PerformanceView>Fv = .text:0x80064EE0; // type:function size:0x8
 getPerfView__Q23EGG129TSystem<Q23EGG5Video,Q23EGG12AsyncDisplay,Q23EGG10XfbManager,Q23EGG14SimpleAudioMgr,Q23EGG12SceneManager,Q23EGG15PerformanceView>Fv = .text:0x80064EF0; // type:function size:0x14
@@ -8504,8 +8504,8 @@ fn_80152C30 = .text:0x80152C30; // type:function size:0xE8
 fn_80152D20 = .text:0x80152D20; // type:function size:0x54
 fn_80152D80 = .text:0x80152D80; // type:function size:0x5C
 create__18dLytSystemWindow_cFv = .text:0x80152DE0; // type:function size:0x3C
-fn_80125E20__18dLytSystemWindow_cFv = .text:0x80152E20; // type:function size:0xC8
-fn_80125EF0__18dLytSystemWindow_cFv = .text:0x80152EF0; // type:function size:0x8
+fn_80152E20__18dLytSystemWindow_cFv = .text:0x80152E20; // type:function size:0xC8
+fn_80152EF0__18dLytSystemWindow_cFv = .text:0x80152EF0; // type:function size:0x8
 fn_80152F00 = .text:0x80152F00; // type:function size:0x8
 fn_80152F10__18dLytSystemWindow_cFv = .text:0x80152F10; // type:function size:0x10
 setSelectBtn__18dLytSystemWindow_cFff = .text:0x80152F20; // type:function size:0x18
diff --git a/include/d/lyt/d_lyt_system_window.h b/include/d/lyt/d_lyt_system_window.h
index bba711d5..87094657 100644
--- a/include/d/lyt/d_lyt_system_window.h
+++ b/include/d/lyt/d_lyt_system_window.h
@@ -80,8 +80,8 @@ public:
 
     s32 getField_0xDE0() const;
     bool getField_0xDFC() const;
-    void fn_80125E20();
-    void fn_80125EF0();
+    void fn_80152E20();
+    void fn_80152EF0();
     void fn_80152F10();
     bool fn_80152F50() const;
     bool fn_80152F60() const;
diff --git a/include/egg/core/eggSystem.h b/include/egg/core/eggSystem.h
index c1686d2e..6c1e1a22 100644
--- a/include/egg/core/eggSystem.h
+++ b/include/egg/core/eggSystem.h
@@ -333,7 +333,7 @@ public:
 
     // vtable at 0x0
     /* vt 0x08 */ virtual Video *getVideo() = 0;
-    /* vt 0x0C */ virtual Heap *getSysHeap() = 0;
+    /* vt 0x0C */ virtual Heap *getSystemHeap() = 0;
     /* vt 0x10 */ virtual Display *getDisplay() = 0;
     /* vt 0x14 */ virtual XfbManager *getXfbMgr() = 0;
     /* vt 0x18 */ virtual PerformanceView *getPerfView() = 0;
@@ -390,7 +390,7 @@ public:
         return static_cast<Video *>(mVideo);
     }
 
-    Heap *getSysHeap() override {
+    Heap *getSystemHeap() override {
         return mSystemHeap;
     }
 
@@ -449,7 +449,7 @@ public:
 
         exceptionCreate(heap);
 
-        BaseSystem::mConfigData->getSysHeap()->mFlag.setBit(0);
+        BaseSystem::mConfigData->getSystemHeap()->mFlag.setBit(0);
 
         mHeap::setCurrentHeap(mHeap::g_assertHeap);
     }
diff --git a/include/f/f_manager.h b/include/f/f_manager.h
index 9202612e..1dd4eb16 100644
--- a/include/f/f_manager.h
+++ b/include/f/f_manager.h
@@ -48,7 +48,7 @@ public:
         m_StopProcInf |= flags;
     }
 
-    static void keepStopProcFlags(u32 flags) {
+    static void maskStopProcFlags(u32 flags) {
         m_StopProcInf &= flags;
     }
 
diff --git a/include/toBeSorted/unk_save_time.h b/include/toBeSorted/unk_save_time.h
index 0f98e691..b2d8ae62 100644
--- a/include/toBeSorted/unk_save_time.h
+++ b/include/toBeSorted/unk_save_time.h
@@ -2,6 +2,7 @@
 #define UNK_SAVE_TIME_H
 
 #include "common.h"
+#include "egg/core/eggHeap.h"
 
 class SaveTimeRelated {
 public:
diff --git a/src/d/d_main.cpp b/src/d/d_main.cpp
index c78c627a..34c66c0f 100644
--- a/src/d/d_main.cpp
+++ b/src/d/d_main.cpp
@@ -28,11 +28,11 @@ void fn_80054FB0(u32 val) {
     lbl_805751D0 = flags | val;
 }
 
-void fn_80054EF0(u32 val) {
+void fn_80054FE0(u32 val) {
     lbl_805751D0 &= ~val;
 
     if (!lbl_805751D0) {
-        fManager_c::keepStopProcFlags(fManager_c::PROC_FLAG_DRAW);
+        fManager_c::maskStopProcFlags(fManager_c::PROC_FLAG_DRAW);
     }
 }
 
diff --git a/src/d/d_sys.cpp b/src/d/d_sys.cpp
index a988ce03..f94f91b0 100644
--- a/src/d/d_sys.cpp
+++ b/src/d/d_sys.cpp
@@ -289,7 +289,7 @@ void dSys_c::execute() {
         dDvdUnk::FontUnk::GetInstance()->drawNonDriveError();
 
         if (dLytSystemWindow_c::GetInstance()) {
-            dLytSystemWindow_c::GetInstance()->fn_80125EF0();
+            dLytSystemWindow_c::GetInstance()->fn_80152EF0();
         }
 
         SaveMgr::GetInstance()->draw();
@@ -314,7 +314,7 @@ void dSys_c::execute() {
             dDvdUnk::FontUnk::GetInstance()->execute();
 
             if (dLytSystemWindow_c::GetInstance()) {
-                dLytSystemWindow_c::GetInstance()->fn_80125EF0();
+                dLytSystemWindow_c::GetInstance()->fn_80152EF0();
             }
 
             SaveMgr::GetInstance()->draw();
@@ -356,7 +356,7 @@ void dSys_c::execute() {
     SaveMgr::GetInstance()->execute();
 
     if (dLytSystemWindow_c::GetInstance()) {
-        dLytSystemWindow_c::GetInstance()->fn_80125E20();
+        dLytSystemWindow_c::GetInstance()->fn_80152E20();
     }
 
     dSndMgr_c::GetInstance()->calc();