diff --git a/ChocolArm64/Instruction/AInstEmitFlow.cs b/ChocolArm64/Instruction/AInstEmitFlow.cs index 975d467226..8a79528d81 100644 --- a/ChocolArm64/Instruction/AInstEmitFlow.cs +++ b/ChocolArm64/Instruction/AInstEmitFlow.cs @@ -36,7 +36,7 @@ namespace ChocolArm64.Instruction AOpCodeBImmAl op = (AOpCodeBImmAl)context.CurrOp; context.EmitLdc_I(op.Position + 4); - context.EmitStint(AThreadState.LRIndex); + context.EmitStint(AThreadState.LrIndex); context.EmitStoreState(); if (context.TryOptEmitSubroutineCall()) @@ -73,7 +73,7 @@ namespace ChocolArm64.Instruction AOpCodeBReg op = (AOpCodeBReg)context.CurrOp; context.EmitLdc_I(op.Position + 4); - context.EmitStint(AThreadState.LRIndex); + context.EmitStint(AThreadState.LrIndex); context.EmitStoreState(); context.EmitLdintzr(op.Rn); @@ -106,7 +106,7 @@ namespace ChocolArm64.Instruction public static void Ret(AilEmitterCtx context) { context.EmitStoreState(); - context.EmitLdint(AThreadState.LRIndex); + context.EmitLdint(AThreadState.LrIndex); context.Emit(OpCodes.Ret); } diff --git a/ChocolArm64/State/AThreadState.cs b/ChocolArm64/State/AThreadState.cs index b02a4dd02b..e220fba7f0 100644 --- a/ChocolArm64/State/AThreadState.cs +++ b/ChocolArm64/State/AThreadState.cs @@ -8,7 +8,7 @@ namespace ChocolArm64.State { public class AThreadState { - internal const int LRIndex = 30; + internal const int LrIndex = 30; internal const int ZrIndex = 31; internal const int ErgSizeLog2 = 4; diff --git a/Ryujinx/Ui/GLScreen.cs b/Ryujinx/Ui/GLScreen.cs index 4ab7efd12b..a654d15033 100644 --- a/Ryujinx/Ui/GLScreen.cs +++ b/Ryujinx/Ui/GLScreen.cs @@ -209,13 +209,13 @@ namespace Ryujinx int scrnMouseX = mouse.X - startX; int scrnMouseY = mouse.Y - startY; - int mx = (scrnMouseX * TouchScreenWidth) / scrnWidth; - int my = (scrnMouseY * TouchScreenHeight) / scrnHeight; + int mX = (scrnMouseX * TouchScreenWidth) / scrnWidth; + int mY = (scrnMouseY * TouchScreenHeight) / scrnHeight; HidTouchPoint currentPoint = new HidTouchPoint { - X = mx, - Y = my, + X = mX, + Y = mY, //Placeholder values till more data is acquired DiameterX = 10,