1 files changed, 21 insertions, 20 deletions
diff --git a/src/core/hle/service/grc/grc.cpp b/src/core/hle/service/grc/grc.cpp
index 5f6c84e914..e8e901662d 100644
--- a/src/core/hle/service/grc/grc.cpp
+++ b/src/core/hle/service/grc/grc.cpp
@@ -14,31 +14,32 @@ namespace Service::GRC {
 
 class GRC final : public ServiceFramework<GRC> {
 public:
-    explicit GRC(Core::System& system_) : ServiceFramework{system_, "grc:c"} {}
-
-    static constexpr auto functions = CreateStaticMap(
-            FunctionInfo{1, nullptr, "OpenContinuousRecorder"},
-            FunctionInfo{2, nullptr, "OpenGameMovieTrimmer"},
-            FunctionInfo{3, nullptr, "OpenOffscreenRecorder"},
-            FunctionInfo{101, nullptr, "CreateMovieMaker"},
-            FunctionInfo{9903, nullptr, "SetOffscreenRecordingMarker"}
-        );
-    std::optional<FunctionInfoBase> FindRequest(u32 key) override {
-        return HandlerTableGenerateWithFind(key, functions);
+    explicit GRC(Core::System& system_) : ServiceFramework{system_, "grc:c"} {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {1, nullptr, "OpenContinuousRecorder"},
+            {2, nullptr, "OpenGameMovieTrimmer"},
+            {3, nullptr, "OpenOffscreenRecorder"},
+            {101, nullptr, "CreateMovieMaker"},
+            {9903, nullptr, "SetOffscreenRecordingMarker"}
+        };
+        // clang-format on
+
+        RegisterHandlers(functions);
     }
 };
 
 class GRC_D final : public ServiceFramework<GRC_D> {
 public:
-    explicit GRC_D(Core::System& system_) : ServiceFramework{system_, "grc:d"} {}
-
-    static constexpr auto functions = CreateStaticMap(
-            FunctionInfo{1, nullptr, "Initialize"},
-            FunctionInfo{2, nullptr, "Transfer"},
-            FunctionInfo{3, nullptr, "Cmd3"}
-        );
-    std::optional<FunctionInfoBase> FindRequest(u32 key) override {
-        return HandlerTableGenerateWithFind(key, functions);
+    explicit GRC_D(Core::System& system_) : ServiceFramework{system_, "grc:d"} {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {1, nullptr, "Initialize"},
+            {2, nullptr, "Transfer"},
+            {3, nullptr, "Cmd3"},
+        };
+        // clang-format on
+        RegisterHandlers(functions);
     }
 };