1 files changed, 14 insertions, 4 deletions
diff --git a/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgV7.cs b/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgV7.cs
index a01e7c04..efb95ea5 100644
--- a/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgV7.cs
+++ b/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgV7.cs
@@ -1,16 +1,26 @@
+using Ryujinx.Common.Memory;
+using System;
 using System.Runtime.InteropServices;
 
 namespace Ryujinx.HLE.HOS.Applets
 {
 #pragma warning disable CS0649
     // (8.0.0+ version)
-    [StructLayout(LayoutKind.Sequential, Pack=1)]
-    unsafe struct ControllerSupportArgV7
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct ControllerSupportArgV7
     {
         public ControllerSupportArgHeader Header;
-        public fixed uint IdentificationColor[8];
+        public Array8<uint> IdentificationColor;
         public byte EnableExplainText;
-        public fixed byte ExplainText[8 * 0x81];
+        public ExplainTextStruct ExplainText;
+
+        [StructLayout(LayoutKind.Sequential, Size = 8 * 0x81)]
+        public struct ExplainTextStruct
+        {
+            private byte element;
+
+            public Span<byte> ToSpan() => MemoryMarshal.CreateSpan(ref element, 8 * 0x81);
+        }
     }
 #pragma warning restore CS0649
 }
 \ No newline at end of file