From 947627f58f37509150f653c81c82d742a4123cb6 Mon Sep 17 00:00:00 2001 From: Anatoliy Belyanskiy Date: Mon, 11 Sep 2023 02:09:07 +1000 Subject: [PATCH] ... --- constants/standart_colors.inc | 191 +++++++++++++++++++++++++++++++--- constants/zx_colors.inc | 45 ++++++++ 2 files changed, 219 insertions(+), 17 deletions(-) create mode 100644 constants/zx_colors.inc diff --git a/constants/standart_colors.inc b/constants/standart_colors.inc index 4528fe9..19435f7 100644 --- a/constants/standart_colors.inc +++ b/constants/standart_colors.inc @@ -1,3 +1,6 @@ +; DEFINE StandartZXpallete 1 +; DEFINE _DebuG_SAVEpallete 1 +; DEFINE _DebuG_NumOfPallete 1 ;-----------------------------------------------------------------------; MODULE COLORS IFDEF StandartCGApallete @@ -22,6 +25,8 @@ CGA: DB #FC, #FC, #FC, #00 ; 15 WHITE …‹›‰ ENDIF +; CGA +FLASH EQU #80 ; CGA INC: .BLACK EQU #00 ; —…›‰ @@ -59,8 +64,6 @@ PAPER: .YELLOW EQU 16*INC.YELLOW .WHITE EQU 16*INC.WHITE ; CGA -FLASH EQU #80 -; CGA BORDER: .BLACK EQU INC.BLACK .BLUE EQU INC.BLUE @@ -81,6 +84,9 @@ BORDER: ; 7 - CYAN color index #3F #3F/#10 = 3 ZX: +.BRIGHT EQU #40 +.FLASH EQU #80 +; .BLACK EQU #00 ; —…›‰ .BLUE EQU #01 ; ‘ˆˆ‰ .RED EQU #02 ; Š€‘›‰ @@ -91,21 +97,172 @@ ZX: .WHITE EQU #07 ; …‹›‰ ; IFDEF StandartZXpallete -; Š ĶĪëĐ æĒĨâ ĪŦï áŊĨŠâāãŽŪĒáŠŪĢŪ āĨĶĻŽ  ŊŪĒâŪāïĨâáï 8 ā § -; Ŋ ŦĻâā  ŊŪĒâŪāïĨâáï ĪŦï Š ĶĪŪĢŪ āĨĶĻŽ : -; Paper -; Ink -; Flash Paper -; Flash Ink -.PALETTE: ; B G R x - DB #00, #00, #00, #00 ; 0 BLACK —…›‰ - DB #C8, #00, #00, #19 ; 1 BLUE ‘ˆˆ‰ - DB #00, #00, #C8, #32 ; 2 RED Š€‘›‰ - DB #C8, #00, #C8, #4B ; 3 MAGENTA ““›‰ - DB #00, #C8, #00, #64 ; 4 GREEN ‡…‹…›‰ - DB #C8, #C8, #00, #7D ; 5 CYAN ƒŽ‹“Ž‰ - DB #00, #C8, #C8, #96 ; 6 YELLOW †…‹’›‰ - DB #C8, #C8, #C8, #AF ; 7 WHITE …‹›‰ + + MACRO _mZX_COLOR dup_num, blue, green, red, bw + DUP dup_num + DB blue, green, red, bw + EDUP + ENDM + +.PALETTE: + include 'zx_colors.inc' + _mSET_PALLET_NUMBER _DebuG_NumOfPallete + + IFDEF _DebuG_SAVEpallete + ORG 0 + OUTPUT 'Build/new_pall.bin' ENDIF +; Paper + DUP 2 + _mZX_COLOR 8, ZX_BLACK + _mZX_COLOR 8, ZX_BLUE + _mZX_COLOR 8, ZX_RED + _mZX_COLOR 8, ZX_MAGENTA + _mZX_COLOR 8, ZX_GREEN + _mZX_COLOR 8, ZX_CYAN + _mZX_COLOR 8, ZX_YELLOW + _mZX_COLOR 8, ZX_WHITE + _mZX_COLOR 8, ZX_BRIGHT_BLACK + _mZX_COLOR 8, ZX_BRIGHT_BLUE + _mZX_COLOR 8, ZX_BRIGHT_RED + _mZX_COLOR 8, ZX_BRIGHT_MAGENTA + _mZX_COLOR 8, ZX_BRIGHT_GREEN + _mZX_COLOR 8, ZX_BRIGHT_CYAN + _mZX_COLOR 8, ZX_BRIGHT_YELLOW + _mZX_COLOR 8, ZX_BRIGHT_WHITE + EDUP + +; Ink + DUP 2 + DUP 8 + _mZX_COLOR 1, ZX_BLACK + _mZX_COLOR 1, ZX_BLUE + _mZX_COLOR 1, ZX_RED + _mZX_COLOR 1, ZX_MAGENTA + _mZX_COLOR 1, ZX_GREEN + _mZX_COLOR 1, ZX_CYAN + _mZX_COLOR 1, ZX_YELLOW + _mZX_COLOR 1, ZX_WHITE + EDUP + ; + DUP 8 + _mZX_COLOR 1, ZX_BRIGHT_BLACK + _mZX_COLOR 1, ZX_BRIGHT_BLUE + _mZX_COLOR 1, ZX_BRIGHT_RED + _mZX_COLOR 1, ZX_BRIGHT_MAGENTA + _mZX_COLOR 1, ZX_BRIGHT_GREEN + _mZX_COLOR 1, ZX_BRIGHT_CYAN + _mZX_COLOR 1, ZX_BRIGHT_YELLOW + _mZX_COLOR 1, ZX_BRIGHT_WHITE + EDUP + EDUP + +; Flash Paper + _mZX_COLOR 8, ZX_BLACK + _mZX_COLOR 8, ZX_BLUE + _mZX_COLOR 8, ZX_RED + _mZX_COLOR 8, ZX_MAGENTA + _mZX_COLOR 8, ZX_GREEN + _mZX_COLOR 8, ZX_CYAN + _mZX_COLOR 8, ZX_YELLOW + _mZX_COLOR 8, ZX_WHITE + _mZX_COLOR 8, ZX_BRIGHT_BLACK + _mZX_COLOR 8, ZX_BRIGHT_BLUE + _mZX_COLOR 8, ZX_BRIGHT_RED + _mZX_COLOR 8, ZX_BRIGHT_MAGENTA + _mZX_COLOR 8, ZX_BRIGHT_GREEN + _mZX_COLOR 8, ZX_BRIGHT_CYAN + _mZX_COLOR 8, ZX_BRIGHT_YELLOW + _mZX_COLOR 8, ZX_BRIGHT_WHITE + ; + DUP 8 + _mZX_COLOR 1, ZX_BLACK + _mZX_COLOR 1, ZX_BLUE + _mZX_COLOR 1, ZX_RED + _mZX_COLOR 1, ZX_MAGENTA + _mZX_COLOR 1, ZX_GREEN + _mZX_COLOR 1, ZX_CYAN + _mZX_COLOR 1, ZX_YELLOW + _mZX_COLOR 1, ZX_WHITE + EDUP + ; + DUP 8 + _mZX_COLOR 1, ZX_BRIGHT_BLACK + _mZX_COLOR 1, ZX_BRIGHT_BLUE + _mZX_COLOR 1, ZX_BRIGHT_RED + _mZX_COLOR 1, ZX_BRIGHT_MAGENTA + _mZX_COLOR 1, ZX_BRIGHT_GREEN + _mZX_COLOR 1, ZX_BRIGHT_CYAN + _mZX_COLOR 1, ZX_BRIGHT_YELLOW + _mZX_COLOR 1, ZX_BRIGHT_WHITE + EDUP + ; + +; Flash Ink + DUP 8 + _mZX_COLOR 1, ZX_BLACK + _mZX_COLOR 1, ZX_BLUE + _mZX_COLOR 1, ZX_RED + _mZX_COLOR 1, ZX_MAGENTA + _mZX_COLOR 1, ZX_GREEN + _mZX_COLOR 1, ZX_CYAN + _mZX_COLOR 1, ZX_YELLOW + _mZX_COLOR 1, ZX_WHITE + EDUP + ; + DUP 8 + _mZX_COLOR 1, ZX_BRIGHT_BLACK + _mZX_COLOR 1, ZX_BRIGHT_BLUE + _mZX_COLOR 1, ZX_BRIGHT_RED + _mZX_COLOR 1, ZX_BRIGHT_MAGENTA + _mZX_COLOR 1, ZX_BRIGHT_GREEN + _mZX_COLOR 1, ZX_BRIGHT_CYAN + _mZX_COLOR 1, ZX_BRIGHT_YELLOW + _mZX_COLOR 1, ZX_BRIGHT_WHITE + EDUP + ; + _mZX_COLOR 8, ZX_BLACK + _mZX_COLOR 8, ZX_BLUE + _mZX_COLOR 8, ZX_RED + _mZX_COLOR 8, ZX_MAGENTA + _mZX_COLOR 8, ZX_GREEN + _mZX_COLOR 8, ZX_CYAN + _mZX_COLOR 8, ZX_YELLOW + _mZX_COLOR 8, ZX_WHITE + _mZX_COLOR 8, ZX_BRIGHT_BLACK + _mZX_COLOR 8, ZX_BRIGHT_BLUE + _mZX_COLOR 8, ZX_BRIGHT_RED + _mZX_COLOR 8, ZX_BRIGHT_MAGENTA + _mZX_COLOR 8, ZX_BRIGHT_GREEN + _mZX_COLOR 8, ZX_BRIGHT_CYAN + _mZX_COLOR 8, ZX_BRIGHT_YELLOW + _mZX_COLOR 8, ZX_BRIGHT_WHITE + ; + IFDEF _DebuG_SAVEpallete + OUTEND + ENDIF + + UNDEFINE ZX_BLACK + UNDEFINE ZX_BLUE + UNDEFINE ZX_RED + UNDEFINE ZX_MAGENTA + UNDEFINE ZX_GREEN + UNDEFINE ZX_CYAN + UNDEFINE ZX_YELLOW + UNDEFINE ZX_WHITE + UNDEFINE ZX_BRIGHT_BLACK + UNDEFINE ZX_BRIGHT_BLUE + UNDEFINE ZX_BRIGHT_RED + UNDEFINE ZX_BRIGHT_MAGENTA + UNDEFINE ZX_BRIGHT_GREEN + UNDEFINE ZX_BRIGHT_CYAN + UNDEFINE ZX_BRIGHT_YELLOW + UNDEFINE ZX_BRIGHT_WHITE + UNDEFINE StandartZXpallete + + IFDEF _DebuG_SAVEpallete + UNDEFINE _DebuG_SAVEpallete + ENDIF + ENDIF ENDMODULE ;-----------------------------------------------------------------------; \ No newline at end of file diff --git a/constants/zx_colors.inc b/constants/zx_colors.inc new file mode 100644 index 0000000..cb4563f --- /dev/null +++ b/constants/zx_colors.inc @@ -0,0 +1,45 @@ + MACRO _mSET_PALLET_NUMBER number + + IF number = 0 +; ; B G R x + DEFINE ZX_BLACK #00, #00, #00, #00 + DEFINE ZX_BLUE #C8, #00, #00, #19 + DEFINE ZX_RED #00, #00, #C8, #32 + DEFINE ZX_MAGENTA #C8, #00, #C8, #4B + DEFINE ZX_GREEN #00, #C8, #00, #64 + DEFINE ZX_CYAN #C8, #C8, #00, #7D + DEFINE ZX_YELLOW #00, #C8, #C8, #96 + DEFINE ZX_WHITE #C8, #C8, #C8, #AF + DEFINE ZX_BRIGHT_BLACK #00, #00, #00, #00 + DEFINE ZX_BRIGHT_BLUE #F0, #00, #00, #1E + DEFINE ZX_BRIGHT_RED #00, #00, #F0, #3C + DEFINE ZX_BRIGHT_MAGENTA #F0, #00, #F0, #5A + DEFINE ZX_BRIGHT_GREEN #00, #F0, #00, #78 + DEFINE ZX_BRIGHT_CYAN #F0, #F0, #00, #96 + DEFINE ZX_BRIGHT_YELLOW #00, #F0, #F0, #B4 + DEFINE ZX_BRIGHT_WHITE #F0, #F0, #F0, #D2 +; + ELSEIF number = 1 +; ; B G R x + DEFINE ZX_BLACK #25, #11, #11, #00 + DEFINE ZX_BLUE #c4, #c9, #b0, #00 + DEFINE ZX_RED #72, #22, #24, #00 + DEFINE ZX_MAGENTA #62, #20, #9f, #00 + DEFINE ZX_GREEN #bf, #3a, #96, #00 + DEFINE ZX_CYAN #4b, #7e, #2c, #00 + DEFINE ZX_YELLOW #c4, #98, #43, #00 + DEFINE ZX_WHITE #37, #85, #d2, #00 + DEFINE ZX_BRIGHT_BLACK #6d, #4b, #52, #00 + DEFINE ZX_BRIGHT_BLUE #f1, #fc, #ff, #00 + DEFINE ZX_BRIGHT_RED #be, #70, #34, #00 + DEFINE ZX_BRIGHT_MAGENTA #39, #5e, #ff, #00 + DEFINE ZX_BRIGHT_GREEN #f6, #69, #ff, #00 + DEFINE ZX_BRIGHT_CYAN #5f, #c3, #a0, #00 + DEFINE ZX_BRIGHT_YELLOW #e5, #ff, #93, #00 + DEFINE ZX_BRIGHT_WHITE #6b, #f5, #fe, #00 +; + ELSE + ASSERT 1,"ERROR!!! No required color set!" + ENDIF + ENDM +;;; \ No newline at end of file