diff --git a/ChocolArm64/Decoders/Decoder.cs b/ChocolArm64/Decoders/Decoder.cs index 6a95bc2888..be54e59210 100644 --- a/ChocolArm64/Decoders/Decoder.cs +++ b/ChocolArm64/Decoders/Decoder.cs @@ -245,7 +245,7 @@ namespace ChocolArm64.Decoders private static bool IsAarch32Branch(OpCode64 opCode) { //Note: On ARM32, most ALU operations can write to R15 (PC), - //so we must consider such operations as a branch in potential aswell. + //so we must consider such operations as a branch in potential as well. if (opCode is IOpCode32Alu opAlu && opAlu.Rd == RegisterAlias.Aarch32Pc) { return true; diff --git a/ChocolArm64/Decoders/OpCode32BImm.cs b/ChocolArm64/Decoders/OpCode32BImm.cs index 43f191eb4d..f982e834a8 100644 --- a/ChocolArm64/Decoders/OpCode32BImm.cs +++ b/ChocolArm64/Decoders/OpCode32BImm.cs @@ -10,7 +10,7 @@ namespace ChocolArm64.Decoders { uint pc = GetPc(); - //When the codition is never, the instruction is BLX to Thumb mode. + //When the condition is never, the instruction is BLX to Thumb mode. if (Cond != Condition.Nv) { pc &= ~3u; diff --git a/ChocolArm64/Instructions/InstEmitMemoryEx.cs b/ChocolArm64/Instructions/InstEmitMemoryEx.cs index 329fba7e06..9a97ad882d 100644 --- a/ChocolArm64/Instructions/InstEmitMemoryEx.cs +++ b/ChocolArm64/Instructions/InstEmitMemoryEx.cs @@ -229,7 +229,7 @@ namespace ChocolArm64.Instructions context.Emit(OpCodes.Br, lblEnd); - //Address check passsed. + //Address check passed. context.MarkLabel(lblEx); context.EmitLdarg(TranslatedSub.MemoryArgIdx); diff --git a/Ryujinx.Audio/Renderers/SoundIo/SoundIoAudioTrackPool.cs b/Ryujinx.Audio/Renderers/SoundIo/SoundIoAudioTrackPool.cs index ec256e2086..95f181dc67 100644 --- a/Ryujinx.Audio/Renderers/SoundIo/SoundIoAudioTrackPool.cs +++ b/Ryujinx.Audio/Renderers/SoundIo/SoundIoAudioTrackPool.cs @@ -140,7 +140,7 @@ namespace Ryujinx.Audio.SoundIo } /// - /// Attempers to get a from the pool + /// Attempts to get a from the pool /// /// The track retrieved from the pool /// True if retrieve was successful diff --git a/Ryujinx.Graphics/DmaPusher.cs b/Ryujinx.Graphics/DmaPusher.cs index c6825abaf6..885bbfe867 100644 --- a/Ryujinx.Graphics/DmaPusher.cs +++ b/Ryujinx.Graphics/DmaPusher.cs @@ -104,9 +104,9 @@ namespace Ryujinx.Graphics } else { - int sumissionMode = (word >> 29) & 7; + int submissionMode = (word >> 29) & 7; - switch (sumissionMode) + switch (submissionMode) { case 1: //Incrementing. diff --git a/Ryujinx.Graphics/Gal/ShaderDumper.cs b/Ryujinx.Graphics/Gal/ShaderDumper.cs index 726447e426..d7ddf6a370 100644 --- a/Ryujinx.Graphics/Gal/ShaderDumper.cs +++ b/Ryujinx.Graphics/Gal/ShaderDumper.cs @@ -46,7 +46,7 @@ namespace Ryujinx.Graphics.Gal instruction = word0 | (ulong)word1 << 32; - //Zero instructions (other kind of NOP) stop immediatly, + //Zero instructions (other kind of NOP) stop immediately, //this is to avoid two rows of zeroes if (instruction == 0) { @@ -59,7 +59,7 @@ namespace Ryujinx.Graphics.Gal offset += 8; } - //Align to meet nvdisasm requeriments + //Align to meet nvdisasm requirements while (offset % 0x20 != 0) { fullWriter.Write(0); diff --git a/Ryujinx.Graphics/Graphics3d/MacroInterpreter.cs b/Ryujinx.Graphics/Graphics3d/MacroInterpreter.cs index 845762133c..1dc675cb8a 100644 --- a/Ryujinx.Graphics/Graphics3d/MacroInterpreter.cs +++ b/Ryujinx.Graphics/Graphics3d/MacroInterpreter.cs @@ -171,7 +171,7 @@ namespace Ryujinx.Graphics.Graphics3d break; } - //Move result and use as Method Address, then fetch and send paramter. + //Move result and use as Method Address, then fetch and send parameter. case AssignmentOperation.MoveAndSetMaddrThenFetchAndSend: { SetDstGpr(result); diff --git a/Ryujinx.Graphics/Graphics3d/NvGpuEngine2d.cs b/Ryujinx.Graphics/Graphics3d/NvGpuEngine2d.cs index d42dca28aa..f129e34104 100644 --- a/Ryujinx.Graphics/Graphics3d/NvGpuEngine2d.cs +++ b/Ryujinx.Graphics/Graphics3d/NvGpuEngine2d.cs @@ -204,7 +204,7 @@ namespace Ryujinx.Graphics.Graphics3d dstBlitX + dstBlitW, dstBlitY + dstBlitH); - //Do a guest side copy aswell. This is necessary when + //Do a guest side copy as well. This is necessary when //the texture is modified by the guest, however it doesn't //work when resources that the gpu can write to are copied, //like framebuffers. diff --git a/Ryujinx.Graphics/Shader/CodeGen/Glsl/CodeGenContext.cs b/Ryujinx.Graphics/Shader/CodeGen/Glsl/CodeGenContext.cs index ce5d7b949e..dcbdc3097d 100644 --- a/Ryujinx.Graphics/Shader/CodeGen/Glsl/CodeGenContext.cs +++ b/Ryujinx.Graphics/Shader/CodeGen/Glsl/CodeGenContext.cs @@ -18,7 +18,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Glsl private int _level; - private string _identation; + private string _indentation; public CodeGenContext(ShaderConfig config) { @@ -39,7 +39,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Glsl public void AppendLine(string str) { - _sb.AppendLine(_identation + str); + _sb.AppendLine(_indentation + str); } public string GetCode() @@ -53,7 +53,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Glsl _level++; - UpdateIdentation(); + UpdateIndentation(); } public void LeaveScope(string suffix = "") @@ -65,26 +65,26 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Glsl _level--; - UpdateIdentation(); + UpdateIndentation(); AppendLine("}" + suffix); } - private void UpdateIdentation() + private void UpdateIndentation() { - _identation = GetIdentation(_level); + _indentation = GetIndentation(_level); } - private static string GetIdentation(int level) + private static string GetIndentation(int level) { - string identation = string.Empty; + string indentation = string.Empty; for (int index = 0; index < level; index++) { - identation += Tab; + indentation += Tab; } - return identation; + return indentation; } } } \ No newline at end of file diff --git a/Ryujinx.Graphics/Shader/CodeGen/Glsl/Instructions/InstType.cs b/Ryujinx.Graphics/Shader/CodeGen/Glsl/Instructions/InstType.cs index 7d38a9d269..121cd07906 100644 --- a/Ryujinx.Graphics/Shader/CodeGen/Glsl/Instructions/InstType.cs +++ b/Ryujinx.Graphics/Shader/CodeGen/Glsl/Instructions/InstType.cs @@ -9,7 +9,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions OpUnary = Op | 1, OpBinary = Op | 2, OpTernary = Op | 3, - OpBinaryCom = OpBinary | Comutative, + OpBinaryCom = OpBinary | Commutative, CallNullary = Call | 0, CallUnary = Call | 1, @@ -17,10 +17,10 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions CallTernary = Call | 3, CallQuaternary = Call | 4, - Comutative = 1 << 8, - Op = 1 << 9, - Call = 1 << 10, - Special = 1 << 11, + Commutative = 1 << 8, + Op = 1 << 9, + Call = 1 << 10, + Special = 1 << 11, ArityMask = 0xff } diff --git a/Ryujinx.Graphics/Shader/StructuredIr/StructuredProgramContext.cs b/Ryujinx.Graphics/Shader/StructuredIr/StructuredProgramContext.cs index e1f0503a57..8870769a93 100644 --- a/Ryujinx.Graphics/Shader/StructuredIr/StructuredProgramContext.cs +++ b/Ryujinx.Graphics/Shader/StructuredIr/StructuredProgramContext.cs @@ -146,7 +146,7 @@ namespace Ryujinx.Graphics.Shader.StructuredIr { AddNode(gotoTempAsg); - //For block 0, we don't need to add the extra "reset" at the beggining, + //For block 0, we don't need to add the extra "reset" at the beginning, //because it is already the first node to be executed on the shader, //so it is reset to false by the "local" assignment anyway. if (block.Index != 0) diff --git a/Ryujinx.Graphics/Shader/Translation/Optimizations/Simplification.cs b/Ryujinx.Graphics/Shader/Translation/Optimizations/Simplification.cs index 56b1543f12..f65abb7ff8 100644 --- a/Ryujinx.Graphics/Shader/Translation/Optimizations/Simplification.cs +++ b/Ryujinx.Graphics/Shader/Translation/Optimizations/Simplification.cs @@ -14,7 +14,7 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations { case Instruction.Add: case Instruction.BitwiseExclusiveOr: - TryEliminateBinaryOpComutative(operation, 0); + TryEliminateBinaryOpCommutative(operation, 0); break; case Instruction.BitwiseAnd: @@ -34,7 +34,7 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations break; case Instruction.Multiply: - TryEliminateBinaryOpComutative(operation, 1); + TryEliminateBinaryOpCommutative(operation, 1); break; case Instruction.ShiftLeft: @@ -101,7 +101,7 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations } } - private static void TryEliminateBinaryOpComutative(Operation operation, int comparand) + private static void TryEliminateBinaryOpCommutative(Operation operation, int comparand) { Operand x = operation.GetSource(0); Operand y = operation.GetSource(1); diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Demangler.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Demangler.cs index b654ba7960..179190aaa3 100644 --- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Demangler.cs +++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Demangler.cs @@ -2909,7 +2909,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler } } while (!ConsumeIf("E")); } - // ::= sr [tempate-args] # T::x / decltype(p)::x + // ::= sr [template-args] # T::x / decltype(p)::x else { result = ParseUnresolvedType(); diff --git a/Ryujinx.HLE/HOS/Kernel/Memory/KMemoryManager.cs b/Ryujinx.HLE/HOS/Kernel/Memory/KMemoryManager.cs index 7a40139ccc..fd8d94dc5c 100644 --- a/Ryujinx.HLE/HOS/Kernel/Memory/KMemoryManager.cs +++ b/Ryujinx.HLE/HOS/Kernel/Memory/KMemoryManager.cs @@ -1980,9 +1980,9 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory for (int unit = MappingUnitSizes.Length - 1; unit >= 0 && va == 0; unit--) { - int alignemnt = MappingUnitSizes[unit]; + int alignment = MappingUnitSizes[unit]; - va = AllocateVa(AliasRegionStart, regionPagesCount, neededPagesCount, alignemnt); + va = AllocateVa(AliasRegionStart, regionPagesCount, neededPagesCount, alignment); } if (va == 0) @@ -2451,7 +2451,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory newNode.Value.SetState(newPermission, newState, newAttribute); - MergeEqualStateNeighbours(newNode); + MergeEqualStateNeighbors(newNode); } if (currEndAddr - 1 >= endAddr - 1) @@ -2472,7 +2472,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory MemoryPermission permission = MemoryPermission.None, MemoryAttribute attribute = MemoryAttribute.None) { - //Inserts new block at the list, replacing and spliting + //Inserts new block at the list, replacing and splitting //existing blocks as needed. int oldCount = _blocks.Count; @@ -2505,7 +2505,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory newNode.Value.SetState(permission, state, attribute); - MergeEqualStateNeighbours(newNode); + MergeEqualStateNeighbors(newNode); } if (currEndAddr - 1 >= endAddr - 1) @@ -2537,7 +2537,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory BlockMutator blockMutate, MemoryPermission permission = MemoryPermission.None) { - //Inserts new block at the list, replacing and spliting + //Inserts new block at the list, replacing and splitting //existing blocks as needed, then calling the callback //function on the new block. int oldCount = _blocks.Count; @@ -2573,7 +2573,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory blockMutate(newBlock, permission); - MergeEqualStateNeighbours(newNode); + MergeEqualStateNeighbors(newNode); } if (currEndAddr - 1 >= endAddr - 1) @@ -2587,7 +2587,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory _blockAllocator.Count += _blocks.Count - oldCount; } - private void MergeEqualStateNeighbours(LinkedListNode node) + private void MergeEqualStateNeighbors(LinkedListNode node) { KMemoryBlock block = node.Value; diff --git a/Ryujinx.HLE/HOS/Kernel/Threading/KScheduler.cs b/Ryujinx.HLE/HOS/Kernel/Threading/KScheduler.cs index c9686df363..a9a8f9af4a 100644 --- a/Ryujinx.HLE/HOS/Kernel/Threading/KScheduler.cs +++ b/Ryujinx.HLE/HOS/Kernel/Threading/KScheduler.cs @@ -173,7 +173,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading continue; } - //All candiates are already selected, choose the best one + //All candidates are already selected, choose the best one //(the first one that doesn't make the source core idle if moved). for (int index = 0; index < srcCoresHighestPrioThreadsCount; index++) { diff --git a/Ryujinx.HLE/HOS/SystemState/SystemStateMgr.cs b/Ryujinx.HLE/HOS/SystemState/SystemStateMgr.cs index 2f0c35f480..36775b078f 100644 --- a/Ryujinx.HLE/HOS/SystemState/SystemStateMgr.cs +++ b/Ryujinx.HLE/HOS/SystemState/SystemStateMgr.cs @@ -40,7 +40,7 @@ namespace Ryujinx.HLE.HOS.SystemState internal string ActiveAudioOutput { get; private set; } - public bool DiscordIntergrationEnabled { get; set; } + public bool DiscordIntegrationEnabled { get; set; } public bool DockedMode { get; set; } diff --git a/Ryujinx.HLE/Input/Hid.cs b/Ryujinx.HLE/Input/Hid.cs index 83c4ddea01..c42f3b6cd9 100644 --- a/Ryujinx.HLE/Input/Hid.cs +++ b/Ryujinx.HLE/Input/Hid.cs @@ -19,7 +19,7 @@ namespace Ryujinx.HLE.Input device.Memory.FillWithZeros(hidPosition, Horizon.HidSize); } - public void InitilizePrimaryController(HidControllerType controllerType) + public void InitializePrimaryController(HidControllerType controllerType) { HidControllerId controllerId = controllerType == HidControllerType.Handheld ? HidControllerId.ControllerHandheld : HidControllerId.ControllerPlayer1; @@ -39,7 +39,7 @@ namespace Ryujinx.HLE.Input PrimaryController.Connect(controllerId); } - public void InitilizeKeyboard() + public void InitializeKeyboard() { _device.Memory.FillWithZeros(HidPosition + HidKeyboardOffset, HidKeyboardSize); } diff --git a/Ryujinx.HLE/Loaders/Compression/Lz4.cs b/Ryujinx.HLE/Loaders/Compression/Lz4.cs index e405b107bb..d815140d62 100644 --- a/Ryujinx.HLE/Loaders/Compression/Lz4.cs +++ b/Ryujinx.HLE/Loaders/Compression/Lz4.cs @@ -34,7 +34,7 @@ namespace Ryujinx.HLE.Loaders.Compression int encCount = (token >> 0) & 0xf; int litCount = (token >> 4) & 0xf; - //Copy literal chunck + //Copy literal chunk litCount = GetLength(litCount); Buffer.BlockCopy(cmp, cmpPos, dec, decPos, litCount); @@ -47,7 +47,7 @@ namespace Ryujinx.HLE.Loaders.Compression break; } - //Copy compressed chunck + //Copy compressed chunk int back = cmp[cmpPos++] << 0 | cmp[cmpPos++] << 8; diff --git a/Ryujinx.HLE/Loaders/Npdm/ServiceAccessControl.cs b/Ryujinx.HLE/Loaders/Npdm/ServiceAccessControl.cs index def780a256..03f62ff7c5 100644 --- a/Ryujinx.HLE/Loaders/Npdm/ServiceAccessControl.cs +++ b/Ryujinx.HLE/Loaders/Npdm/ServiceAccessControl.cs @@ -15,11 +15,11 @@ namespace Ryujinx.HLE.Loaders.Npdm BinaryReader reader = new BinaryReader(stream); - int byteReaded = 0; + int bytesRead = 0; Dictionary services = new Dictionary(); - while (byteReaded != size) + while (bytesRead != size) { byte controlByte = reader.ReadByte(); @@ -33,7 +33,7 @@ namespace Ryujinx.HLE.Loaders.Npdm services[Encoding.ASCII.GetString(reader.ReadBytes(length))] = registerAllowed; - byteReaded += length + 1; + bytesRead += length + 1; } Services = new ReadOnlyDictionary(services); diff --git a/Ryujinx.HLE/Utilities/StringUtils.cs b/Ryujinx.HLE/Utilities/StringUtils.cs index 055b8339ca..ee61c197cc 100644 --- a/Ryujinx.HLE/Utilities/StringUtils.cs +++ b/Ryujinx.HLE/Utilities/StringUtils.cs @@ -37,7 +37,7 @@ namespace Ryujinx.HLE.Utilities public static byte[] HexToBytes(string hexString) { - //Ignore last charactor if HexLength % 2 != 0. + //Ignore last character if HexLength % 2 != 0. int bytesInHex = hexString.Length / 2; byte[] output = new byte[bytesInHex]; diff --git a/Ryujinx.Profiler/InternalProfile.cs b/Ryujinx.Profiler/InternalProfile.cs index bd522b00bb..9fa128e223 100644 --- a/Ryujinx.Profiler/InternalProfile.cs +++ b/Ryujinx.Profiler/InternalProfile.cs @@ -80,7 +80,7 @@ namespace Ryujinx.Profiler Monitor.Exit(_timerQueueClearLock); } - // Only sleep if queue was sucessfully cleared + // Only sleep if queue was successfully cleared if (queueCleared) { Thread.Sleep(5); @@ -206,9 +206,9 @@ namespace Ryujinx.Profiler return (_timingFlagAverages, _timingFlagLastDelta); } - public void RegisterFlagReciever(Action reciever) + public void RegisterFlagReceiver(Action receiver) { - _timingFlagCallback = reciever; + _timingFlagCallback = receiver; } public void Dispose() diff --git a/Ryujinx.Profiler/Profile.cs b/Ryujinx.Profiler/Profile.cs index 7af73a5221..4dba6ea542 100644 --- a/Ryujinx.Profiler/Profile.cs +++ b/Ryujinx.Profiler/Profile.cs @@ -17,7 +17,7 @@ namespace Ryujinx.Profiler private static ProfilerSettings _settings; [Conditional("USE_PROFILING")] - public static void Initalize() + public static void Initialize() { var config = ProfilerConfiguration.Load(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "ProfilerConfig.jsonc")); @@ -70,11 +70,11 @@ namespace Ryujinx.Profiler } [Conditional("USE_PROFILING")] - public static void RegisterFlagReciever(Action reciever) + public static void RegisterFlagReceiver(Action receiver) { if (!ProfilingEnabled()) return; - _profileInstance.RegisterFlagReciever(reciever); + _profileInstance.RegisterFlagReceiver(receiver); } [Conditional("USE_PROFILING")] diff --git a/Ryujinx.Profiler/UI/ProfileWindow.cs b/Ryujinx.Profiler/UI/ProfileWindow.cs index c58b92355d..1db70bc791 100644 --- a/Ryujinx.Profiler/UI/ProfileWindow.cs +++ b/Ryujinx.Profiler/UI/ProfileWindow.cs @@ -98,7 +98,7 @@ namespace Ryujinx.Profiler.UI private readonly object _profileDataLock = new object(); public ProfileWindow() - // Graphigs mode enables 2xAA + // Graphics mode enables 2xAA : base(1280, 720, new GraphicsMode(new ColorFormat(8, 8, 8, 8), 1, 1, 2)) { Title = "Profiler"; @@ -108,7 +108,7 @@ namespace Ryujinx.Profiler.UI if (Profile.UpdateRate <= 0) { // Perform step regardless of flag type - Profile.RegisterFlagReciever((t) => + Profile.RegisterFlagReceiver((t) => { if (!_paused) { @@ -146,7 +146,7 @@ namespace Ryujinx.Profiler.UI { GL.ClearColor(Color.Black); _fontService = new FontService(); - _fontService.InitalizeTextures(); + _fontService.InitializeTextures(); _fontService.UpdateScreenHeight(Height); _buttons = new ProfileButton[(int)ButtonIndex.Count]; diff --git a/Ryujinx.Profiler/UI/ProfileWindowGraph.cs b/Ryujinx.Profiler/UI/ProfileWindowGraph.cs index 9d34be977f..6a4a52a998 100644 --- a/Ryujinx.Profiler/UI/ProfileWindowGraph.cs +++ b/Ryujinx.Profiler/UI/ProfileWindowGraph.cs @@ -7,8 +7,8 @@ namespace Ryujinx.Profiler.UI { public partial class ProfileWindow { - // Colour index equal to timing flag type as int - private Color[] _timingFlagColours = new[] + // Color index equal to timing flag type as int + private Color[] _timingFlagColors = new[] { new Color(150, 25, 25, 50), // FrameSwap = 0 new Color(25, 25, 150, 50), // SystemFrame = 1 @@ -62,7 +62,7 @@ namespace Ryujinx.Profiler.UI if (prevType != timingFlag.FlagType) { prevType = timingFlag.FlagType; - GL.Color4(_timingFlagColours[(int)prevType]); + GL.Color4(_timingFlagColors[(int)prevType]); } int x = (int)(graphRight - ((graphPositionTicks - timingFlag.Timestamp) / timeWidthTicks) * width); diff --git a/Ryujinx.Profiler/UI/SharpFontHelpers/FontService.cs b/Ryujinx.Profiler/UI/SharpFontHelpers/FontService.cs index e64c9da3df..0653877937 100644 --- a/Ryujinx.Profiler/UI/SharpFontHelpers/FontService.cs +++ b/Ryujinx.Profiler/UI/SharpFontHelpers/FontService.cs @@ -48,7 +48,7 @@ namespace Ryujinx.Profiler.UI.SharpFontHelpers throw new Exception($"Profiler exception. Required font Courier New or Arial not installed to {fontFolder}"); } - public void InitalizeTextures() + public void InitializeTextures() { // Create and init some vars uint[] rawCharacterSheet = new uint[SheetWidth * SheetHeight]; @@ -217,7 +217,7 @@ namespace Ryujinx.Profiler.UI.SharpFontHelpers lineOffset = 0; } - // Update lineoffset + // Update lineOffset if (lineOffset < height) { lineOffset = height + 1; diff --git a/Ryujinx.Tests.Unicorn/UnicornError.cs b/Ryujinx.Tests.Unicorn/UnicornError.cs index 85833ea008..7c8e2fdf83 100644 --- a/Ryujinx.Tests.Unicorn/UnicornError.cs +++ b/Ryujinx.Tests.Unicorn/UnicornError.cs @@ -17,7 +17,7 @@ namespace Ryujinx.Tests.Unicorn UC_ERR_WRITE_PROT, // Quit emulation due to UC_MEM_WRITE_PROT violation: uc_emu_start() UC_ERR_READ_PROT, // Quit emulation due to UC_MEM_READ_PROT violation: uc_emu_start() UC_ERR_FETCH_PROT, // Quit emulation due to UC_MEM_FETCH_PROT violation: uc_emu_start() - UC_ERR_ARG, // Inavalid argument provided to uc_xxx function (See specific function API) + UC_ERR_ARG, // Invalid argument provided to uc_xxx function (See specific function API) UC_ERR_READ_UNALIGNED, // Unaligned read UC_ERR_WRITE_UNALIGNED, // Unaligned write UC_ERR_FETCH_UNALIGNED, // Unaligned fetch diff --git a/Ryujinx/Config.jsonc b/Ryujinx/Config.jsonc index 01013ec401..4bbdd5a42f 100644 --- a/Ryujinx/Config.jsonc +++ b/Ryujinx/Config.jsonc @@ -4,19 +4,19 @@ // Dump shaders in local directory (e.g. `C:\ShaderDumps`) "graphics_shaders_dump_path": "", - // Enable print debug logs + // Enable printing debug logs "logging_enable_debug": false, - // Enable print stubbed calls logs + // Enable printing stubbed calls logs "logging_enable_stub": true, - // Enable print informations logs + // Enable printing information logs "logging_enable_info": true, - // Enable print warning logs + // Enable printing warning logs "logging_enable_warn": true, - // Enable print error logs + // Enable printing error logs "logging_enable_error": true, // Enable printing guest logs @@ -38,8 +38,8 @@ // Enable or disable Docked Mode "docked_mode": false, - // Enable or disable Discord Rich Presense - "enable_discord_intergration": true, + // Enable or disable Discord Rich Presence + "enable_discord_integration": true, // Enable or disable Game Vsync "enable_vsync": true, diff --git a/Ryujinx/Configuration.cs b/Ryujinx/Configuration.cs index 13e7c357c2..5c9e6aab75 100644 --- a/Ryujinx/Configuration.cs +++ b/Ryujinx/Configuration.cs @@ -83,9 +83,9 @@ namespace Ryujinx public bool DockedMode { get; private set; } /// - /// Enables or disables Discord Rich Presense + /// Enables or disables Discord Rich Presence /// - public bool EnableDiscordIntergration { get; private set; } + public bool EnableDiscordIntegration { get; private set; } /// /// Enables or disables Vertical Sync @@ -220,7 +220,7 @@ namespace Ryujinx } } - device.System.State.DiscordIntergrationEnabled = Instance.EnableDiscordIntergration; + device.System.State.DiscordIntegrationEnabled = Instance.EnableDiscordIntegration; device.EnableDeviceVsync = Instance.EnableVsync; @@ -254,8 +254,8 @@ namespace Ryujinx } } - device.Hid.InitilizePrimaryController(Instance.ControllerType); - device.Hid.InitilizeKeyboard(); + device.Hid.InitializePrimaryController(Instance.ControllerType); + device.Hid.InitializeKeyboard(); } private class ConfigurationEnumFormatter : IJsonFormatter diff --git a/Ryujinx/Program.cs b/Ryujinx/Program.cs index 6d8bbf39c5..ac6682903a 100644 --- a/Ryujinx/Program.cs +++ b/Ryujinx/Program.cs @@ -32,12 +32,12 @@ namespace Ryujinx Configuration.Load(Path.Combine(ApplicationDirectory, "Config.jsonc")); Configuration.Configure(device); - Profile.Initalize(); + Profile.Initialize(); AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException; AppDomain.CurrentDomain.ProcessExit += CurrentDomain_ProcessExit; - if (device.System.State.DiscordIntergrationEnabled == true) + if (device.System.State.DiscordIntegrationEnabled == true) { DiscordClient = new DiscordRpcClient("568815339807309834"); DiscordPresence = new RichPresence @@ -108,7 +108,7 @@ namespace Ryujinx Logger.PrintWarning(LogClass.Application, "Please specify the folder with the NSOs/IStorage or a NSO/NRO."); } - if (device.System.State.DiscordIntergrationEnabled == true) + if (device.System.State.DiscordIntegrationEnabled == true) { if (File.ReadAllLines(Path.Combine(ApplicationDirectory, "RPsupported.dat")).Contains(device.System.TitleID)) { diff --git a/Ryujinx/_schema.json b/Ryujinx/_schema.json index f83426b201..cf02e25fc9 100644 --- a/Ryujinx/_schema.json +++ b/Ryujinx/_schema.json @@ -393,11 +393,11 @@ false ] }, - "enable_discord_intergration": { - "$id": "#/properties/enable_discord_intergration", + "enable_discord_integration": { + "$id": "#/properties/enable_discord_integration", "type": "boolean", - "title": "Enable Discord Rich Presense", - "description": "Enable or disable Discord Rich Presense", + "title": "Enable Discord Rich Presence", + "description": "Enable or disable Discord Rich Presence", "default": true, "examples": [ true,