From 33bb1a22ff0a9134593a59f6898875a6e39ae1c8 Mon Sep 17 00:00:00 2001 From: polluks Date: Wed, 2 Feb 2022 00:58:50 +0100 Subject: [PATCH] Removed the colour purple This commit may break compatibility. --- asminc/cx16.inc | 4 +--- include/apple2.h | 3 +-- include/atari.h | 6 ++---- include/c128.h | 6 ++---- include/c64.h | 4 +--- include/cbm264.h | 6 ++---- include/cbm510.h | 3 +-- include/cx16.h | 5 +---- include/geos.h | 2 -- include/lynx.h | 6 ++---- include/nes.h | 6 ++---- include/pce.h | 3 +-- include/vic20.h | 4 ++-- libsrc/nes/color.s | 3 +-- libsrc/nes/ppu.s | 2 +- 15 files changed, 20 insertions(+), 43 deletions(-) diff --git a/asminc/cx16.inc b/asminc/cx16.inc index 4d9ce89db..4e5971593 100644 --- a/asminc/cx16.inc +++ b/asminc/cx16.inc @@ -10,8 +10,7 @@ WHITE RED CYAN - VIOLET - PURPLE = VIOLET + PURPLE GREEN BLUE YELLOW @@ -84,7 +83,6 @@ LIGHTGREEN LIGHTBLUE GRAY3 PURPLE -VIOLET = PURPLE CURS_LEFT YELLOW CYAN diff --git a/include/apple2.h b/include/apple2.h index 41b45f58f..2735e948b 100644 --- a/include/apple2.h +++ b/include/apple2.h @@ -58,8 +58,7 @@ /* TGI color defines */ #define TGI_COLOR_BLACK 0x00 #define TGI_COLOR_GREEN 0x01 -#define TGI_COLOR_VIOLET 0x02 -#define TGI_COLOR_PURPLE TGI_COLOR_VIOLET +#define TGI_COLOR_PURPLE 0x02 #define TGI_COLOR_WHITE 0x03 #define TGI_COLOR_BLACK2 0x04 #define TGI_COLOR_ORANGE 0x05 diff --git a/include/atari.h b/include/atari.h index ab3ce81e6..781ee7a80 100644 --- a/include/atari.h +++ b/include/atari.h @@ -392,8 +392,7 @@ extern void atrx15p2_tgi[]; #define COLOR_WHITE GTIA_COLOR_WHITE #define COLOR_RED GTIA_COLOR_RED #define COLOR_CYAN GTIA_COLOR_CYAN -#define COLOR_VIOLET GTIA_COLOR_VIOLET -#define COLOR_PURPLE COLOR_VIOLET +#define COLOR_PURPLE GTIA_COLOR_VIOLET #define COLOR_GREEN GTIA_COLOR_GREEN #define COLOR_BLUE GTIA_COLOR_BLUE #define COLOR_YELLOW GTIA_COLOR_YELLOW @@ -411,8 +410,7 @@ extern void atrx15p2_tgi[]; #define TGI_COLOR_WHITE COLOR_WHITE #define TGI_COLOR_RED COLOR_RED #define TGI_COLOR_CYAN COLOR_CYAN -#define TGI_COLOR_VIOLET COLOR_VIOLET -#define TGI_COLOR_PURPLE TGI_COLOR_VIOLET +#define TGI_COLOR_PURPLE COLOR_PURPLE #define TGI_COLOR_GREEN COLOR_GREEN #define TGI_COLOR_BLUE COLOR_BLUE #define TGI_COLOR_YELLOW COLOR_YELLOW diff --git a/include/c128.h b/include/c128.h index 623e5f99d..ee1dce99e 100644 --- a/include/c128.h +++ b/include/c128.h @@ -60,8 +60,7 @@ #define COLOR_WHITE 0x01 #define COLOR_RED 0x02 #define COLOR_CYAN 0x03 -#define COLOR_VIOLET 0x04 -#define COLOR_PURPLE COLOR_VIOLET +#define COLOR_PURPLE 0x04 #define COLOR_GREEN 0x05 #define COLOR_BLUE 0x06 #define COLOR_YELLOW 0x07 @@ -79,8 +78,7 @@ #define TGI_COLOR_WHITE COLOR_WHITE #define TGI_COLOR_RED COLOR_RED #define TGI_COLOR_CYAN COLOR_CYAN -#define TGI_COLOR_VIOLET COLOR_VIOLET -#define TGI_COLOR_PURPLE TGI_COLOR_VIOLET +#define TGI_COLOR_PURPLE COLOR_PURPLE #define TGI_COLOR_GREEN COLOR_GREEN #define TGI_COLOR_BLUE COLOR_BLUE #define TGI_COLOR_YELLOW COLOR_YELLOW diff --git a/include/c64.h b/include/c64.h index afe47ece6..f501a4e7f 100644 --- a/include/c64.h +++ b/include/c64.h @@ -66,8 +66,7 @@ #define COLOR_WHITE 0x01 #define COLOR_RED 0x02 #define COLOR_CYAN 0x03 -#define COLOR_VIOLET 0x04 -#define COLOR_PURPLE COLOR_VIOLET +#define COLOR_PURPLE 0x04 #define COLOR_GREEN 0x05 #define COLOR_BLUE 0x06 #define COLOR_YELLOW 0x07 @@ -85,7 +84,6 @@ #define TGI_COLOR_WHITE COLOR_WHITE #define TGI_COLOR_RED COLOR_RED #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_BLUE COLOR_BLUE diff --git a/include/cbm264.h b/include/cbm264.h index a51ee79c5..4951df518 100644 --- a/include/cbm264.h +++ b/include/cbm264.h @@ -79,8 +79,7 @@ #define BCOLOR_WHITE 0x01 #define BCOLOR_RED 0x02 #define BCOLOR_CYAN 0x03 -#define BCOLOR_VIOLET 0x04 -#define BCOLOR_PURPLE BCOLOR_VIOLET +#define BCOLOR_PURPLE 0x04 #define BCOLOR_GREEN 0x05 #define BCOLOR_BLUE 0x06 #define BCOLOR_YELLOW 0x07 @@ -98,8 +97,7 @@ #define COLOR_WHITE (BCOLOR_WHITE | CATTR_LUMA7) #define COLOR_RED (BCOLOR_RED | CATTR_LUMA4) #define COLOR_CYAN (BCOLOR_CYAN | CATTR_LUMA7) -#define COLOR_VIOLET (BCOLOR_VIOLET | CATTR_LUMA7) -#define COLOR_PURPLE COLOR_VIOLET +#define COLOR_PURPLE (BCOLOR_VIOLET | CATTR_LUMA7) #define COLOR_GREEN (BCOLOR_GREEN | CATTR_LUMA7) #define COLOR_BLUE (BCOLOR_BLUE | CATTR_LUMA7) #define COLOR_YELLOW (BCOLOR_YELLOW | CATTR_LUMA7) diff --git a/include/cbm510.h b/include/cbm510.h index 3d6ccd209..20b334ed9 100644 --- a/include/cbm510.h +++ b/include/cbm510.h @@ -78,8 +78,7 @@ #define COLOR_WHITE 0x01 #define COLOR_RED 0x02 #define COLOR_CYAN 0x03 -#define COLOR_VIOLET 0x04 -#define COLOR_PURPLE COLOR_VIOLET +#define COLOR_PURPLE 0x04 #define COLOR_GREEN 0x05 #define COLOR_BLUE 0x06 #define COLOR_YELLOW 0x07 diff --git a/include/cx16.h b/include/cx16.h index 179021e84..4100da631 100644 --- a/include/cx16.h +++ b/include/cx16.h @@ -70,7 +70,6 @@ #define CH_LIGHTBLUE 0x9A #define CH_GRAY3 0x9B #define CH_PURPLE 0x9C -#define CH_VIOLET CH_PURPLE #define CH_YELLOW 0x9E #define CH_CYAN 0x9F #define CH_SHIFT_SPACE 0xA0 @@ -96,8 +95,7 @@ #define COLOR_WHITE 0x01 #define COLOR_RED 0x02 #define COLOR_CYAN 0x03 -#define COLOR_VIOLET 0x04 -#define COLOR_PURPLE COLOR_VIOLET +#define COLOR_PURPLE 0x04 #define COLOR_GREEN 0x05 #define COLOR_BLUE 0x06 #define COLOR_YELLOW 0x07 @@ -116,7 +114,6 @@ #define TGI_COLOR_WHITE COLOR_WHITE #define TGI_COLOR_RED COLOR_RED #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_BLUE COLOR_BLUE diff --git a/include/geos.h b/include/geos.h index 3f760b6ad..99b49777f 100644 --- a/include/geos.h +++ b/include/geos.h @@ -67,7 +67,6 @@ #define COLOR_WHITE WHITE #define COLOR_RED RED #define COLOR_CYAN CYAN -#define COLOR_VIOLET PURPLE #define COLOR_PURPLE PURPLE #define COLOR_GREEN GREEN #define COLOR_BLUE BLUE @@ -85,7 +84,6 @@ #define TGI_COLOR_WHITE COLOR_WHITE #define TGI_COLOR_RED COLOR_RED #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_BLUE COLOR_BLUE diff --git a/include/lynx.h b/include/lynx.h index cf8f32b59..6c7e13da9 100644 --- a/include/lynx.h +++ b/include/lynx.h @@ -64,8 +64,7 @@ #define COLOR_LIGHTGREEN 0x09 #define COLOR_GREEN 0x0A #define COLOR_DARKBROWN 0x0B -#define COLOR_VIOLET 0x0C -#define COLOR_PURPLE COLOR_VIOLET +#define COLOR_PURPLE 0x0C #define COLOR_BLUE 0x0D #define COLOR_LIGHTBLUE 0x0E #define COLOR_WHITE 0x0F @@ -84,8 +83,7 @@ #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_PURPLE TGI_COLOR_VIOLET +#define TGI_COLOR_PURPLE COLOR_PURPLE #define TGI_COLOR_BLUE COLOR_BLUE #define TGI_COLOR_LIGHTBLUE COLOR_LIGHTBLUE #define TGI_COLOR_WHITE COLOR_WHITE diff --git a/include/nes.h b/include/nes.h index 0724418b2..9537dd698 100644 --- a/include/nes.h +++ b/include/nes.h @@ -69,8 +69,7 @@ #define COLOR_WHITE 0x01 #define COLOR_RED 0x02 #define COLOR_CYAN 0x03 -#define COLOR_VIOLET 0x04 -#define COLOR_PURPLE COLOR_VIOLET +#define COLOR_PURPLE 0x04 #define COLOR_GREEN 0x05 #define COLOR_BLUE 0x06 #define COLOR_YELLOW 0x07 @@ -96,8 +95,7 @@ #define TGI_COLOR_LIGHTGREEN COLOR_LIGHTGREEN #define TGI_COLOR_GREEN COLOR_GREEN #define TGI_COLOR_DARKBROWN COLOR_ORANGE -#define TGI_COLOR_VIOLET COLOR_VIOLET -#define TGI_COLOR_PURPLE TGI_COLOR_VIOLET +#define TGI_COLOR_PURPLE COLOR_PURPLE #define TGI_COLOR_BLUE COLOR_BLUE #define TGI_COLOR_LIGHTBLUE COLOR_LIGHTBLUE #define TGI_COLOR_WHITE COLOR_WHITE diff --git a/include/pce.h b/include/pce.h index 8ab5b363f..826f85390 100644 --- a/include/pce.h +++ b/include/pce.h @@ -56,8 +56,7 @@ #define COLOR_WHITE 0x01 #define COLOR_RED 0x02 #define COLOR_CYAN 0x03 -#define COLOR_VIOLET 0x04 -#define COLOR_PURPLE COLOR_VIOLET +#define COLOR_PURPLE 0x04 #define COLOR_GREEN 0x05 #define COLOR_BLUE 0x06 #define COLOR_YELLOW 0x07 diff --git a/include/vic20.h b/include/vic20.h index d60c7e270..55b81f13f 100644 --- a/include/vic20.h +++ b/include/vic20.h @@ -62,7 +62,7 @@ #define COLOR_WHITE 0x01 #define COLOR_RED 0x02 #define COLOR_CYAN 0x03 -#define COLOR_VIOLET 0x04 +#define COLOR_PURPLE 0x04 #define COLOR_GREEN 0x05 #define COLOR_BLUE 0x06 #define COLOR_YELLOW 0x07 @@ -81,7 +81,7 @@ #define TGI_COLOR_WHITE COLOR_WHITE #define TGI_COLOR_RED COLOR_RED #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_BLUE COLOR_BLUE #define TGI_COLOR_YELLOW COLOR_YELLOW diff --git a/libsrc/nes/color.s b/libsrc/nes/color.s index bb91ff908..e3aef9a28 100644 --- a/libsrc/nes/color.s +++ b/libsrc/nes/color.s @@ -54,7 +54,7 @@ colors: .byte $0f ; 0 black .byte $3d ; 1 white .byte $04 ; 2 red .byte $3b ; 3 cyan - .byte $14 ; 4 violett + .byte $14 ; 4 violet .byte $1a ; 5 green .byte $01 ; 6 blue .byte $38 ; 7 yellow @@ -66,4 +66,3 @@ colors: .byte $0f ; 0 black .byte $2b ; d light green .byte $22 ; e light blue .byte $3d ; f light gray - diff --git a/libsrc/nes/ppu.s b/libsrc/nes/ppu.s index 07b6842f7..92e056fb4 100644 --- a/libsrc/nes/ppu.s +++ b/libsrc/nes/ppu.s @@ -137,7 +137,7 @@ paldata: .repeat 2 .byte $0f ; 0 black - .byte $14 ; 4 violett + .byte $14 ; 4 violet .byte $3b ; 3 cyan .byte $3d ; 1 white