2 files changed, 16 insertions, 9 deletions
diff --git a/Ryujinx.HLE/HOS/Services/Time/StaticService/ITimeZoneServiceForGlue.cs b/Ryujinx.HLE/HOS/Services/Time/StaticService/ITimeZoneServiceForGlue.cs
index 7acb0257..bbe80fbe 100644
--- a/Ryujinx.HLE/HOS/Services/Time/StaticService/ITimeZoneServiceForGlue.cs
+++ b/Ryujinx.HLE/HOS/Services/Time/StaticService/ITimeZoneServiceForGlue.cs
@@ -1,6 +1,5 @@
-using ARMeilleure.Memory;
-using Ryujinx.Common;
 using Ryujinx.Common.Logging;
+using Ryujinx.Cpu;
 using Ryujinx.HLE.HOS.Services.Time.TimeZone;
 using System;
 using System.Text;
@@ -71,7 +70,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.StaticService
                         return ResultCode.LocationNameTooLong;
                     }
 
-                    context.Memory.WriteBytes(bufferPosition + offset, Encoding.ASCII.GetBytes(locationName));
+                    context.Memory.Write((ulong)bufferPosition + offset, Encoding.ASCII.GetBytes(locationName));
                     MemoryHelper.FillWithZeros(context.Memory, bufferPosition + offset + locationName.Length, padding);
 
                     offset += 0x24;
diff --git a/Ryujinx.HLE/HOS/Services/Time/StaticService/ITimeZoneServiceForPsc.cs b/Ryujinx.HLE/HOS/Services/Time/StaticService/ITimeZoneServiceForPsc.cs
index ed31fe7c..4f0e6e9c 100644
--- a/Ryujinx.HLE/HOS/Services/Time/StaticService/ITimeZoneServiceForPsc.cs
+++ b/Ryujinx.HLE/HOS/Services/Time/StaticService/ITimeZoneServiceForPsc.cs
@@ -1,6 +1,6 @@
-using ARMeilleure.Memory;
-using Ryujinx.Common;
+using Ryujinx.Common;
 using Ryujinx.Common.Logging;
+using Ryujinx.Cpu;
 using Ryujinx.HLE.HOS.Services.Time.Clock;
 using Ryujinx.HLE.HOS.Services.Time.TimeZone;
 using Ryujinx.HLE.Utilities;
@@ -129,7 +129,11 @@ namespace Ryujinx.HLE.HOS.Services.Time.StaticService
 
             ResultCode result;
 
-            using (MemoryStream timeZoneBinaryStream = new MemoryStream(context.Memory.ReadBytes(bufferPosition, bufferSize)))
+            byte[] temp = new byte[bufferSize];
+
+            context.Memory.Read((ulong)bufferPosition, temp);
+
+            using (MemoryStream timeZoneBinaryStream = new MemoryStream(temp))
             {
                 result = _timeZoneManager.SetDeviceLocationNameWithTimeZoneRule(locationName, timeZoneBinaryStream);
             }
@@ -156,7 +160,11 @@ namespace Ryujinx.HLE.HOS.Services.Time.StaticService
 
             ResultCode result;
 
-            using (MemoryStream timeZoneBinaryStream = new MemoryStream(context.Memory.ReadBytes(bufferPosition, bufferSize)))
+            byte[] temp = new byte[bufferSize];
+
+            context.Memory.Read((ulong)bufferPosition, temp);
+
+            using (MemoryStream timeZoneBinaryStream = new MemoryStream(temp))
             {
                 result = _timeZoneManager.ParseTimeZoneRuleBinary(out TimeZoneRule timeZoneRule, timeZoneBinaryStream);
 
@@ -246,7 +254,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.StaticService
                 long outBufferPosition = context.Request.RecvListBuff[0].Position;
                 long outBufferSize     = context.Request.RecvListBuff[0].Size;
 
-                context.Memory.WriteInt64(outBufferPosition, posixTime);
+                context.Memory.Write((ulong)outBufferPosition, posixTime);
                 context.ResponseData.Write(1);
             }
 
@@ -266,7 +274,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.StaticService
                 long outBufferPosition = context.Request.RecvListBuff[0].Position;
                 long outBufferSize     = context.Request.RecvListBuff[0].Size;
 
-                context.Memory.WriteInt64(outBufferPosition, posixTime);
+                context.Memory.Write((ulong)outBufferPosition, posixTime);
 
                 // There could be only one result on one calendar as leap seconds aren't supported.
                 context.ResponseData.Write(1);