atari5200: get rid of conio_colors table

[cc65] / libsrc / atari5200 / conioscreen.s

diff --git a/libsrc/atari5200/conioscreen.s b/libsrc/atari5200/conioscreen.s
index 660276675df3694fccec23604e09eb21543419dd..895e946ef06b9d12238b4680d9696a0bc4e26ed8 100644 (file)
--- a/libsrc/atari5200/conioscreen.s
+++ b/libsrc/atari5200/conioscreen.s
@@ -7,11 +7,17 @@
 SCREEN_BUF_SIZE =       20 * 24
 SCREEN_BUF      =       $4000 - SCREEN_BUF_SIZE
 
-                .export screen_setup_20x24
+                .export screen_setup
+                .export screen_width, screen_height
+                .export conio_color
 
-                .segment "INIT"
+screen_width    =       20
+screen_height   =       24
 
-screen_setup_20x24:
+
+                .segment "ONCE"
+
+screen_setup:
 
                 ; initialize SAVMSC
                 lda     #<SCREEN_BUF
@@ -37,16 +43,15 @@ clrscr:         sta     (SAVMSC),y
 
                 ; set default colors
 
-                lda     #40
+                lda     #GTIA_COLOR_WHITE
                 sta     COLOR0
-                lda     #202
+                lda     #GTIA_COLOR_LIGHTRED
                 sta     COLOR1
-                lda     #148
+                lda     #GTIA_COLOR_LIGHTGREEN
                 sta     COLOR2
-                lda     #70
+                lda     #GTIA_COLOR_BLACK
                 sta     COLOR3
-                lda     #0
-                sta     COLOR4
+                sta     COLOR4          ; background
 
                 ; set display list
 
@@ -57,8 +62,11 @@ clrscr:         sta     (SAVMSC),y
 
                 rts
 
+                .data
+
+conio_color:    .byte   0
 
-                .segment "RODATA"
+                .segment "DLIST"
 
 ; display list for 20x24 text mode