diff options
Diffstat (limited to 'src/digit_obj_util.c')
| -rw-r--r-- | src/digit_obj_util.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/digit_obj_util.c b/src/digit_obj_util.c index ed762c3c3..285b83397 100644 --- a/src/digit_obj_util.c +++ b/src/digit_obj_util.c @@ -125,19 +125,19 @@ bool32 DigitObjUtil_CreatePrinter(u32 id, s32 num, const struct DigitObjUtilTemp if (sOamWork->array[id].firstOamId == 0xFF) return FALSE; - sOamWork->array[id].tileStart = GetSpriteTileStartByTag(template->spriteSheet->tag); + sOamWork->array[id].tileStart = GetSpriteTileStartByTag(template->spriteSheet.uncompressed->tag); if (sOamWork->array[id].tileStart == 0xFFFF) { - if (template->spriteSheet->size != 0) + if (template->spriteSheet.uncompressed->size != 0) { - sOamWork->array[id].tileStart = LoadSpriteSheet(template->spriteSheet); + sOamWork->array[id].tileStart = LoadSpriteSheet(template->spriteSheet.uncompressed); } else { struct CompressedSpriteSheet compObjectPic; - compObjectPic = *(struct CompressedSpriteSheet*)(template->spriteSheet); - compObjectPic.size = GetDecompressedDataSize(template->spriteSheet->data); + compObjectPic = *template->spriteSheet.compressed; + compObjectPic.size = GetDecompressedDataSize((const void *)template->spriteSheet.compressed->data); sOamWork->array[id].tileStart = LoadCompressedSpriteSheet(&compObjectPic); } @@ -158,7 +158,7 @@ bool32 DigitObjUtil_CreatePrinter(u32 id, s32 num, const struct DigitObjUtilTemp sOamWork->array[id].priority = template->priority; sOamWork->array[id].xDelta = template->xDelta; sOamWork->array[id].tilesPerImage = GetTilesPerImage(template->shape, template->size); - sOamWork->array[id].tileTag = template->spriteSheet->tag; + sOamWork->array[id].tileTag = template->spriteSheet.uncompressed->tag; sOamWork->array[id].palTag = template->spritePal->tag; sOamWork->array[id].isActive = TRUE; |