From f6beb3974d2efd5631d1e9067647b2f1a6cb8046 Mon Sep 17 00:00:00 2001
From: Michael Steil <mist64@mac.com>
Date: Fri, 17 Oct 2008 06:31:11 +0000
Subject: [PATCH] cleanup

---
 cbm1_patches.s | 4 ++--
 defines_cbm.s  | 2 +-
 defines_kbd.s  | 2 +-
 input.s        | 2 +-
 print.s        | 6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cbm1_patches.s b/cbm1_patches.s
index daf54c9..abf0564 100644
--- a/cbm1_patches.s
+++ b/cbm1_patches.s
@@ -36,10 +36,10 @@ LE1C9:
 PATCH6:
         bne     LE1D8
 LE1CE:
-        inc     $05
+        inc     POSX
         bne     LE1D8
         lda     $E2
-        sta     $05
+        sta     POSX
         bne     LE1CE
 LE1D8:
         rts
diff --git a/defines_cbm.s b/defines_cbm.s
index 55148d1..8d388a0 100644
--- a/defines_cbm.s
+++ b/defines_cbm.s
@@ -13,7 +13,7 @@ CONFIG_11 := 1
 CONFIG_11A := 1
 CONFIG_2 := 1
 CONFIG_2A := 1
-CBM2_KBD := 1 ; 2 weird instances
+CONFIG_NO_READ_Y_IS_ZERO_HACK := 1
 CONFIG_PEEK_SAVE_LINNUM := 1
 CONFIG_DATAFLAG := 1
 CONFIG_EASTER_EGG := 1
diff --git a/defines_kbd.s b/defines_kbd.s
index 76272ce..1a976c7 100644
--- a/defines_kbd.s
+++ b/defines_kbd.s
@@ -1,6 +1,6 @@
 CONFIG_SCRTCH_ORDER := 3
 CONFIG_SMALL := 1
-CBM2_KBD := 1 ; 2 weird instances
+CONFIG_NO_READ_Y_IS_ZERO_HACK := 1
 CONFIG_11 := 1
 CONFIG_11A := 1
 CONFIG_2 := 1
diff --git a/input.s b/input.s
index b34d4a2..ab43ce2 100644
--- a/input.s
+++ b/input.s
@@ -186,7 +186,7 @@ GETC:
 READ:
         ldx     DATPTR
         ldy     DATPTR+1
-.ifdef CBM2_KBD
+.ifdef CONFIG_NO_READ_Y_IS_ZERO_HACK
 ; AppleSoft II, too
         lda     #$98	; READ
         .byte   $2C
diff --git a/print.s b/print.s
index a403ed5..1bbc062 100644
--- a/print.s
+++ b/print.s
@@ -123,7 +123,7 @@ PRINTNULLS:
     .ifdef CONFIG_FILE
     ; Although there is no statement for it,
     ; CBM1 had NULL support and ignores
-    ; it when not targeting the screem,
+    ; it when not targeting the screen,
     ; CBM2 dropped it completely.
         lda     Z03
         bne     L29DD
@@ -292,7 +292,7 @@ OUTDO:
         bit     Z14
         bmi     L2A56
 .endif
-.ifndef CBM2_KBD
+.if .def(CONFIG_PRINT_CR) || .def(CBM1)
         pha
 .endif
 .ifdef CBM1
@@ -338,7 +338,7 @@ L2A4C:
         inc     POSX
 .endif
 L2A4E:
-.ifndef CBM2_KBD
+.if .def(CONFIG_PRINT_CR) || .def(CBM1)
         pla
 .endif
 .ifdef CONFIG_MONCOUT_DESTROYS_Y