X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fgba%2Fsprite.c;h=e2849d79344f77e53b9d49208bf129955bc39a59;hb=09ff9fd9a87d495d8c2d55203af89d0f651b5d3a;hp=c77ae90ad9f93be10daceb47a6d1d2b90db9fafa;hpb=097d03fa2406fca819b27b698ffb1cfc8ac445c2;p=gbajam22 diff --git a/src/gba/sprite.c b/src/gba/sprite.c index c77ae90..e2849d7 100644 --- a/src/gba/sprite.c +++ b/src/gba/sprite.c @@ -15,16 +15,18 @@ 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 += 2; + src += 4; - if((i & 31) == 31) { + if((i & 15) == 15) { 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<16; i++) { + for(i=0; i<256; i++) { unsigned char r = *cmap++ >> 3; unsigned char g = *cmap++ >> 3; unsigned char b = *cmap++ >> 3;