From ebb731b9a166a6d326d0c62500ed287ab05ebe41 Mon Sep 17 00:00:00 2001 From: Dragios Date: Sun, 10 Dec 2017 07:38:23 +0800 Subject: [PATCH 1/2] Fill up the rest of Applet IDs --- src/core/hle/service/apt/apt.cpp | 37 ++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/src/core/hle/service/apt/apt.cpp b/src/core/hle/service/apt/apt.cpp index b5a0f7d03..164c5bb60 100644 --- a/src/core/hle/service/apt/apt.cpp +++ b/src/core/hle/service/apt/apt.cpp @@ -97,12 +97,45 @@ static constexpr size_t NumApplets = 29; static constexpr std::array applet_titleids = {{ {AppletId::HomeMenu, AppletId::None, 0x4003000008202, 0x4003000008F02, 0x4003000009802, 0x4003000008202, 0x400300000A102, 0x400300000A902, 0x400300000B102}, + {AppletId::AlternateMenu, AppletId::None, 0x4003000008102, 0x4003000008102, 0x4003000008102, + 0x4003000008102, 0x4003000008102, 0x4003000008102, 0x4003000008102}, + {AppletId::Camera, AppletId::None, 0x4003000008402, 0x4003000009002, 0x4003000009902, + 0x4003000008402, 0x400300000A202, 0x400300000AA02, 0x400300000B202}, + {AppletId::FriendList, AppletId::None, 0x4003000008D02, 0x4003000009602, 0x4003000009F02, + 0x4003000008D02, 0x400300000A702, 0x400300000AF02, 0x400300000B702}, + {AppletId::GameNotes, AppletId::None, 0x4003000008702, 0x4003000009302, 0x4003000009C02, + 0x4003000008702, 0x400300000A502, 0x400300000AD02, 0x400300000B502}, + {AppletId::InternetBrowser, AppletId::None, 0x4003000008802, 0x4003000009402, 0x4003000009D02, + 0x4003000008802, 0x400300000A602, 0x400300000AE02, 0x400300000B602}, + {AppletId::InstructionManual, AppletId::None, 0x4003000008602, 0x4003000009202, 0x4003000009B02, + 0x4003000008602, 0x400300000A402, 0x400300000AC02, 0x400300000B402}, + {AppletId::Notifications, AppletId::None, 0x4003000008E02, 0x4003000009702, 0x400300000A002, + 0x4003000008E02, 0x400300000A802, 0x400300000B002, 0x400300000B802}, + {AppletId::Miiverse, AppletId::None, 0x400300000BC02, 0x400300000BD02, 0x400300000BE02, + 0x400300000BC02, 0x4003000009E02, 0x4003000009502, 0x400300000B902}, + // These values obtained from an older NS dump firmware 4.5 + {AppletId::MiiversePost, AppletId::None, 0x400300000BA02, 0x400300000BA02, 0x400300000BA02, + 0x400300000BA02, 0x400300000BA02, 0x400300000BA02, 0x400300000BA02}, + // {AppletId::MiiversePost, AppletId::None, 0x4003000008302, 0x4003000008B02, 0x400300000BA02, + // 0x4003000008302, 0x0, 0x0, 0x0}, + {AppletId::AmiiboSettings, AppletId::None, 0x4003000009502, 0x4003000009E02, 0x400300000B902, + 0x4003000009502, 0x0, 0x4003000008C02, 0x400300000BF02}, {AppletId::SoftwareKeyboard1, AppletId::SoftwareKeyboard2, 0x400300000C002, 0x400300000C802, 0x400300000D002, 0x400300000C002, 0x400300000D802, 0x400300000DE02, 0x400300000E402}, - {AppletId::Error, AppletId::Error2, 0x400300000C502, 0x400300000C502, 0x400300000C502, - 0x400300000C502, 0x400300000CF02, 0x400300000CF02, 0x400300000CF02}, {AppletId::Ed1, AppletId::Ed2, 0x400300000C102, 0x400300000C902, 0x400300000D102, 0x400300000C102, 0x400300000D902, 0x400300000DF02, 0x400300000E502}, + {AppletId::PnoteApp, AppletId::PnoteApp2, 0x400300000C302, 0x400300000CB02, 0x400300000D302, + 0x400300000C302, 0x400300000DB02, 0x400300000E102, 0x400300000E702}, + {AppletId::SnoteApp, AppletId::SnoteApp2, 0x400300000C402, 0x400300000CC02, 0x400300000D402, + 0x400300000C402, 0x400300000DC02, 0x400300000E202, 0x400300000E802}, + {AppletId::Error, AppletId::Error2, 0x400300000C502, 0x400300000C502, 0x400300000C502, + 0x400300000C502, 0x400300000CF02, 0x400300000CF02, 0x400300000CF02}, + {AppletId::Mint, AppletId::Mint2, 0x400300000C602, 0x400300000CE02, 0x400300000D602, + 0x400300000C602, 0x400300000DD02, 0x400300000E302, 0x400300000E902}, + {AppletId::Extrapad, AppletId::Extrapad2, 0x400300000CD02, 0x400300000CD02, 0x400300000CD02, + 0x400300000CD02, 0x400300000D502, 0x400300000D502, 0x400300000D502}, + {AppletId::Memolib, AppletId::Memolib2, 0x400300000F602, 0x400300000F602, 0x400300000F602, + 0x400300000F602, 0x400300000F602, 0x400300000F602, 0x400300000F602}, // TODO(Subv): Fill in the rest of the titleids }}; From 8b864a74e92b919da27c02394d7e3df0c26f1bf7 Mon Sep 17 00:00:00 2001 From: Dragios Date: Sun, 10 Dec 2017 07:38:56 +0800 Subject: [PATCH 2/2] Add new AppID (eShop) --- src/core/hle/service/apt/apt.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/hle/service/apt/apt.h b/src/core/hle/service/apt/apt.h index 7b79e1f3e..5492ee6c1 100644 --- a/src/core/hle/service/apt/apt.h +++ b/src/core/hle/service/apt/apt.h @@ -77,7 +77,7 @@ enum class AppletId : u32 { HomeMenu = 0x101, AlternateMenu = 0x103, Camera = 0x110, - FriendsList = 0x112, + FriendList = 0x112, GameNotes = 0x113, InternetBrowser = 0x114, InstructionManual = 0x115, @@ -95,6 +95,7 @@ enum class AppletId : u32 { Extrapad = 0x208, Memolib = 0x209, Application = 0x300, + Tiger = 0x301, AnyLibraryApplet = 0x400, SoftwareKeyboard2 = 0x401, Ed2 = 0x402,