8 files changed, 18 insertions, 11 deletions
diff --git a/src/core/hle/service/am/applet_oe.cpp b/src/core/hle/service/am/applet_oe.cpp
index 0d7f9c03d..038080e8c 100644
--- a/src/core/hle/service/am/applet_oe.cpp
+++ b/src/core/hle/service/am/applet_oe.cpp
@@ -206,8 +206,7 @@ public:
     explicit IStorageAccessor(std::vector<u8> buffer)
         : ServiceFramework("IStorageAccessor"), buffer(std::move(buffer)) {
         static const FunctionInfo functions[] = {
-            {0, &IStorageAccessor::GetSize, "GetSize"},
-            {11, &IStorageAccessor::Read, "Read"},
+            {0, &IStorageAccessor::GetSize, "GetSize"}, {11, &IStorageAccessor::Read, "Read"},
         };
         RegisterHandlers(functions);
     }
diff --git a/src/core/hle/service/time/time.cpp b/src/core/hle/service/time/time.cpp
index a48d7b304..9fed89246 100644
--- a/src/core/hle/service/time/time.cpp
+++ b/src/core/hle/service/time/time.cpp
@@ -45,6 +45,7 @@ public:
     ITimeZoneService() : ServiceFramework("ITimeZoneService") {
         static const FunctionInfo functions[] = {
             {0, &ITimeZoneService::GetDeviceLocationName, "GetDeviceLocationName"},
+            {2, &ITimeZoneService::GetTotalLocationNameCount, "GetTotalLocationNameCount"},
             {101, &ITimeZoneService::ToCalendarTimeWithMyRule, "ToCalendarTimeWithMyRule"},
         };
         RegisterHandlers(functions);
@@ -53,10 +54,17 @@ public:
 private:
     void GetDeviceLocationName(Kernel::HLERequestContext& ctx) {
         LOG_WARNING(Service, "(STUBBED) called");
-        LocationName name{};
-        IPC::RequestBuilder rb{ctx, 11};
+        LocationName location_name{};
+        IPC::RequestBuilder rb{ctx, (sizeof(LocationName) / 4) + 2};
         rb.Push(RESULT_SUCCESS);
-        rb.PushRaw(name);
+        rb.PushRaw(location_name);
+    }
+
+    void GetTotalLocationNameCount(Kernel::HLERequestContext& ctx) {
+        LOG_WARNING(Service, "(STUBBED) called");
+        IPC::RequestBuilder rb{ctx, 3};
+        rb.Push(RESULT_SUCCESS);
+        rb.Push<u32>(0);
     }
 
     void ToCalendarTimeWithMyRule(Kernel::HLERequestContext& ctx) {
diff --git a/src/core/hle/service/time/time.h b/src/core/hle/service/time/time.h
index 2aa424dbb..399f474d6 100644
--- a/src/core/hle/service/time/time.h
+++ b/src/core/hle/service/time/time.h
@@ -13,7 +13,7 @@ namespace Time {
 struct LocationName {
     INSERT_PADDING_BYTES(0x24);
 };
-static_assert(sizeof(LocationName) == 0x24, "LocationName structure has incorrect size");
+static_assert(sizeof(LocationName) == 0x24, "LocationName is incorrect size");
 
 struct CalendarTime {
     u16_le year;
diff --git a/src/core/hle/service/time/time_s.cpp b/src/core/hle/service/time/time_s.cpp
index 52de888d3..a442ac599 100644
--- a/src/core/hle/service/time/time_s.cpp
+++ b/src/core/hle/service/time/time_s.cpp
@@ -17,4 +17,4 @@ TIME_S::TIME_S(std::shared_ptr<Module> time) : Module::Interface(std::move(time)
 }
 
 } // namespace Time
-} // namespace Service
-\ No newline at end of file
+} // namespace Service
diff --git a/src/core/hle/service/time/time_s.h b/src/core/hle/service/time/time_s.h
index 6a9c5e673..abc2a8c5a 100644
--- a/src/core/hle/service/time/time_s.h
+++ b/src/core/hle/service/time/time_s.h
@@ -15,4 +15,4 @@ public:
 };
 
 } // namespace Time
-} // namespace Service
-\ No newline at end of file
+} // namespace Service
diff --git a/src/core/hle/service/time/time_u.cpp b/src/core/hle/service/time/time_u.cpp
index 87fa9da79..ed97a2b1f 100644
--- a/src/core/hle/service/time/time_u.cpp
+++ b/src/core/hle/service/time/time_u.cpp
@@ -20,4 +20,4 @@ TIME_U::TIME_U(std::shared_ptr<Module> time) : Module::Interface(std::move(time)
 }
 
 } // namespace Time
-} // namespace Service
-\ No newline at end of file
+} // namespace Service
diff --git a/src/core/hle/service/time/time_u.h b/src/core/hle/service/time/time_u.h
index 44e17425f..f99d25057 100644
--- a/src/core/hle/service/time/time_u.h
+++ b/src/core/hle/service/time/time_u.h
@@ -15,4 +15,4 @@ public:
 };
 
 } // namespace Time
-} // namespace Service
-\ No newline at end of file
+} // namespace Service
diff --git a/src/core/hle/service/vi/vi.cpp b/src/core/hle/service/vi/vi.cpp
index 108a635d7..015fb164e 100644
--- a/src/core/hle/service/vi/vi.cpp
+++ b/src/core/hle/service/vi/vi.cpp
@@ -138,7 +138,7 @@ private:
         u32_le process_id;
         u32_le id;
         INSERT_PADDING_BYTES(0xC);
-        std::array<u8, 8> dspdrv = {'d', 's', 'p', 'd', 'r', 'v'};
+        std::array<u8, 8> dispdrv = {'d', 'i', 's', 'p', 'd', 'r', 'v', '\0'};
         INSERT_PADDING_BYTES(8);
     };
     static_assert(sizeof(Data) == 0x28, "ParcelData has wrong size");