d_s_boot OK

4 files changed, 11 insertions, 2 deletions

diff --git a/include/d/d_hbm.h b/include/d/d_hbm.h
index aa0a42a6..f02387db 100644
--- a/include/d/d_hbm.h
+++ b/include/d/d_hbm.h
@@ -10,6 +10,8 @@ public:
         HBM_MANAGE_ACTIVE = 2,
     };
 
+    typedef void (*MenuInitCallback)();
+
     static void CreateInstance();
     static Manage_c *GetInstance();
 
@@ -47,6 +49,10 @@ public:
         return mState;
     }
 
+    void setMenuInitCallback(MenuInitCallback cb) {
+        mMenuInitCallback = cb;
+    }
+
 private:
     static Manage_c *s_pInstance;
 
@@ -54,5 +60,7 @@ private:
     /* 0x210 */ ManageState_e mState;
     /* 0x218 */ UNKWORD field_0x214;
     /* 0x218 */ u32 mFlags;
+    /* 0x21C */ u8 _0x21C[0x224 - 0x21C];
+    /* 0x224 */ MenuInitCallback mMenuInitCallback;
 };
 } // namespace dHbm
diff --git a/include/d/d_s_boot.h b/include/d/d_s_boot.h
index 428f04e5..5f5b5b4c 100644
--- a/include/d/d_s_boot.h
+++ b/include/d/d_s_boot.h
@@ -97,7 +97,7 @@ private:
     /* 0x068 */ strap_c mStrapScreen;
     /* 0x55C */ sFPhase<dScBoot_c> mPhases;
     /* 0x570 */ mDvd_callback_c *mpDvdCallback;
-    /* 0x574 */ STATE_MGR_DECLARE(dScBoot_c);
+    /* 0x574 */ UI_STATE_MGR_DECLARE(dScBoot_c);
     /* 0x5B4 */ dFader_c mFader;
     /* 0x5D4 */ s32 mProgressStage;
     /* 0x5D8 */ s32 field_0x5D8;
diff --git a/include/d/snd/d_snd_player_mgr.h b/include/d/snd/d_snd_player_mgr.h
index 67ba6eb4..351026fc 100644
--- a/include/d/snd/d_snd_player_mgr.h
+++ b/include/d/snd/d_snd_player_mgr.h
@@ -52,6 +52,7 @@ public:
     void enterHbm();
     void leaveHbm();
 
+    bool fn_8035E000();
     void fn_8035E1B0(u16);
     bool fn_8035E220();
     void fn_8035E250(u16);
diff --git a/include/s/s_StateMgr.hpp b/include/s/s_StateMgr.hpp
index 507c7ddd..a5d3d3f4 100644
--- a/include/s/s_StateMgr.hpp
+++ b/include/s/s_StateMgr.hpp
@@ -17,7 +17,7 @@
  * @ingroup state
  */
 template <class T, class Method, template <class> class Factory, class Check>
-class sStateMgr_c : sStateMgrIf_c {
+class sStateMgr_c : public sStateMgrIf_c {
 public:
     sStateMgr_c(T &owner)
         : mFactory(owner), mMethod(mCheck, mFactory, sStateID::null) {}