From 8590de5cf3515d7df156a5d470ad06bd68f97555 Mon Sep 17 00:00:00 2001 From: Christian Groessler Date: Wed, 10 Apr 2019 22:20:01 +0200 Subject: [PATCH] Revert "atari5200: fix COLOR defines' names" This reverts commit 87e653f47bd4bda4b2f27849148a163684073e0a. --- asminc/atari5200.inc | 8 ++++---- include/atari5200.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/asminc/atari5200.inc b/asminc/atari5200.inc index a09b44257..a17268de2 100644 --- a/asminc/atari5200.inc +++ b/asminc/atari5200.inc @@ -115,10 +115,10 @@ POKEY = $E800 ; POKEY area ; conio color defines ;------------------------------------------------------------------------- -COLOR_WHITE = 0 -COLOR_LIGHTRED = 1 -COLOR_LIGHTGREEN = 2 -COLOR_BLACK = 3 +COLOR_WHITE = 0 +COLOR_RED = 1 +COLOR_GREEN = 2 +COLOR_BLACK = 3 ;------------------------------------------------------------------------- ; Cartridge Parameters diff --git a/include/atari5200.h b/include/atari5200.h index e014c8ac4..d6c2561b2 100644 --- a/include/atari5200.h +++ b/include/atari5200.h @@ -78,10 +78,10 @@ extern void atr5200std_joy[]; /* referred to by joy_static_stddrv[] */ #define ANTIC (*(struct __antic*)0xD400) /* conio color defines */ -#define COLOR_WHITE 0x00 -#define COLOR_LIGHTRED 0x01 -#define COLOR_LIGHTGREEN 0x02 -#define COLOR_BLACK 0x03 +#define COLOR_WHITE 0x00 +#define COLOR_RED 0x01 +#define COLOR_GREEN 0x02 +#define COLOR_BLACK 0x03 /* The following #define will cause the matching function calls in conio.h ** to be overlaid by macros with the same names, saving the function call