LayoutResourceMgr part in ksys::PreInit

zeldaret · Aug 8, 2024 · 62f972d · 62f972d
1 parent 181a709
commit 62f972d
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 1 deletion.
diff --git a/data/uking_functions.csv b/data/uking_functions.csv
@@ -81790,7 +81790,7 @@ Address,Quality,Size,Name
 0x0000007100f3a528,U,000016,
 0x0000007100f3a538,U,000756,ui::init
 0x0000007100f3a82c,U,000172,createRegionLanguageMgr
-0x0000007100f3a8d8,U,002276,ksys::PreInitializeApp
+0x0000007100f3a8d8,W,002276,_ZN4ksys16preInitializeAppEPNS_10InitParamsE
 0x0000007100f3b1bc,U,000132,checkPreInitializeResourcesStillLoading
 0x0000007100f3b240,U,007612,ksys::InitializeApp
 0x0000007100f3cffc,O,000388,_ZN4ksys15initBaseProcMgrEPN4sead4HeapE

diff --git a/src/KingSystem/ksys.cpp b/src/KingSystem/ksys.cpp
@@ -4,7 +4,9 @@
 #include "KingSystem/ActorSystem/actBaseProcCreateTaskSelector.h"
 #include "KingSystem/ActorSystem/actBaseProcInitializer.h"
 #include "KingSystem/ActorSystem/actBaseProcMgr.h"
+#include "KingSystem/System/BasicProfiler.h"
 #include "KingSystem/System/HavokWorkerMgr.h"
+#include "KingSystem/System/UI/LayoutResourceMgr.h"
 
 namespace ksys {
 
@@ -29,4 +31,22 @@ void initBaseProcMgr(sead::Heap* heap) {
     act::BaseProcMgr::sConstant4 = u32(act::JobType::Calc4);
 }
 
+void preInitializeApp(InitParams* params) {
+    ksys::BasicProfiler::push("ksys::PreInitializeApp");
+
+    // TODO - other parts
+
+    ksys::BasicProfiler::push("RequestFontLoad");
+    // TODO: FontMgr::createInstance()
+    ui::LayoutResourceMgr::createInstance(params->king_sys_heap);
+    ui::LayoutResourceMgr::instance()->init(params->king_sys_heap);
+    ui::LayoutResourceMgr::instance()->loadLangFont(params->king_sys_heap);
+    ui::LayoutResourceMgr::instance()->loadExtraLangFonts(params->king_sys_heap);
+    ksys::BasicProfiler::pop("RequestFontLoad");
+
+    // TODO - other parts
+
+    ksys::BasicProfiler::pop("ksys::PreInitializeApp");
+}
+
 }  // namespace ksys
diff --git a/src/KingSystem/ksys.h b/src/KingSystem/ksys.h
@@ -6,11 +6,18 @@ class Heap;
 
 namespace ksys {
 
+struct InitParams {
+    sead::Heap* king_sys_heap;
+};
+
 // 0x0000007100f3a4e4
 bool isGameOver();
 // 0x0000007100f3a4f0
 void setIsGameOver(bool is_game_over);
 
 void initBaseProcMgr(sead::Heap* heap);
 
+// 0x0000007100f3a8d8
+void preInitializeApp(InitParams* params);
+
 }  // namespace ksys