changed the sprites to 16 colors

[gbajam21] / src / sprite.c

diff --git a/src/sprite.c b/src/sprite.c
index e4253fb..c77ae90 100644 (file)
--- 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);
        }
 }