From d2cfe9ffc72f54d2576646394e05c963598461b8 Mon Sep 17 00:00:00 2001
From: Michael Steil <mist64@mac.com>
Date: Sun, 19 Oct 2008 06:51:22 +0000
Subject: [PATCH] cleanup

---
 cbm1_patches.s | 10 +++++-----
 float.s        | 14 +++++++-------
 init.s         | 47 ++++++++++++++++++++++++-----------------------
 3 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/cbm1_patches.s b/cbm1_patches.s
index abf0564..2d3ffee 100644
--- a/cbm1_patches.s
+++ b/cbm1_patches.s
@@ -4,7 +4,7 @@ PATCH1:
         clc
         jmp     CONTROL_C_TYPED
 PATCH2:
-        bit     $B4
+        bit     FAC+4
         bpl     LE1AA
         cmp     #$54
         bne     LE1AA
@@ -12,7 +12,7 @@ PATCH2:
 LE1AA:
         rts
 PATCH3:
-        bit     $B4
+        bit     FAC+4
         bmi     LE1B2
         jmp     LCE90
 LE1B2:
@@ -27,8 +27,8 @@ PATCH4:
         jmp     LE1D9
 PATCH5:
         bpl     LE1C9
-        lda     $8E
-        ldy     $8F
+        lda     Z8C
+        ldy     Z8C+1
         rts
 LE1C9:
         ldy     #$FF
@@ -44,7 +44,7 @@ LE1CE:
 LE1D8:
         rts
 LE1D9:
-        stx     $C9
+        stx     TXTPTR
         pla
         pla
         tya
diff --git a/float.s b/float.s
index 2856335..f070bff 100644
--- a/float.s
+++ b/float.s
@@ -33,29 +33,29 @@ FSUBT:
 ; ----------------------------------------------------------------------------
 .ifdef CONFIG_EASTER_EGG
 EASTER_EGG:
-        lda     $11
+        lda     LINNUM
         cmp     #<6502
         bne     L3628
-        lda     $12
+        lda     LINNUM+1
         sbc     #>6502
         bne     L3628
-        sta     $11
+        sta     LINNUM
         tay
         lda     #$80
-        sta     $12
+        sta     LINNUM+1
 LD758:
         ldx     #$0A
 LD75A:
         lda     MICROSOFT-1,x
         and     #$3F
-        sta     ($11),y
+        sta     (LINNUM),y
         iny
         bne     LD766
-        inc     $12
+        inc     LINNUM+1
 LD766:
         dex
         bne     LD75A
-        dec     $46
+        dec     FORPNT
         bne     LD758
         rts
 .endif
diff --git a/init.s b/init.s
index 01d60a0..3599706 100644
--- a/init.s
+++ b/init.s
@@ -131,11 +131,7 @@ L4098:
   .endif
         pha
         sta     Z14
-  .ifdef CBM2
-        inx
-        stx     $01FD
-        stx     $01FC
-  .else
+  .ifndef CBM2
     .ifndef MICROTAN
         lda     #$03
         sta     DSCLEN
@@ -146,10 +142,15 @@ L4098:
     .endif
         jsr     CRDO
   .endif
+  .ifdef CBM2
+        inx
+        stx     INPUTBUFFER-3
+        stx     INPUTBUFFER-4
+  .endif
   .ifdef APPLE
         lda     #$01
-        sta     $01FD
-        sta     $01FC
+        sta     INPUTBUFFER-3
+        sta     INPUTBUFFER-4
   .endif
         ldx     #TEMPST
         stx     TEMPPT
@@ -370,38 +371,38 @@ L4192:
 ; this unused string
 QT_WANT:
         .byte   "WANT SIN-COS-TAN-ATN"
-        .byte   $00
+        .byte   0
   .endif
 QT_WRITTEN_BY:
   .ifndef CONFIG_CBM_ALL
     .ifdef APPLE
 		asc80 "COPYRIGHT 1977 BY MICROSOFT CO"
-		.byte	$0D,$00
+		.byte	CR,0
     .else
-        .byte   $0D,$0A,$0C
+        .byte   CR,LF,$0C
       .ifndef CONFIG_11
         .byte   "WRITTEN BY RICHARD W. WEILAND."
       .else
         .byte   "WRITTEN BY WEILAND & GATES"
       .endif
-        .byte   $0D,$0A,$00
+        .byte   CR,LF,0
     .endif
 QT_MEMORY_SIZE:
         .byte   "MEMORY SIZE"
-        .byte   $00
+        .byte   0
 QT_TERMINAL_WIDTH:
         .byte   "TERMINAL WIDTH"
-        .byte   $00
+        .byte   0
   .endif
 QT_BYTES_FREE:
         .byte   " BYTES FREE"
   .ifdef CBM1
   .elseif .def(CBM2)
-        .byte   $0D,$00
+        .byte   CR,0
   .elseif .def(APPLE)
-        .byte   $00
+        .byte   0
   .else
-        .byte   $0D,$0A,$0D,$0A
+        .byte   CR,LF,CR,LF
   .endif
 QT_BASIC:
   .ifdef OSI
@@ -414,25 +415,25 @@ QT_BASIC:
         .byte   "MICROTAN BASIC"
   .endif
   .ifdef CBM1
-        .byte   $13
+        .byte   $13 ; HOME
         .byte   "*** COMMODORE BASIC ***"
-        .byte   $11,$11,$11,$00
+        .byte   $11,$11,$11,0 ; DOWN/DOWN/DOWN
   .endif
   .ifdef CBM2
         .byte   "### COMMODORE BASIC ###"
-        .byte   $0D,$0D,$00
+        .byte   CR,CR,0
   .endif
   .ifdef APPLE
-        .byte   $0A,$0D,$0A
+        .byte   LF,CR,LF
 		.byte	"APPLE BASIC V1.1"
   .endif
   .ifndef CONFIG_CBM_ALL
-        .byte   $0D,$0A
+        .byte   CR,LF
     .ifdef MICROTAN
-        .byte   "(C) 1980 MICROSOFT"            ; E1F2 28 43 29 20 31 39 38 30  (C) 1980
+        .byte   "(C) 1980 MICROSOFT"
     .else
         .byte   "COPYRIGHT 1977 BY MICROSOFT CO."
     .endif
-        .byte   $0D,$0A,$00
+        .byte   CR,LF,0
   .endif
 .endif /* KBD */