- pngdump tool overlay multiple images (combine spritesheets)

[gba_blender] / src / sprites.c

diff --git a/src/sprites.c b/src/sprites.c
index 91471d7..8cd5b2c 100644 (file)
--- a/src/sprites.c
+++ b/src/sprites.c
@@ -32,7 +32,7 @@ void init_sprites(void)
        /* copy from cartridge to OBJ RAM */
        dst = (uint16_t*)VRAM_LFB_OBJ_ADDR;
        src = (uint16_t*)sprites_pixels;
-       for(i=0; i<256; i++) {  /* 256 tiles */
+       for(i=0; i<320; i++) {  /* 320 tiles */
                for(j=0; j<8; j++) {
                        *dst++ = src[j * 64];
                        *dst++ = src[j * 64 + 1];
@@ -46,9 +46,9 @@ void init_sprites(void)
        }
 
 
-       /* setup OBJ colormap 0 */
+       /* setup OBJ colormaps */
        cptr = (uint16_t*)CRAM_OBJ_ADDR;
-       for(i=0; i<16; i++) {
+       for(i=0; i<80; i++) {   /* 5 colormaps of 16 colors each */
                unsigned char r = sprites_cmap[i].r >> 3;
                unsigned char g = sprites_cmap[i].g >> 3;
                unsigned char b = sprites_cmap[i].b >> 3;