From 4e406b744c174a6b2c1b4fa65c0c9b5980b614ed Mon Sep 17 00:00:00 2001
From: Karri Kaksonen <karri@sipo.fi>
Date: Thu, 24 Feb 2022 08:50:36 +0200
Subject: [PATCH] Mark index 0 as TRANSPARENT. Let palette start from index 1

---
 include/lynx.h                    | 26 +++++++++++++-------------
 libsrc/lynx/tgi/lynx-160-102-16.s | 16 ++++++----------
 2 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/include/lynx.h b/include/lynx.h
index 4b0390a13..e5ff88a99 100644
--- a/include/lynx.h
+++ b/include/lynx.h
@@ -52,24 +52,25 @@
 
 
 /* Color defines */
-#define COLOR_BLACK             0x00
-#define COLOR_RED               0x01
-#define COLOR_PINK              0x02
-#define COLOR_LIGHTGREY         0x03
-#define COLOR_GREY              0x04
-#define COLOR_DARKGREY          0x05
-#define COLOR_BROWN             0x06
-#define COLOR_PEACH             0x07
-#define COLOR_YELLOW            0x08
-#define COLOR_LIGHTGREEN        0x09
-#define COLOR_GREEN             0x0A
-#define COLOR_DARKBROWN         0x0B
+#define COLOR_TRANSPARENT       0x00
+#define COLOR_BLACK             0x01
+#define COLOR_RED               0x02
+#define COLOR_PINK              0x03
+#define COLOR_LIGHTGREY         0x04
+#define COLOR_GREY              0x05
+#define COLOR_DARKGREY          0x06
+#define COLOR_BROWN             0x07
+#define COLOR_PEACH             0x08
+#define COLOR_YELLOW            0x09
+#define COLOR_LIGHTGREEN        0x0A
+#define COLOR_GREEN             0x0B
 #define COLOR_VIOLET            0x0C
 #define COLOR_BLUE              0x0D
 #define COLOR_LIGHTBLUE         0x0E
 #define COLOR_WHITE             0x0F
 
 /* TGI color defines (default palette) */
+#define TGI_COLOR_TRANSPARENT   COLOR_TRANSPARENT
 #define TGI_COLOR_BLACK         COLOR_BLACK
 #define TGI_COLOR_RED           COLOR_RED
 #define TGI_COLOR_PINK          COLOR_PINK
@@ -81,7 +82,6 @@
 #define TGI_COLOR_YELLOW        COLOR_YELLOW
 #define TGI_COLOR_LIGHTGREEN    COLOR_LIGHTGREEN
 #define TGI_COLOR_GREEN         COLOR_GREEN
-#define TGI_COLOR_DARKBROWN     COLOR_DARKBROWN
 #define TGI_COLOR_VIOLET        COLOR_VIOLET
 #define TGI_COLOR_BLUE          COLOR_BLUE
 #define TGI_COLOR_LIGHTBLUE     COLOR_LIGHTBLUE
diff --git a/libsrc/lynx/tgi/lynx-160-102-16.s b/libsrc/lynx/tgi/lynx-160-102-16.s
index 903d8f25e..c35b6a5aa 100644
--- a/libsrc/lynx/tgi/lynx-160-102-16.s
+++ b/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