X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fsprite.c;fp=src%2Fsprite.c;h=c77ae90ad9f93be10daceb47a6d1d2b90db9fafa;hb=ae9f843ab11e545ceccad13fc840e23d1725750e;hp=e4253fb0f47778bb3813e6d12815ce1860701122;hpb=93446262d26f467e1f33972383c4996b4586c7de;p=gbajam21

diff --git a/src/sprite.c b/src/sprite.c
index e4253fb..c77ae90 100644
--- a/src/sprite.c
+++ b/src/sprite.c
@@ -15,22 +15,20 @@ void spr_setup(int xtiles, int ytiles, unsigned char *pixels, unsigned char *cma
 		for(j=0; j<8; j++) {
 			*dst++ = src[j * 64];
 			*dst++ = src[j * 64 + 1];
-			*dst++ = src[j * 64 + 2];
-			*dst++ = src[j * 64 + 3];
 		}
-		src += 4;
+		src += 2;
 
-		if((i & 15) == 15) {
+		if((i & 31) == 31) {
 			src += 7 * 64;	/* skip to the next row of tiles (skip 7 rows of pixels) */
 		}
 	}
 
 	cptr = (uint16_t*)CRAM_OBJ_ADDR;
-	for(i=0; i<256; i++) {
+	for(i=0; i<16; i++) {
 		unsigned char r = *cmap++ >> 3;
 		unsigned char g = *cmap++ >> 3;
 		unsigned char b = *cmap++ >> 3;
-		*cptr++ = r | (g << 5) | (b < 10);
+		*cptr++ = r | ((uint16_t)g << 5) | ((uint16_t)b << 10);
 	}
 }