cleanup

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

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

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

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

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