From 4d93741a54172754aa7ac4d0162343bc0121849d Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Fri, 26 Jan 2018 21:25:49 -0500
Subject: [PATCH] use PAL_COLOR_SIZE

---
 engine/color.asm  | 2 +-
 home/palettes.asm | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/engine/color.asm b/engine/color.asm
index 35a17f868..962ea7540 100644
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -497,7 +497,7 @@ LoadHLPaletteIntoDE:
 	push af
 	ld a, BANK(wOBPals1)
 	ld [rSVBK], a
-	ld c, PALETTE_SIZE
+	ld c, 1 palettes
 .loop
 	ld a, [hli]
 	ld [de], a
diff --git a/home/palettes.asm b/home/palettes.asm
index 8dafb23e7..e8996c160 100644
--- a/home/palettes.asm
+++ b/home/palettes.asm
@@ -253,7 +253,7 @@ CopyPals:: ; d50
 
 ; get pal color
 	ld a, b
-	and %11 ; color
+	maskbits 1 << PAL_COLOR_SIZE
 ; 2 bytes per color
 	add a
 	ld l, a
@@ -271,8 +271,9 @@ CopyPals:: ; d50
 	ld [hl], d
 	inc hl
 ; next pal color
+rept PAL_COLOR_SIZE
 	srl b
-	srl b
+endr
 ; source
 	pop de
 ; done pal?