atari5200: changes from discussions in #870

[cc65] / libsrc / atari5200 / conioscreen.s

diff --git a/libsrc/atari5200/conioscreen.s b/libsrc/atari5200/conioscreen.s
index a16557d2ac5f7966dcdae5a7a9a0a6d32b96443a..4e769b12683792c50e9aa2953e1b3f7cf6b79be4 100644 (file)
--- a/libsrc/atari5200/conioscreen.s
+++ b/libsrc/atari5200/conioscreen.s
@@ -7,7 +7,7 @@
 SCREEN_BUF_SIZE =       20 * 24
 SCREEN_BUF      =       $4000 - SCREEN_BUF_SIZE
 
-                .export screen_setup
+                .export initconio
                 .export screen_width, screen_height
                 .export conio_color
 
@@ -17,7 +17,8 @@ screen_height   =       24
 
                 .segment "ONCE"
 
-screen_setup:
+; initialize color registers, display list, and screen memory
+initconio:
 
                 ; initialize SAVMSC
                 lda     #<SCREEN_BUF
@@ -43,16 +44,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
 
@@ -63,9 +63,9 @@ clrscr:         sta     (SAVMSC),y
 
                 rts
 
-                .data
+                .bss
 
-conio_color:    .byte   0
+conio_color:    .res    1
 
                 .segment "DLIST"