From b73e9fbb7d263d9a198be1878707bf33637082e3 Mon Sep 17 00:00:00 2001 From: FeralChild64 Date: Sun, 20 Oct 2019 10:26:17 +0200 Subject: [PATCH] first steps towards brand-specific color schemes --- CONFIG.md | 4 ++++ c64/,,config_generic.s | 2 +- c64/,,config_mega65.s | 2 +- c64/,,config_testing.s | 2 +- c64/,,config_ultimate64.s | 2 +- c64/kernal/init/e5a0.setup_vicii.s | 13 ++++++++++++- 6 files changed, 20 insertions(+), 5 deletions(-) diff --git a/CONFIG.md b/CONFIG.md index c5e80528..463a7307 100644 --- a/CONFIG.md +++ b/CONFIG.md @@ -161,6 +161,10 @@ Needs about 65 bytes of ROM space to handle both joysticks. ## Eye candy +### `CONFIG_COLORS_BRAND` + +Tries to adjust the color scheme to the selected brand. Some brands might not support this. + ### `CONFIG_BANNER_SIMPLE`, `CONFIG_BANNER_FANCY`, `CONFIG_BANNER_BRAND` Select startup banner - either a simple one, or with some colorful elements. `CONFIG_BANNER_BRAND` heavily depends on the selected brand, not all the brands support it. diff --git a/c64/,,config_generic.s b/c64/,,config_generic.s index 2978ce82..74605b8a 100644 --- a/c64/,,config_generic.s +++ b/c64/,,config_generic.s @@ -51,7 +51,6 @@ // Keyboard settings - // #define CONFIG_LEGACY_SCNKEY #define CONFIG_KEYBOARD_C128 #define CONFIG_KEYBOARD_C128_CAPS_LOCK @@ -64,6 +63,7 @@ // Eye candy +#define CONFIG_COLORS_BRAND // #define CONFIG_BANNER_SIMPLE #define CONFIG_BANNER_FANCY // #define CONFIG_BANNER_BRAND diff --git a/c64/,,config_mega65.s b/c64/,,config_mega65.s index d54e3185..b4d2fa59 100644 --- a/c64/,,config_mega65.s +++ b/c64/,,config_mega65.s @@ -53,7 +53,6 @@ // Keyboard settings - // #define CONFIG_LEGACY_SCNKEY // #define CONFIG_KEYBOARD_C128 // #define CONFIG_KEYBOARD_C128_CAPS_LOCK @@ -66,6 +65,7 @@ // Eye candy +#define CONFIG_COLORS_BRAND // #define CONFIG_BANNER_SIMPLE // #define CONFIG_BANNER_FANCY #define CONFIG_BANNER_BRAND diff --git a/c64/,,config_testing.s b/c64/,,config_testing.s index 438a494d..b6c84487 100644 --- a/c64/,,config_testing.s +++ b/c64/,,config_testing.s @@ -52,7 +52,6 @@ // Keyboard settings - #define CONFIG_LEGACY_SCNKEY // #define CONFIG_KEYBOARD_C128 // #define CONFIG_KEYBOARD_C128_CAPS_LOCK @@ -65,6 +64,7 @@ // Eye candy +// #define CONFIG_COLORS_BRAND // #define CONFIG_BANNER_SIMPLE #define CONFIG_BANNER_FANCY // #define CONFIG_BANNER_BRAND diff --git a/c64/,,config_ultimate64.s b/c64/,,config_ultimate64.s index 7d8a8ff5..4b99e84e 100644 --- a/c64/,,config_ultimate64.s +++ b/c64/,,config_ultimate64.s @@ -51,7 +51,6 @@ // Keyboard settings - // #define CONFIG_LEGACY_SCNKEY // #define CONFIG_KEYBOARD_C128 // #define CONFIG_KEYBOARD_C128_CAPS_LOCK @@ -64,6 +63,7 @@ // Eye candy +#define CONFIG_COLORS_BRAND // #define CONFIG_BANNER_SIMPLE #define CONFIG_BANNER_FANCY // #define CONFIG_BANNER_BRAND diff --git a/c64/kernal/init/e5a0.setup_vicii.s b/c64/kernal/init/e5a0.setup_vicii.s index c359bdf1..78ab30a9 100644 --- a/c64/kernal/init/e5a0.setup_vicii.s +++ b/c64/kernal/init/e5a0.setup_vicii.s @@ -44,12 +44,23 @@ setup_vicii: lda #$0F sta VIC_IRQ // clear all interrupts - // We use a different colour scheme of white text on all blue + // We use a different colour scheme of white text on all blue by default, + // but brand-specific color scheme can also be enabled + +#if CONFIG_COLORS_BRAND && CONFIG_BRAND_ULTIMATE_64 + + lda #$00 + sta VIC_EXTCOL + sta VIC_BGCOL0 + +#else lda #$06 sta VIC_EXTCOL sta VIC_BGCOL0 +#endif + // Setup default I/O devices jmp clrchn_reset