Merge branch 'cc65:master' into atari7800

libsrc/lynx/tgi/lynx-160-102-16.s

@@ -113,7 +113,8 @@ text_bitmap:    .res    8*(1+20+1)+1
 
 .rodata
 
-DEFPALETTE:     .byte   >$011
+DEFPALETTE:     .byte   >$223
+                .byte   >$011
                 .byte   >$34d
                 .byte   >$9af
                 .byte   >$9b8
@@ -124,11 +125,11 @@ DEFPALETTE:     .byte   >$011
                 .byte   >$d5f
                 .byte   >$c53
                 .byte   >$822
-                .byte   >$223
                 .byte   >$484
                 .byte   >$8e5
                 .byte   >$cf5
                 .byte   >$fff
+                .byte   <$223
                 .byte   <$011
                 .byte   <$34d
                 .byte   <$9af
@@ -140,7 +141,6 @@ DEFPALETTE:     .byte   >$011
                 .byte   <$d5f
                 .byte   <$c53
                 .byte   <$822
-                .byte   <$223
                 .byte   <$484
                 .byte   <$8e5
                 .byte   <$cf5
@@ -162,6 +162,7 @@ INSTALL:
         lda     #1
         sta     TEXTMAGX
         sta     TEXTMAGY
+        sta     DRAWINDEX
         stz     BGINDEX
         stz     DRAWPAGE
         stz     SWAPREQUEST
@@ -418,7 +419,7 @@ cls_sprite:
         .word   0
         .word   $a000                           ; 160
         .word   $6600                           ; 102
-        .byte   $00
+        .byte   $11
 
 .code
 CLEAR:  lda     #<cls_sprite
@@ -844,11 +845,6 @@ OUTTEXT:
         lda     TEXTMAGY
         sta     text_sy+1
 
-        lda     BGINDEX
-        beq     @L1             ; Choose opaque black sprite?
-        lda     #$04            ; No, choose normal sprite
-@L1:
-        sta     text_sprite
         lda     DRAWINDEX       ; Set color
         asl
         asl
@@ -956,7 +952,7 @@ OUTTEXT:
 text_coll:
         .byte   0
 text_sprite:
-        .byte   $00,$90,$20
+        .byte   $04,$90,$20
         .addr   0, text_bitmap
 text_x:
         .word   0

libsrc/lynx/tgi_colors.s

@@ -4,5 +4,5 @@
 
         .include        "tgi-kernel.inc"
 
-        .export         tgi_color_black:zp = $00
+        .export         tgi_color_black:zp = $01
         .export         tgi_color_white:zp = $0F