cleanup

rnd.s

@@ -127,8 +127,7 @@ GENERIC_RNDSEED:
   .else
     .ifdef CONFIG_11
         .byte   $80,$4F,$C7,$52,$58
-    .endif
-    .ifdef CBM1
+    .else
         .byte   $80,$4F,$C7,$52,$59
     .endif
   .endif

string.s

@@ -264,7 +264,7 @@ L3376:
         iny
         lda     (INDEX),y
 .ifdef CBM1
-        jsr     LE7F3
+        jsr     LE7F3 ; XXX patch, call into screen editor
 .else
   .ifdef CONFIG_11
         ldy     #$00
@@ -361,7 +361,7 @@ MOVE_HIGHEST_STRING_TO_TOP:
 .endif
         beq     L33FA
         lda     Z52
-.ifdef CBM1
+.ifndef CONFIG_10A
         sbc     #$03
 .else
         and     #$04

trig.s

@@ -115,19 +115,18 @@ POLY_SIN:
         .byte   $07,$FB,$F8,$87,$99,$68,$89,$01
         .byte   $87,$23,$35,$DF,$E1,$86,$A5,$5D
         .byte   $E7,$28,$83,$49,$0F,$DA,$A2
-  .ifdef CBM1
-; no easter egg text on CBM1
-  .elseif .def(CONFIG_2A)
+  .ifndef CONFIG_11
+; no easter egg text before BASIC 1.1
+  .elseif !.def(CONFIG_2A)
+; ASCII encoded easter egg
+MICROSOFT:
+        .byte   $A6,$D3,$C1,$C8,$D4,$C8,$D5,$C4
+        .byte   $CE,$CA
+  .else
 ; PET encoded easter egg text since CBM2
 MICROSOFT:
         .byte   $A1,$54,$46,$8F,$13,$8F,$52,$43
         .byte   $89,$CD
-  .else
-; ASCII encoded easter egg in between
-; also AppleSoft II
-MICROSOFT:
-        .byte   $A6,$D3,$C1,$C8,$D4,$C8,$D5,$C4
-        .byte   $CE,$CA
   .endif
 .endif