From 1b2ac595d714682f837b0ebd7e59b67528548a66 Mon Sep 17 00:00:00 2001
From: Kelvin Sherlock <ksherlock@gmail.com>
Date: Thu, 23 Sep 2021 17:16:10 -0400
Subject: [PATCH] fixes

---
 vt100.csi.S    |  2 +-
 vt100.main.S   |  7 ++++---
 vt100.screen.S | 12 ++++--------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/vt100.csi.S b/vt100.csi.S
index 6271adb..1f85572 100644
--- a/vt100.csi.S
+++ b/vt100.csi.S
@@ -397,7 +397,7 @@ mode_DECOM
 	stz y
 	cpy #0
 	beq :rts
-	lda #DECTM
+	lda DECTM
 	sta y
 
 	phy
diff --git a/vt100.main.S b/vt100.main.S
index cff7f83..9a3fb31 100644
--- a/vt100.main.S
+++ b/vt100.main.S
@@ -68,12 +68,13 @@ init
 	lda #$01
 	sta cursor_base+2
 
+	lda #"  " ; 16-bit
+	sta erase_char
+
 	sep #$30
 
 	lda #"_"
 	sta cursor_char
-	lda #" "
-	sta erase_char
 
 
 	lda #23
@@ -241,7 +242,7 @@ ctrl_0c ; form feed.
 
 :lf
 	lda y
-	cmp #DECBM
+	cmp DECBM
 	bne :simple
 
 *	lda #" " ; needs to factor in reverse video
diff --git a/vt100.screen.S b/vt100.screen.S
index 7201027..1b91168 100644
--- a/vt100.screen.S
+++ b/vt100.screen.S
@@ -315,14 +315,12 @@ scroll_up ent
 
 * mvn 1,1 first so mvn 0,0 will restore b
 :cp	mac
-	lda #$40
-	lda #40
+	lda #40-1
 	ldx #]1
 	ldy #]2
 	mvn $010000,$010000
 
-	lda #$40
-	lda #40
+	lda #40-1
 	ldx #]1
 	ldy #]2
 	mvn $000000,$000000
@@ -409,14 +407,12 @@ scroll_down ent
 
 
 :cp	mac
-	lda #$40
-	lda #40
+	lda #40-1
 	ldx #]1
 	ldy #]2
 	mvn $010000,$010000
 
-	lda #$40
-	lda #40
+	lda #40-1
 	ldx #]1
 	ldy #]2
 	mvn $000000,$000000