From 91ea2eff4c753e7f208e25420f4c4e8b6d6cf77c Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Tue, 3 Nov 2020 18:29:35 -0500
Subject: [PATCH] Corrects MVN/MVP off-by-one and failure to store what was
 read.

---
 Processors/65816/Implementation/65816Implementation.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Processors/65816/Implementation/65816Implementation.hpp b/Processors/65816/Implementation/65816Implementation.hpp
index f35b97912..549baef4e 100644
--- a/Processors/65816/Implementation/65816Implementation.hpp
+++ b/Processors/65816/Implementation/65816Implementation.hpp
@@ -151,7 +151,7 @@ template <typename BusHandler, bool uses_ready_line> void Processor<BusHandler,
 				break;
 
 				case CycleStoreBlockY:
-					write(((instruction_buffer_.value & 0xff00) << 8) | x(), data_buffer_.any_byte());
+					write(((instruction_buffer_.value & 0xff00) << 8) | y(), data_buffer_.any_byte());
 				break;
 
 #undef increment_data_address
@@ -670,16 +670,16 @@ template <typename BusHandler, bool uses_ready_line> void Processor<BusHandler,
 							registers_.data_bank = (instruction_buffer_.value & 0xff) << 16;
 							--registers_.x.full;
 							--registers_.y.full;
-							--registers_.a.full;
 							if(registers_.a.full) registers_.pc -= 3;
+							--registers_.a.full;
 						break;
 
 						case MVN:
 							registers_.data_bank = (instruction_buffer_.value & 0xff) << 16;
 							++registers_.x.full;
 							++registers_.y.full;
-							--registers_.a.full;
 							if(registers_.a.full) registers_.pc -= 3;
+							--registers_.a.full;
 						break;
 
 						//