2 files changed, 73 insertions, 7 deletions

diff --git a/src/core/hle/service/apt/apt_a.cpp b/src/core/hle/service/apt/apt_a.cpp
index a7a0c8a41..6e35e1d29 100644
--- a/src/core/hle/service/apt/apt_a.cpp
+++ b/src/core/hle/service/apt/apt_a.cpp
@@ -9,34 +9,97 @@ namespace Service {
 namespace APT {
 
 const Interface::FunctionInfo FunctionTable[] = {
-    {0x00010040, GetLockHandle, "GetLockHandle?"},
-    {0x00020080, Initialize, "Initialize?"},
-    {0x00030040, Enable, "Enable?"},
-    {0x00040040, nullptr, "Finalize?"},
+    {0x00010040, GetLockHandle, "GetLockHandle"},
+    {0x00020080, Initialize, "Initialize"},
+    {0x00030040, Enable, "Enable"},
+    {0x00040040, nullptr, "Finalize"},
     {0x00050040, GetAppletManInfo, "GetAppletManInfo"},
     {0x00060040, GetAppletInfo, "GetAppletInfo"},
+    {0x00070000, nullptr, "GetLastSignaledAppletId"},
+    {0x00080000, nullptr, "CountRegisteredApplet"},
     {0x00090040, IsRegistered, "IsRegistered"},
+    {0x000A0040, nullptr, "GetAttribute"},
     {0x000B0040, InquireNotification, "InquireNotification"},
     {0x000C0104, SendParameter, "SendParameter"},
     {0x000D0080, ReceiveParameter, "ReceiveParameter"},
     {0x000E0080, GlanceParameter, "GlanceParameter"},
     {0x000F0100, CancelParameter, "CancelParameter"},
+    {0x001000C2, nullptr, "DebugFunc"},
+    {0x001100C0, nullptr, "MapProgramIdForDebug"},
+    {0x00120040, nullptr, "SetHomeMenuAppletIdForDebug"},
+    {0x00130000, nullptr, "GetPreparationState"},
+    {0x00140040, nullptr, "SetPreparationState"},
     {0x00150140, PrepareToStartApplication, "PrepareToStartApplication"},
     {0x00160040, PreloadLibraryApplet, "PreloadLibraryApplet"},
+    {0x00170040, nullptr, "FinishPreloadingLibraryApplet"},
     {0x00180040, PrepareToStartLibraryApplet, "PrepareToStartLibraryApplet"},
+    {0x00190040, nullptr, "PrepareToStartSystemApplet"},
+    {0x001A0000, nullptr, "PrepareToStartNewestHomeMenu"},
+    {0x001B00C4, nullptr, "StartApplication"},
+    {0x001C0000, nullptr, "WakeupApplication"},
+    {0x001D0000, nullptr, "CancelApplication"},
     {0x001E0084, StartLibraryApplet, "StartLibraryApplet"},
+    {0x001F0084, nullptr, "StartSystemApplet"},
+    {0x00200044, nullptr, "StartNewestHomeMenu"},
+    {0x00210000, nullptr, "OrderToCloseApplication"},
+    {0x00220040, nullptr, "PrepareToCloseApplication"},
+    {0x00230040, nullptr, "PrepareToJumpToApplication"},
+    {0x00240044, nullptr, "JumpToApplication"},
+    {0x002500C0, nullptr, "PrepareToCloseLibraryApplet"},
+    {0x00260000, nullptr, "PrepareToCloseSystemApplet"},
+    {0x00270044, nullptr, "CloseApplication"},
+    {0x00280044, nullptr, "CloseLibraryApplet"},
+    {0x00290044, nullptr, "CloseSystemApplet"},
+    {0x002A0000, nullptr, "OrderToCloseSystemApplet"},
+    {0x002B0000, nullptr, "PrepareToJumpToHomeMenu"},
+    {0x002C0044, nullptr, "JumpToHomeMenu"},
+    {0x002D0000, nullptr, "PrepareToLeaveHomeMenu"},
+    {0x002E0044, nullptr, "LeaveHomeMenu"},
+    {0x002F0040, nullptr, "PrepareToLeaveResidentApplet"},
+    {0x00300044, nullptr, "LeaveResidentApplet"},
+    {0x00310100, nullptr, "PrepareToDoApplicationJump"},
+    {0x00320084, nullptr, "DoApplicationJump"},
+    {0x00330000, nullptr, "GetProgramIdOnApplicationJump"},
+    {0x00340084, nullptr, "SendDeliverArg"},
+    {0x00350080, nullptr, "ReceiveDeliverArg"},
+    {0x00360040, nullptr, "LoadSysMenuArg"},
+    {0x00370042, nullptr, "StoreSysMenuArg"},
+    {0x00380040, nullptr, "PreloadResidentApplet"},
+    {0x00390040, nullptr, "PrepareToStartResidentApplet"},
+    {0x003A0044, nullptr, "StartResidentApplet"},
     {0x003B0040, CancelLibraryApplet, "CancelLibraryApplet"},
+    {0x003C0042, nullptr, "SendDspSleep"},
+    {0x003D0042, nullptr, "SendDspWakeUp"},
     {0x003E0080, nullptr, "ReplySleepQuery"},
-    {0x00430040, NotifyToWait, "NotifyToWait?"},
-    {0x00440000, GetSharedFont, "GetSharedFont?"},
-    {0x004B00C2, AppletUtility, "AppletUtility?"},
+    {0x003F0040, nullptr, "ReplySleepNotificationComplete"},
+    {0x00400042, nullptr, "SendCaptureBufferInfo"},
+    {0x00410040, nullptr, "ReceiveCaptureBufferInfo"},
+    {0x00420080, nullptr, "SleepSystem"},
+    {0x00430040, NotifyToWait, "NotifyToWait"},
+    {0x00440000, GetSharedFont, "GetSharedFont"},
+    {0x00450040, nullptr, "GetWirelessRebootInfo"},
+    {0x00460104, nullptr, "Wrap"},
+    {0x00470104, nullptr, "Unwrap"},
+    {0x00480100, nullptr, "GetProgramInfo"},
+    {0x00490180, nullptr, "Reboot"},
+    {0x004A0040, nullptr, "GetCaptureInfo"},
+    {0x004B00C2, AppletUtility, "AppletUtility"},
+    {0x004C0000, nullptr, "SetFatalErrDispMode"},
+    {0x004D0080, nullptr, "GetAppletProgramInfo"},
+    {0x004E0000, nullptr, "HardwareResetAsync"},
     {0x004F0080, SetAppCpuTimeLimit, "SetAppCpuTimeLimit"},
     {0x00500040, GetAppCpuTimeLimit, "GetAppCpuTimeLimit"},
     {0x00510080, GetStartupArgument, "GetStartupArgument"},
+    {0x00520104, nullptr, "Wrap1"},
+    {0x00530104, nullptr, "Unwrap1"},
     {0x00550040, SetScreenCapPostPermission, "SetScreenCapPostPermission"},
     {0x00560000, GetScreenCapPostPermission, "GetScreenCapPostPermission"},
+    {0x00570044, nullptr, "WakeupApplication2"},
+    {0x00580002, nullptr, "GetProgramID"},
     {0x01010000, CheckNew3DSApp, "CheckNew3DSApp"},
     {0x01020000, CheckNew3DS, "CheckNew3DS"},
+    {0x01040000, nullptr, "IsStandardMemoryLayout"},
+    {0x01050100, nullptr, "IsTitleAllowed"},
 };
 
 APT_A_Interface::APT_A_Interface() {
diff --git a/src/core/hle/service/apt/apt_s.cpp b/src/core/hle/service/apt/apt_s.cpp
index c4556a5de..84019e6e5 100644
--- a/src/core/hle/service/apt/apt_s.cpp
+++ b/src/core/hle/service/apt/apt_s.cpp
@@ -94,9 +94,12 @@ const Interface::FunctionInfo FunctionTable[] = {
     {0x00530104, nullptr, "Unwrap1"},
     {0x00550040, SetScreenCapPostPermission, "SetScreenCapPostPermission"},
     {0x00560000, GetScreenCapPostPermission, "GetScreenCapPostPermission"},
+    {0x00570044, nullptr, "WakeupApplication2"},
     {0x00580002, nullptr, "GetProgramID"},
     {0x01010000, CheckNew3DSApp, "CheckNew3DSApp"},
     {0x01020000, CheckNew3DS, "CheckNew3DS"},
+    {0x01040000, nullptr, "IsStandardMemoryLayout"},
+    {0x01050100, nullptr, "IsTitleAllowed"},
 };
 
 APT_S_Interface::APT_S_Interface() {