cleanup

flow.s

@@ -82,15 +82,15 @@ NEWSTT:
         jsr     ISCNTC
         lda     TXTPTR
         ldy     TXTPTR+1
-.ifdef CBM2_KBD
+.if (INPUTBUFFER >=$0100) && .def(CONFIG_2)
         cpy     #>INPUTBUFFER
-.endif
-.ifdef CBM2
+  .ifdef CBM2
         nop
-.endif
-.ifdef CBM2_KBD
+  .endif
         beq     LC6D4
 .else
+; BUG on AppleSoft I,
+; fixed differently on AppleSoft II (ldx/inx)
         beq     L2683
 .endif
         sta     OLDTEXT
@@ -274,7 +274,10 @@ END2:
         bne     RET1
         lda     TXTPTR
         ldy     TXTPTR+1
-.ifdef CBM2_KBD
+.if (INPUTBUFFER >=$0100) && .def(CONFIG_2)
+; BUG on AppleSoft I
+; exists on AppleSoft II
+; TXTPTR+1 will always be > 0
         ldx     CURLIN+1
         inx
 .endif

init.s

@@ -175,7 +175,7 @@ L4098:
         tay
         bne     L40EE
 .endif
-.ifndef CBM2_KBD
+.ifndef CBM2
         lda     #<RAMSTART2
 .endif
         ldy     #>RAMSTART2
@@ -185,7 +185,7 @@ L4098:
 .endif
         sta     LINNUM
         sty     LINNUM+1
-.ifdef CBM2_KBD
+.ifdef CBM2
 		tay
 .else
         ldy     #$00

input.s

@@ -187,12 +187,13 @@ READ:
         ldx     DATPTR
         ldy     DATPTR+1
 .ifdef CBM2_KBD
-        lda     #$98 ; AppleSoft, too
+; AppleSoft II, too
+        lda     #$98	; READ
         .byte   $2C
 L2ABE:
-        lda     #$00
+        lda     #$00	; INPUT
 .else
-        .byte   $A9
+        .byte   $A9	; LDA #$98
 L2ABE:
         tya
 .endif