2 files changed, 43 insertions, 21 deletions
diff --git a/include/d/d_hbm.h b/include/d/d_hbm.h
new file mode 100644
index 00000000..b676b6f7
--- /dev/null
+++ b/include/d/d_hbm.h
@@ -0,0 +1,43 @@
+
+#include "egg/core/eggHeap.h"
+namespace dHbm {
+class Manage_c {
+public:
+    static void CreateInstance();
+    static Manage_c *GetInstance();
+
+    Manage_c(EGG::Heap *);
+
+    bool Load();
+    void Calculate();
+    void DrawMenu(s32);
+    void DrawMenuSetting();
+    void DrawIcon();
+    void InitDataInfo();
+    void InitControllerData();
+    void SetRegionLayoutName();
+    void SetSpkNameName();
+    void SetMsgName();
+    void SetConfigName();
+    void SetIconName();
+    void SetSoundName();
+    void SetContData();
+    bool CheckBegin() const;
+
+    void MenuInit();
+    void IconCalc();
+    void IconClear();
+    void StopMotor();
+    void ForbidCalc();
+
+    s32 fn_80197560(s32);
+    void offFlags(u32 flags) {
+        mFlags &= ~flags;
+    }
+
+private:
+    static Manage_c *s_pInstance;
+    u8 _0x00[0x218 - 0x000];
+    u32 mFlags;
+};
+} // namespace dHbm
diff --git a/include/toBeSorted/d_hbm.h b/include/toBeSorted/d_hbm.h
deleted file mode 100644
index f8eb390b..00000000
--- a/include/toBeSorted/d_hbm.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef D_HBM_H
-#define D_HBM_H
-
-#include "common.h"
-class dHbm_c {
-public:
-    static dHbm_c *GetInstance();
-
-    s32 fn_801967D0();
-    s32 fn_80197560(s32);
-
-    void offFlags(u32 flags) {
-        mFlags &= ~flags;
-    }
-
-private:
-    u8 _0x00[0x218 - 0x000];
-    u32 mFlags;
-};
-
-#endif