From 72a90ba91c8b8ee07859fc25f6b536a5f5afaaad Mon Sep 17 00:00:00 2001 From: Lior Halphon Date: Mon, 4 May 2020 02:17:03 +0300 Subject: [PATCH] Hacky color blending --- BootROMs/cgb_boot.asm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/BootROMs/cgb_boot.asm b/BootROMs/cgb_boot.asm index 9408788..cbbcf96 100644 --- a/BootROMs/cgb_boot.asm +++ b/BootROMs/cgb_boot.asm @@ -1093,12 +1093,11 @@ GetInputPaletteIndex: ; Slide into change Animation Palette ChangeAnimationPalette: - push af push hl push bc push de ld hl, KeyCombinationPalettes - 1 ; Input palettes are 1-based, 0 means nothing down - ld c ,a + ld c, a ld b, 0 add hl, bc ld a, [hl] @@ -1149,6 +1148,7 @@ ChangeAnimationPalette: .isNotWhite ld a, [hli] ldh [BgPalettes + 7 * 8 + 6], a ; Fourth color, 7th palette + ldh [BgPalettes + 7 * 8 + 2], a ; Second color, half, 7th palette; rough color mixing ld a, [hli] ldh [BgPalettes + 7 * 8 + 7], a ; Fourth color, 7th palette ld a, [hli] @@ -1165,7 +1165,6 @@ ChangeAnimationPalette: pop de pop bc pop hl - pop af ret ReplaceColorInAllPalettes: