6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2025-01-10 19:29:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1644 from polluks2/missing-purple

Browse Source 
Added more purple and removed the colour violet
This commit is contained in:
Bob Andrews 2022-05-17 15:54:59 +02:00 committed by GitHub
commit 93ee91fb4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 39 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asminc/cx16.inc
View File

@ -10,8 +10,7 @@
WHITE WHITE
RED RED
CYAN CYAN
VIOLET PURPLE
PURPLE = VIOLET
GREEN GREEN
BLUE BLUE
YELLOW YELLOW
@ -84,7 +83,6 @@ LIGHTGREEN
LIGHTBLUE LIGHTBLUE
GRAY3 GRAY3
PURPLE PURPLE
VIOLET = PURPLE
CURS_LEFT CURS_LEFT
YELLOW YELLOW
CYAN CYAN

2
include/apple2.h
View File

@ -58,7 +58,7 @@
/* TGI color defines */ /* TGI color defines */
#define TGI_COLOR_BLACK 0x00 #define TGI_COLOR_BLACK 0x00
#define TGI_COLOR_GREEN 0x01 #define TGI_COLOR_GREEN 0x01
#define TGI_COLOR_VIOLET 0x02 #define TGI_COLOR_PURPLE 0x02
#define TGI_COLOR_WHITE 0x03 #define TGI_COLOR_WHITE 0x03
#define TGI_COLOR_BLACK2 0x04 #define TGI_COLOR_BLACK2 0x04
#define TGI_COLOR_ORANGE 0x05 #define TGI_COLOR_ORANGE 0x05

4
include/atari.h
View File

@ -392,7 +392,7 @@ extern void atrx15p2_tgi[];
#define COLOR_WHITE GTIA_COLOR_WHITE #define COLOR_WHITE GTIA_COLOR_WHITE
#define COLOR_RED GTIA_COLOR_RED #define COLOR_RED GTIA_COLOR_RED
#define COLOR_CYAN GTIA_COLOR_CYAN #define COLOR_CYAN GTIA_COLOR_CYAN
#define COLOR_VIOLET GTIA_COLOR_VIOLET #define COLOR_PURPLE GTIA_COLOR_VIOLET
#define COLOR_GREEN GTIA_COLOR_GREEN #define COLOR_GREEN GTIA_COLOR_GREEN
#define COLOR_BLUE GTIA_COLOR_BLUE #define COLOR_BLUE GTIA_COLOR_BLUE
#define COLOR_YELLOW GTIA_COLOR_YELLOW #define COLOR_YELLOW GTIA_COLOR_YELLOW
@ -410,7 +410,7 @@ extern void atrx15p2_tgi[];
#define TGI_COLOR_WHITE COLOR_WHITE #define TGI_COLOR_WHITE COLOR_WHITE
#define TGI_COLOR_RED COLOR_RED #define TGI_COLOR_RED COLOR_RED
#define TGI_COLOR_CYAN COLOR_CYAN #define TGI_COLOR_CYAN COLOR_CYAN
#define TGI_COLOR_VIOLET COLOR_VIOLET #define TGI_COLOR_PURPLE COLOR_PURPLE
#define TGI_COLOR_GREEN COLOR_GREEN #define TGI_COLOR_GREEN COLOR_GREEN
#define TGI_COLOR_BLUE COLOR_BLUE #define TGI_COLOR_BLUE COLOR_BLUE
#define TGI_COLOR_YELLOW COLOR_YELLOW #define TGI_COLOR_YELLOW COLOR_YELLOW

4
include/c128.h
View File

@ -60,7 +60,7 @@
#define COLOR_WHITE 0x01 #define COLOR_WHITE 0x01
#define COLOR_RED 0x02 #define COLOR_RED 0x02
#define COLOR_CYAN 0x03 #define COLOR_CYAN 0x03
#define COLOR_VIOLET 0x04 #define COLOR_PURPLE 0x04
#define COLOR_GREEN 0x05 #define COLOR_GREEN 0x05
#define COLOR_BLUE 0x06 #define COLOR_BLUE 0x06
#define COLOR_YELLOW 0x07 #define COLOR_YELLOW 0x07
@ -78,7 +78,7 @@
#define TGI_COLOR_WHITE COLOR_WHITE #define TGI_COLOR_WHITE COLOR_WHITE
#define TGI_COLOR_RED COLOR_RED #define TGI_COLOR_RED COLOR_RED
#define TGI_COLOR_CYAN COLOR_CYAN #define TGI_COLOR_CYAN COLOR_CYAN
#define TGI_COLOR_VIOLET COLOR_VIOLET #define TGI_COLOR_PURPLE COLOR_PURPLE
#define TGI_COLOR_GREEN COLOR_GREEN #define TGI_COLOR_GREEN COLOR_GREEN
#define TGI_COLOR_BLUE COLOR_BLUE #define TGI_COLOR_BLUE COLOR_BLUE
#define TGI_COLOR_YELLOW COLOR_YELLOW #define TGI_COLOR_YELLOW COLOR_YELLOW

4
include/c64.h
View File

@ -66,8 +66,7 @@
#define COLOR_WHITE 0x01 #define COLOR_WHITE 0x01
#define COLOR_RED 0x02 #define COLOR_RED 0x02
#define COLOR_CYAN 0x03 #define COLOR_CYAN 0x03
#define COLOR_VIOLET 0x04 #define COLOR_PURPLE 0x04
#define COLOR_PURPLE COLOR_VIOLET
#define COLOR_GREEN 0x05 #define COLOR_GREEN 0x05
#define COLOR_BLUE 0x06 #define COLOR_BLUE 0x06
#define COLOR_YELLOW 0x07 #define COLOR_YELLOW 0x07
@ -85,7 +84,6 @@
#define TGI_COLOR_WHITE COLOR_WHITE #define TGI_COLOR_WHITE COLOR_WHITE
#define TGI_COLOR_RED COLOR_RED #define TGI_COLOR_RED COLOR_RED
#define TGI_COLOR_CYAN COLOR_CYAN #define TGI_COLOR_CYAN COLOR_CYAN
#define TGI_COLOR_VIOLET COLOR_VIOLET
#define TGI_COLOR_PURPLE COLOR_PURPLE #define TGI_COLOR_PURPLE COLOR_PURPLE
#define TGI_COLOR_GREEN COLOR_GREEN #define TGI_COLOR_GREEN COLOR_GREEN
#define TGI_COLOR_BLUE COLOR_BLUE #define TGI_COLOR_BLUE COLOR_BLUE

6
include/cbm264.h
View File

@ -79,8 +79,7 @@
#define BCOLOR_WHITE 0x01 #define BCOLOR_WHITE 0x01
#define BCOLOR_RED 0x02 #define BCOLOR_RED 0x02
#define BCOLOR_CYAN 0x03 #define BCOLOR_CYAN 0x03
#define BCOLOR_VIOLET 0x04 #define BCOLOR_PURPLE 0x04
#define BCOLOR_PURPLE BCOLOR_VIOLET
#define BCOLOR_GREEN 0x05 #define BCOLOR_GREEN 0x05
#define BCOLOR_BLUE 0x06 #define BCOLOR_BLUE 0x06
#define BCOLOR_YELLOW 0x07 #define BCOLOR_YELLOW 0x07
@ -98,8 +97,7 @@
#define COLOR_WHITE (BCOLOR_WHITE | CATTR_LUMA7) #define COLOR_WHITE (BCOLOR_WHITE | CATTR_LUMA7)
#define COLOR_RED (BCOLOR_RED | CATTR_LUMA4) #define COLOR_RED (BCOLOR_RED | CATTR_LUMA4)
#define COLOR_CYAN (BCOLOR_CYAN | CATTR_LUMA7) #define COLOR_CYAN (BCOLOR_CYAN | CATTR_LUMA7)
#define COLOR_VIOLET (BCOLOR_VIOLET | CATTR_LUMA7) #define COLOR_PURPLE (BCOLOR_VIOLET | CATTR_LUMA7)
#define COLOR_PURPLE COLOR_VIOLET
#define COLOR_GREEN (BCOLOR_GREEN | CATTR_LUMA7) #define COLOR_GREEN (BCOLOR_GREEN | CATTR_LUMA7)
#define COLOR_BLUE (BCOLOR_BLUE | CATTR_LUMA7) #define COLOR_BLUE (BCOLOR_BLUE | CATTR_LUMA7)
#define COLOR_YELLOW (BCOLOR_YELLOW | CATTR_LUMA7) #define COLOR_YELLOW (BCOLOR_YELLOW | CATTR_LUMA7)

3
include/cbm510.h
View File

@ -78,8 +78,7 @@
#define COLOR_WHITE 0x01 #define COLOR_WHITE 0x01
#define COLOR_RED 0x02 #define COLOR_RED 0x02
#define COLOR_CYAN 0x03 #define COLOR_CYAN 0x03
#define COLOR_VIOLET 0x04 #define COLOR_PURPLE 0x04
#define COLOR_PURPLE COLOR_VIOLET
#define COLOR_GREEN 0x05 #define COLOR_GREEN 0x05
#define COLOR_BLUE 0x06 #define COLOR_BLUE 0x06
#define COLOR_YELLOW 0x07 #define COLOR_YELLOW 0x07

5
include/cx16.h
View File

@ -70,7 +70,6 @@
#define CH_LIGHTBLUE 0x9A #define CH_LIGHTBLUE 0x9A
#define CH_GRAY3 0x9B #define CH_GRAY3 0x9B
#define CH_PURPLE 0x9C #define CH_PURPLE 0x9C
#define CH_VIOLET CH_PURPLE
#define CH_YELLOW 0x9E #define CH_YELLOW 0x9E
#define CH_CYAN 0x9F #define CH_CYAN 0x9F
#define CH_SHIFT_SPACE 0xA0 #define CH_SHIFT_SPACE 0xA0
@ -96,8 +95,7 @@
#define COLOR_WHITE 0x01 #define COLOR_WHITE 0x01
#define COLOR_RED 0x02 #define COLOR_RED 0x02
#define COLOR_CYAN 0x03 #define COLOR_CYAN 0x03
#define COLOR_VIOLET 0x04 #define COLOR_PURPLE 0x04
#define COLOR_PURPLE COLOR_VIOLET
#define COLOR_GREEN 0x05 #define COLOR_GREEN 0x05
#define COLOR_BLUE 0x06 #define COLOR_BLUE 0x06
#define COLOR_YELLOW 0x07 #define COLOR_YELLOW 0x07
@ -116,7 +114,6 @@
#define TGI_COLOR_WHITE COLOR_WHITE #define TGI_COLOR_WHITE COLOR_WHITE
#define TGI_COLOR_RED COLOR_RED #define TGI_COLOR_RED COLOR_RED
#define TGI_COLOR_CYAN COLOR_CYAN #define TGI_COLOR_CYAN COLOR_CYAN
#define TGI_COLOR_VIOLET COLOR_VIOLET
#define TGI_COLOR_PURPLE COLOR_PURPLE #define TGI_COLOR_PURPLE COLOR_PURPLE
#define TGI_COLOR_GREEN COLOR_GREEN #define TGI_COLOR_GREEN COLOR_GREEN
#define TGI_COLOR_BLUE COLOR_BLUE #define TGI_COLOR_BLUE COLOR_BLUE

2
include/geos.h
View File

@ -67,7 +67,6 @@
#define COLOR_WHITE WHITE #define COLOR_WHITE WHITE
#define COLOR_RED RED #define COLOR_RED RED
#define COLOR_CYAN CYAN #define COLOR_CYAN CYAN
#define COLOR_VIOLET PURPLE
#define COLOR_PURPLE PURPLE #define COLOR_PURPLE PURPLE
#define COLOR_GREEN GREEN #define COLOR_GREEN GREEN
#define COLOR_BLUE BLUE #define COLOR_BLUE BLUE
@ -85,7 +84,6 @@
#define TGI_COLOR_WHITE COLOR_WHITE #define TGI_COLOR_WHITE COLOR_WHITE
#define TGI_COLOR_RED COLOR_RED #define TGI_COLOR_RED COLOR_RED
#define TGI_COLOR_CYAN COLOR_CYAN #define TGI_COLOR_CYAN COLOR_CYAN
#define TGI_COLOR_VIOLET COLOR_VIOLET
#define TGI_COLOR_PURPLE COLOR_PURPLE #define TGI_COLOR_PURPLE COLOR_PURPLE
#define TGI_COLOR_GREEN COLOR_GREEN #define TGI_COLOR_GREEN COLOR_GREEN
#define TGI_COLOR_BLUE COLOR_BLUE #define TGI_COLOR_BLUE COLOR_BLUE

6
include/lynx.h
View File

@ -64,7 +64,7 @@
#define COLOR_YELLOW 0x09 #define COLOR_YELLOW 0x09
#define COLOR_LIGHTGREEN 0x0A #define COLOR_LIGHTGREEN 0x0A
#define COLOR_GREEN 0x0B #define COLOR_GREEN 0x0B
#define COLOR_VIOLET 0x0C #define COLOR_PURPLE 0x0C
#define COLOR_BLUE 0x0D #define COLOR_BLUE 0x0D
#define COLOR_LIGHTBLUE 0x0E #define COLOR_LIGHTBLUE 0x0E
#define COLOR_WHITE 0x0F #define COLOR_WHITE 0x0F
@ -78,11 +78,13 @@
#define TGI_COLOR_GREY COLOR_GREY #define TGI_COLOR_GREY COLOR_GREY
#define TGI_COLOR_DARKGREY COLOR_DARKGREY #define TGI_COLOR_DARKGREY COLOR_DARKGREY
#define TGI_COLOR_BROWN COLOR_BROWN #define TGI_COLOR_BROWN COLOR_BROWN
#define TGI_COLOR_ORANGE COLOR_BROWN
#define TGI_COLOR_PEACH COLOR_PEACH #define TGI_COLOR_PEACH COLOR_PEACH
#define TGI_COLOR_YELLOW COLOR_YELLOW #define TGI_COLOR_YELLOW COLOR_YELLOW
#define TGI_COLOR_LIGHTGREEN COLOR_LIGHTGREEN #define TGI_COLOR_LIGHTGREEN COLOR_LIGHTGREEN
#define TGI_COLOR_GREEN COLOR_GREEN #define TGI_COLOR_GREEN COLOR_GREEN
#define TGI_COLOR_VIOLET COLOR_VIOLET #define TGI_COLOR_DARKBROWN COLOR_DARKBROWN
#define TGI_COLOR_PURPLE COLOR_PURPLE
#define TGI_COLOR_BLUE COLOR_BLUE #define TGI_COLOR_BLUE COLOR_BLUE
#define TGI_COLOR_LIGHTBLUE COLOR_LIGHTBLUE #define TGI_COLOR_LIGHTBLUE COLOR_LIGHTBLUE
#define TGI_COLOR_WHITE COLOR_WHITE #define TGI_COLOR_WHITE COLOR_WHITE

20
include/nes.h
View File

@ -69,7 +69,7 @@
#define COLOR_WHITE 0x01 #define COLOR_WHITE 0x01
#define COLOR_RED 0x02 #define COLOR_RED 0x02
#define COLOR_CYAN 0x03 #define COLOR_CYAN 0x03
#define COLOR_VIOLET 0x04 #define COLOR_PURPLE 0x04
#define COLOR_GREEN 0x05 #define COLOR_GREEN 0x05
#define COLOR_BLUE 0x06 #define COLOR_BLUE 0x06
#define COLOR_YELLOW 0x07 #define COLOR_YELLOW 0x07
@ -82,6 +82,24 @@
#define COLOR_LIGHTBLUE 0x0E #define COLOR_LIGHTBLUE 0x0E
#define COLOR_GRAY3 0x0F #define COLOR_GRAY3 0x0F
/* TGI color defines (default palette) */
#define TGI_COLOR_BLACK COLOR_BLACK
#define TGI_COLOR_RED COLOR_RED
#define TGI_COLOR_PINK COLOR_LIGHTRED
#define TGI_COLOR_LIGHTGREY COLOR_GRAY1
#define TGI_COLOR_GREY COLOR_GRAY2
#define TGI_COLOR_DARKGREY COLOR_GRAY3
#define TGI_COLOR_BROWN COLOR_BROWN
#define TGI_COLOR_PEACH COLOR_CYAN
#define TGI_COLOR_YELLOW COLOR_YELLOW
#define TGI_COLOR_LIGHTGREEN COLOR_LIGHTGREEN
#define TGI_COLOR_GREEN COLOR_GREEN
#define TGI_COLOR_DARKBROWN COLOR_ORANGE
#define TGI_COLOR_PURPLE COLOR_PURPLE
#define TGI_COLOR_BLUE COLOR_BLUE
#define TGI_COLOR_LIGHTBLUE COLOR_LIGHTBLUE
#define TGI_COLOR_WHITE COLOR_WHITE
/* Masks for joy_read */ /* Masks for joy_read */
#define JOY_UP_MASK 0x10 #define JOY_UP_MASK 0x10
#define JOY_DOWN_MASK 0x20 #define JOY_DOWN_MASK 0x20

2
include/pce.h
View File

@ -56,7 +56,7 @@
#define COLOR_WHITE 0x01 #define COLOR_WHITE 0x01
#define COLOR_RED 0x02 #define COLOR_RED 0x02
#define COLOR_CYAN 0x03 #define COLOR_CYAN 0x03
#define COLOR_VIOLET 0x04 #define COLOR_PURPLE 0x04
#define COLOR_GREEN 0x05 #define COLOR_GREEN 0x05
#define COLOR_BLUE 0x06 #define COLOR_BLUE 0x06
#define COLOR_YELLOW 0x07 #define COLOR_YELLOW 0x07

4
include/vic20.h
View File

@ -62,7 +62,7 @@
#define COLOR_WHITE 0x01 #define COLOR_WHITE 0x01
#define COLOR_RED 0x02 #define COLOR_RED 0x02
#define COLOR_CYAN 0x03 #define COLOR_CYAN 0x03
#define COLOR_VIOLET 0x04 #define COLOR_PURPLE 0x04
#define COLOR_GREEN 0x05 #define COLOR_GREEN 0x05
#define COLOR_BLUE 0x06 #define COLOR_BLUE 0x06
#define COLOR_YELLOW 0x07 #define COLOR_YELLOW 0x07
@ -81,7 +81,7 @@
#define TGI_COLOR_WHITE COLOR_WHITE #define TGI_COLOR_WHITE COLOR_WHITE
#define TGI_COLOR_RED COLOR_RED #define TGI_COLOR_RED COLOR_RED
#define TGI_COLOR_CYAN COLOR_CYAN #define TGI_COLOR_CYAN COLOR_CYAN
#define TGI_COLOR_VIOLET COLOR_VIOLET #define TGI_COLOR_PURPLE COLOR_PURPLE
#define TGI_COLOR_GREEN COLOR_GREEN #define TGI_COLOR_GREEN COLOR_GREEN
#define TGI_COLOR_BLUE COLOR_BLUE #define TGI_COLOR_BLUE COLOR_BLUE
#define TGI_COLOR_YELLOW COLOR_YELLOW #define TGI_COLOR_YELLOW COLOR_YELLOW

3
libsrc/nes/color.s
View File

@ -54,7 +54,7 @@ colors: .byte $0f ; 0 black
.byte $3d ; 1 white .byte $3d ; 1 white
.byte $04 ; 2 red .byte $04 ; 2 red
.byte $3b ; 3 cyan .byte $3b ; 3 cyan
.byte $14 ; 4 violett .byte $14 ; 4 violet
.byte $1a ; 5 green .byte $1a ; 5 green
.byte $01 ; 6 blue .byte $01 ; 6 blue
.byte $38 ; 7 yellow .byte $38 ; 7 yellow
@ -66,4 +66,3 @@ colors: .byte $0f ; 0 black
.byte $2b ; d light green .byte $2b ; d light green
.byte $22 ; e light blue .byte $22 ; e light blue
.byte $3d ; f light gray .byte $3d ; f light gray

2
libsrc/nes/ppu.s
View File

@ -137,7 +137,7 @@
paldata: paldata:
.repeat 2 .repeat 2
.byte $0f ; 0 black .byte $0f ; 0 black
.byte $14 ; 4 violett .byte $14 ; 4 violet
.byte $3b ; 3 cyan .byte $3b ; 3 cyan
.byte $3d ; 1 white .byte $3d ; 1 white