1 files changed, 6 insertions, 2 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 140ff6451..450e7566d 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -13,11 +13,11 @@
 #include "core/core_timing.h"
 #include "core/gdbstub/gdbstub.h"
 #include "core/hle/kernel/kernel.h"
-#include "core/hle/kernel/memory.h"
 #include "core/hle/kernel/thread.h"
 #include "core/hle/service/service.h"
 #include "core/hw/hw.h"
 #include "core/loader/loader.h"
+#include "core/memory_setup.h"
 #include "core/settings.h"
 #include "video_core/video_core.h"
 
@@ -123,7 +123,8 @@ void System::Reschedule() {
 }
 
 System::ResultStatus System::Init(EmuWindow* emu_window, u32 system_mode) {
-    Memory::Init();
+    Memory::InitMemoryMap();
+    LOG_DEBUG(HW_Memory, "initialized OK");
 
     if (Settings::values.use_cpu_jit) {
         cpu_core = std::make_unique<ARM_Dynarmic>(USER32MODE);
@@ -131,6 +132,8 @@ System::ResultStatus System::Init(EmuWindow* emu_window, u32 system_mode) {
         cpu_core = std::make_unique<ARM_DynCom>(USER32MODE);
     }
 
+    telemetry_session = std::make_unique<Core::TelemetrySession>();
+
     CoreTiming::Init();
     HW::Init();
     Kernel::Init(system_mode);
@@ -161,6 +164,7 @@ void System::Shutdown() {
     CoreTiming::Shutdown();
     cpu_core = nullptr;
     app_loader = nullptr;
+    telemetry_session = nullptr;
 
     LOG_DEBUG(Core, "Shutdown OK");
 }