added 1 more color palette

This commit is contained in:
FeralChild64 authored and FeralChild64 committed 2021-01-26 00:03:07 +01:00
1 parent 8ef20c94b1
commit e1430a127b
3 files changed
+109 -17

No files matched your search

+1 -1
View File
@@ -77,7 +77,7 @@
; --- Screen editor ; --- Screen editor
;; #CONFIG# EDIT_STOPQUOTE YES ;; #CONFIG# EDIT_STOPQUOTE YES
;; #CONFIG# VIC_PALETTE 0 ; 0 = default; 1 = C65, 2 = Frodo, 3 = VICE, 4 = Colodore, 5 = Deekay ;; #CONFIG# VIC_PALETTE 0 ; 0 = default; 1 = C65, 2 = Frodo, 3 = VICE, 4 = Colodore, 5 = community, 6 = Deekay
; --- Software features ; --- Software features
+2 -1
View File
@@ -59,7 +59,7 @@ m65_colorset: ; entry point for BASIC; .A - palette, where bit 7 selects greysca
asl asl
php php
cmp #($06 * 2) cmp #($07 * 2)
bcs m65_colorset_error bcs m65_colorset_error
; Prepare pointer to palette ; Prepare pointer to palette
@@ -183,4 +183,5 @@ m65_colorset_presets:
!word m65_colorset_3 !word m65_colorset_3
!word m65_colorset_4 !word m65_colorset_4
!word m65_colorset_5 !word m65_colorset_5
!word m65_colorset_6
} }
+106 -15
View File
@@ -82,26 +82,45 @@
!set RGB_4_E = $6864FF ; light blue !set RGB_4_E = $6864FF ; light blue
!set RGB_4_F = $AEAEAE ; light gray !set RGB_4_F = $AEAEAE ; light gray
; #5 - a Deekay palette, values taken from VICE emulator ; #5 - a community palette, values taken from VICE emulator, based on https://p1x3l.net/36/c64-community-colors-theor/
; RRGGBB ; RRGGBB
!set RGB_5_0 = $000000 ; black !set RGB_5_0 = $000000 ; black
!set RGB_5_1 = $FFFFFF ; white !set RGB_5_1 = $FFFFFF ; white
!set RGB_5_2 = $882000 ; red !set RGB_5_2 = $AF2A29 ; red
!set RGB_5_3 = $68D0A8 ; cyan !set RGB_5_3 = $62D8CC ; cyan
!set RGB_5_4 = $A838A0 ; purple / magenta !set RGB_5_4 = $B03FB6 ; purple / magenta
!set RGB_5_5 = $50B818 ; green !set RGB_5_5 = $4AC64A ; green
!set RGB_5_6 = $181090 ; blue !set RGB_5_6 = $3739C4 ; blue
!set RGB_5_7 = $F0E858 ; yellow !set RGB_5_7 = $E4ED4E ; yellow
!set RGB_5_8 = $A04800 ; orange !set RGB_5_8 = $B6591C ; orange
!set RGB_5_9 = $472B1B ; brown !set RGB_5_9 = $683808 ; brown
!set RGB_5_A = $C87870 ; light red / pink !set RGB_5_A = $EA746C ; light red / pink
!set RGB_5_B = $484848 ; dark grey !set RGB_5_B = $4D4D4D ; dark grey
!set RGB_5_C = $808080 ; medium grey !set RGB_5_C = $848484 ; medium grey
!set RGB_5_D = $98FF98 ; light green !set RGB_5_D = $A6FA9E ; light green
!set RGB_5_E = $5090D0 ; light blue !set RGB_5_E = $707CE6 ; light blue
!set RGB_5_F = $B8B8B8 ; light gray !set RGB_5_F = $B6B6B5 ; light gray
; #6 - a Deekay palette, values taken from VICE emulator
; RRGGBB
!set RGB_6_0 = $000000 ; black
!set RGB_6_1 = $FFFFFF ; white
!set RGB_6_2 = $882000 ; red
!set RGB_6_3 = $68D0A8 ; cyan
!set RGB_6_4 = $A838A0 ; purple / magenta
!set RGB_6_5 = $50B818 ; green
!set RGB_6_6 = $181090 ; blue
!set RGB_6_7 = $F0E858 ; yellow
!set RGB_6_8 = $A04800 ; orange
!set RGB_6_9 = $472B1B ; brown
!set RGB_6_A = $C87870 ; light red / pink
!set RGB_6_B = $484848 ; dark grey
!set RGB_6_C = $808080 ; medium grey
!set RGB_6_D = $98FF98 ; light green
!set RGB_6_E = $5090D0 ; light blue
!set RGB_6_F = $B8B8B8 ; light gray
; Macros to convert colors to C65/M65 palette / greyscale palette (CCIR 601 conversion) ; Macros to convert colors to C65/M65 palette / greyscale palette (CCIR 601 conversion)
@@ -474,3 +493,75 @@ m65_colorset_5:
+GSCAL RGB_5_D +GSCAL RGB_5_D
+GSCAL RGB_5_E +GSCAL RGB_5_E
+GSCAL RGB_5_F +GSCAL RGB_5_F
; Set 6
m65_colorset_6:
+RGB_R RGB_6_0
+RGB_R RGB_6_1
+RGB_R RGB_6_2
+RGB_R RGB_6_3
+RGB_R RGB_6_4
+RGB_R RGB_6_5
+RGB_R RGB_6_6
+RGB_R RGB_6_7
+RGB_R RGB_6_8
+RGB_R RGB_6_9
+RGB_R RGB_6_A
+RGB_R RGB_6_B
+RGB_R RGB_6_C
+RGB_R RGB_6_D
+RGB_R RGB_6_E
+RGB_R RGB_6_F
+RGB_G RGB_6_0
+RGB_G RGB_6_1
+RGB_G RGB_6_2
+RGB_G RGB_6_3
+RGB_G RGB_6_4
+RGB_G RGB_6_5
+RGB_G RGB_6_6
+RGB_G RGB_6_7
+RGB_G RGB_6_8
+RGB_G RGB_6_9
+RGB_G RGB_6_A
+RGB_G RGB_6_B
+RGB_G RGB_6_C
+RGB_G RGB_6_D
+RGB_G RGB_6_E
+RGB_G RGB_6_F
+RGB_B RGB_6_0
+RGB_B RGB_6_1
+RGB_B RGB_6_2
+RGB_B RGB_6_3
+RGB_B RGB_6_4
+RGB_B RGB_6_5
+RGB_B RGB_6_6
+RGB_B RGB_6_7
+RGB_B RGB_6_8
+RGB_B RGB_6_9
+RGB_B RGB_6_A
+RGB_B RGB_6_B
+RGB_B RGB_6_C
+RGB_B RGB_6_D
+RGB_B RGB_6_E
+RGB_B RGB_6_F
+GSCAL RGB_6_0
+GSCAL RGB_6_1
+GSCAL RGB_6_2
+GSCAL RGB_6_3
+GSCAL RGB_6_4
+GSCAL RGB_6_5
+GSCAL RGB_6_6
+GSCAL RGB_6_7
+GSCAL RGB_6_8
+GSCAL RGB_6_9
+GSCAL RGB_6_A
+GSCAL RGB_6_B
+GSCAL RGB_6_C
+GSCAL RGB_6_D
+GSCAL RGB_6_E
+GSCAL RGB_6_F