Merge commit 'd7bf8a2214d7164c8da4457336bd97c9bde629ca'

constants/standart_colors.inc

@@ -1,6 +1,6 @@
-;	DEFINE	StandartZXpallete	1
+	DEFINE	StandartZXpallete	1
-;	DEFINE	_DebuG_SAVEpallete	1
+	DEFINE	_DebuG_SAVEpallete	1
-;	DEFINE	_DebuG_NumOfPallete	1
+	DEFINE	_DebuG_NumOfPallete	2
 ;-----------------------------------------------------------------------;
  MODULE COLORS
 	MODULE	CGA

constants/zx_colors.inc

@@ -38,8 +38,46 @@
 	DEFINE	ZX_BRIGHT_YELLOW	#e5, #ff, #93, #00
 	DEFINE	ZX_BRIGHT_WHITE		#6b, #f5, #fe, #00
 ;
+	ELSEIF number = 2
+;					; B    G    R    x
+	DEFINE	ZX_BLACK		#00, #00, #00, #00
+	DEFINE	ZX_BLUE			#79, #29, #34, #00
+	DEFINE	ZX_RED			#2E, #3B, #6C, #00
+	DEFINE	ZX_MAGENTA		#96, #4D, #7F, #00
+	DEFINE	ZX_GREEN		#3B, #83, #4F, #00
+	DEFINE	ZX_CYAN			#A4, #96, #63, #00
+	DEFINE	ZX_YELLOW		#59, #AF, #A1, #00
+	DEFINE	ZX_WHITE		#C1, #C1, #C1, #00
+	DEFINE	ZX_BRIGHT_BLACK		#35, #35, #35, #00
+	DEFINE	ZX_BRIGHT_BLUE		#B4, #5C, #6E, #00
+	DEFINE	ZX_BRIGHT_RED		#61, #70, #A7, #00
+	DEFINE	ZX_BRIGHT_MAGENTA	#BB, #8D, #AE, #00
+	DEFINE	ZX_BRIGHT_GREEN		#71, #BE, #89, #00
+	DEFINE	ZX_BRIGHT_CYAN		#E1, #D2, #9E, #00
+	DEFINE	ZX_BRIGHT_YELLOW	#97, #EB, #E1, #00
+	DEFINE	ZX_BRIGHT_WHITE		#FF, #FF, #FF, #00
+
 	ELSE
 	 ASSERT 1,"ERROR!!! No required color set!"
 	ENDIF
  ENDM
-;;;
+;;;
+/*
+#00, #00, #00, #00
+#79, #29, #34, #00
+#2E, #3B, #6C, #00
+#96, #4D, #7F, #00
+#3B, #83, #4F, #00
+#A4, #96, #63, #00
+#59, #AF, #A1, #00
+#C1, #C1, #C1, #00
+#35, #35, #35, #00
+#B4, #5C, #6E, #00
+#61, #70, #A7, #00
+#BB, #8D, #AE, #00
+#71, #BE, #89, #00
+#E1, #D2, #9E, #00
+#97, #EB, #E1, #00
+#FF, #FF, #FF, #00
+
+*/