From 6eace2a3eff78fe7222830d600bc8584f0dd7530 Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Fri, 27 Sep 2024 21:27:56 -0400
Subject: [PATCH] Improve address counting.

---
 Components/6845/CRTC6845.hpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Components/6845/CRTC6845.hpp b/Components/6845/CRTC6845.hpp
index 5c3e381f2..88365d336 100644
--- a/Components/6845/CRTC6845.hpp
+++ b/Components/6845/CRTC6845.hpp
@@ -221,6 +221,8 @@ template <class BusHandlerT, Personality personality, CursorType cursor_type> cl
 						extra_scanline_
 					);
 
+					// TODO: eof_latched_
+
 				//
 				// Horizontal.
 				//
@@ -272,7 +274,7 @@ template <class BusHandlerT, Personality personality, CursorType cursor_type> cl
 					if(new_frame) {
 						next_row_address_ = 0;
 					} else if(line_total_hit && character_total_hit) {
-						next_row_address_ = bus_state_.row_address + 1;
+						next_row_address_ = (bus_state_.row_address + 1) & 31;
 					} else {
 						next_row_address_ = bus_state_.row_address;
 					}
@@ -308,9 +310,9 @@ template <class BusHandlerT, Personality personality, CursorType cursor_type> cl
 					if(new_frame) {
 						bus_state_.refresh_address = layout_.start_address;
 					} else if(character_total_hit) {
-						layout_.start_address = line_address_;
+						bus_state_.refresh_address = line_address_;
 					} else {
-						layout_.start_address = (layout_.start_address + 1) & RefreshMask;
+						bus_state_.refresh_address = (bus_state_.refresh_address + 1) & RefreshMask;
 					}
 			}
 		}