From 2d6afe1013a36b7b30f3503fd59afdbdb214a3bb Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Sat, 28 Jan 2023 21:43:14 -0500
Subject: [PATCH] Reduce repetition, tidy slightly.

---
 Components/9918/Implementation/9918Base.hpp       | 8 +-------
 Components/9918/Implementation/YamahaCommands.hpp | 6 +++---
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/Components/9918/Implementation/9918Base.hpp b/Components/9918/Implementation/9918Base.hpp
index e718bd87f..7a75720c3 100644
--- a/Components/9918/Implementation/9918Base.hpp
+++ b/Components/9918/Implementation/9918Base.hpp
@@ -646,13 +646,7 @@ template <Personality personality> struct Base: public Storage<personality> {
 						ram_[address] = Storage<personality>::command_latch_;
 
 						Storage<personality>::command_->advance();
-
-						if(Storage<personality>::command_->done()) {
-							Storage<personality>::command_ = nullptr;
-							Storage<personality>::next_command_step_ = CommandStep::None;
-						} else {
-							Storage<personality>::update_command_step(access_column);
-						}
+						Storage<personality>::update_command_step(access_column);
 					} break;
 				}
 			}
diff --git a/Components/9918/Implementation/YamahaCommands.hpp b/Components/9918/Implementation/YamahaCommands.hpp
index 5c00f2155..55444fc36 100644
--- a/Components/9918/Implementation/YamahaCommands.hpp
+++ b/Components/9918/Implementation/YamahaCommands.hpp
@@ -196,11 +196,11 @@ struct LogicalMoveFromCPU: public Command {
 
 					if(!context.size.v[0]) {
 						cycles = 64;
-						++location.v[1];
-						--context.size.v[1];
-
 						context.size.v[0] = width_;
 						location.v[0] = start_x_;
+
+						++location.v[1];
+						--context.size.v[1];
 					}
 				break;
 			}