From ed2d4ebb0c89926c3b35a28d5f292bfda822b1f9 Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Sat, 15 Apr 2023 23:30:30 -0400
Subject: [PATCH] Fix test (and commentary) for shortened emulated branches.

---
 Processors/65816/Implementation/65816Implementation.hpp | 2 +-
 Processors/65816/Implementation/65816Storage.cpp        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Processors/65816/Implementation/65816Implementation.hpp b/Processors/65816/Implementation/65816Implementation.hpp
index c05ad9314..f4575f337 100644
--- a/Processors/65816/Implementation/65816Implementation.hpp
+++ b/Processors/65816/Implementation/65816Implementation.hpp
@@ -856,7 +856,7 @@ template <typename BusHandler, bool uses_ready_line> void Processor<BusHandler,
 																							\
 		if(																					\
 			!registers_.emulation_flag ||													\
-			(registers_.pc & 0xff00) == (instruction_buffer_.value & 0xff00)				\
+			(registers_.pc & 0xff00) == (data_buffer_.value & 0xff00)						\
 		) {																					\
 			++next_op_;																		\
 		}																					\
diff --git a/Processors/65816/Implementation/65816Storage.cpp b/Processors/65816/Implementation/65816Storage.cpp
index 5249be667..96aeb08ae 100644
--- a/Processors/65816/Implementation/65816Storage.cpp
+++ b/Processors/65816/Implementation/65816Storage.cpp
@@ -600,9 +600,9 @@ struct CPU::WDC65816::ProcessorStorageConstructor {
 	static void relative(AccessType, bool, const std::function<void(MicroOp)> &target) {
 		target(CycleFetchIncrementPC);		// Offset.
 
-		target(OperationPerform);			// The branch instructions will all skip one or three
+		target(OperationPerform);			// The branch instructions will skip zero, one or three
 											// of the next cycles, depending on the effect of
-											// the jump. It'll also calculate the correct target
+											// the jump. They'll also calculate the correct target
 											// address, placing it into the data buffer.
 
 		target(CycleFetchPreviousPCThrowaway);	// IO.