From 891d487fdde57b2941122a6e97057e8e2be08ce6 Mon Sep 17 00:00:00 2001
From: zilmar <zilmar@pj64-emu.com>
Date: Mon, 7 Nov 2022 14:38:34 +1030
Subject: [PATCH] Core: rearrange MoveX86regPointerToX86regDisp8 parameters

---
 .../N64System/Recompiler/x86/x86RecompilerOps.cpp               | 2 +-
 Source/Project64-core/N64System/Recompiler/x86/x86ops.cpp       | 2 +-
 Source/Project64-core/N64System/Recompiler/x86/x86ops.h         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Source/Project64-core/N64System/Recompiler/x86/x86RecompilerOps.cpp b/Source/Project64-core/N64System/Recompiler/x86/x86RecompilerOps.cpp
index f28bf57fe..50cd24cf2 100644
--- a/Source/Project64-core/N64System/Recompiler/x86/x86RecompilerOps.cpp
+++ b/Source/Project64-core/N64System/Recompiler/x86/x86RecompilerOps.cpp
@@ -9887,7 +9887,7 @@ void CX86RecompilerOps::CompileLoadMemoryValue(CX86Ops::x86Reg AddressReg, CX86O
         if (ValueReg != CX86Ops::x86_Unknown)
         {
             m_Assembler.MoveX86regPointerToX86reg(ValueRegHi, AddressReg, TempReg);
-            m_Assembler.MoveX86regPointerToX86regDisp8(AddressReg, TempReg, ValueReg, 4);
+            m_Assembler.MoveX86regPointerToX86regDisp8(ValueReg, AddressReg, TempReg, 4);
         }
         else
         {
diff --git a/Source/Project64-core/N64System/Recompiler/x86/x86ops.cpp b/Source/Project64-core/N64System/Recompiler/x86/x86ops.cpp
index 59151a83e..4959ecfec 100644
--- a/Source/Project64-core/N64System/Recompiler/x86/x86ops.cpp
+++ b/Source/Project64-core/N64System/Recompiler/x86/x86ops.cpp
@@ -1370,7 +1370,7 @@ void CX86Ops::MoveX86regPointerToX86reg(x86Reg Reg, x86Reg AddrReg1, x86Reg Addr
     AddCode8(Param);
 }
 
-void CX86Ops::MoveX86regPointerToX86regDisp8(x86Reg AddrReg1, x86Reg AddrReg2, x86Reg Reg, uint8_t offset)
+void CX86Ops::MoveX86regPointerToX86regDisp8(x86Reg Reg, x86Reg AddrReg1, x86Reg AddrReg2, uint8_t offset)
 {
     uint8_t Param = 0;
 
diff --git a/Source/Project64-core/N64System/Recompiler/x86/x86ops.h b/Source/Project64-core/N64System/Recompiler/x86/x86ops.h
index ce6ed7ff9..3ab45b65b 100644
--- a/Source/Project64-core/N64System/Recompiler/x86/x86ops.h
+++ b/Source/Project64-core/N64System/Recompiler/x86/x86ops.h
@@ -149,7 +149,7 @@ public:
     void MoveX86regHalfToVariable(void * Variable, const char * VariableName, x86Reg Reg);
     void MoveX86regHalfToX86regPointer(x86Reg AddrReg1, x86Reg AddrReg2, x86Reg Reg);
     void MoveX86regPointerToX86reg(x86Reg Reg, x86Reg AddrReg1, x86Reg AddrReg2);
-    void MoveX86regPointerToX86regDisp8(x86Reg AddrReg1, x86Reg AddrReg2, x86Reg Reg, uint8_t offset);
+    void MoveX86regPointerToX86regDisp8(x86Reg Reg, x86Reg AddrReg1, x86Reg AddrReg2, uint8_t offset);
     void MoveX86regToMemory(x86Reg Reg, x86Reg AddrReg, uint32_t Disp);
     void MoveX86regToVariable(x86Reg Reg, void * Variable, const char * VariableName);
     void MoveX86RegToX86Reg(x86Reg Destination, x86Reg Source);