diff options
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/sprite.c | 14 | ||||
| -rw-r--r-- | src/engine/text.c | 2 |
2 files changed, 5 insertions, 11 deletions
diff --git a/src/engine/sprite.c b/src/engine/sprite.c index d13253e19..cf35e12a3 100644 --- a/src/engine/sprite.c +++ b/src/engine/sprite.c @@ -29,7 +29,7 @@ struct SpriteCopyRequest { const u8 *src; - u8 *dest; // to TileData4bpp *? + u8 *dest; u16 size; }; @@ -818,8 +818,7 @@ static void RequestSpriteFrameImageCopy(u16 index, u16 tileNum, const struct Spr if (gSpriteCopyRequestCount < MAX_SPRITE_COPY_REQUESTS) { gSpriteCopyRequests[gSpriteCopyRequestCount].src = images[index].data; - // gSpriteCopyRequests[gSpriteCopyRequestCount].dest = OBJ_VRAM0 + TILE_SIZE_4BPP * tileNum; - gSpriteCopyRequests[gSpriteCopyRequestCount].dest = OBJ_VRAM0_TEMP[tileNum]; + gSpriteCopyRequests[gSpriteCopyRequestCount].dest = OBJ_VRAM0 + TILE_SIZE_4BPP * tileNum; gSpriteCopyRequests[gSpriteCopyRequestCount].size = images[index].size; gSpriteCopyRequestCount++; } @@ -1466,8 +1465,7 @@ u16 LoadSpriteSheet(const struct SpriteSheet *sheet) else { AllocSpriteTileRange(sheet->tag, (u16)tileStart, sheet->size / TILE_SIZE_4BPP); - // CpuCopy16(sheet->data, OBJ_VRAM0 + TILE_SIZE_4BPP * tileStart, sheet->size); - CpuCopy16(sheet->data, &OBJ_VRAM0_TEMP[tileStart], sheet->size); + CpuCopy16(sheet->data, OBJ_VRAM0 + TILE_SIZE_4BPP * tileStart, sheet->size); return (u16)tileStart; } } @@ -1505,8 +1503,7 @@ void LoadTilesForSpriteSheet(const struct SpriteSheet *sheet) { const u8 *data = sheet->data; u16 tileStart = GetSpriteTileStartByTag(sheet->tag); - // CpuCopy16(data, OBJ_VRAM0 + TILE_SIZE_4BPP * tileStart, sheet->size); - CpuCopy16(data, OBJ_VRAM0_TEMP[tileStart], sheet->size); + CpuCopy16(data, OBJ_VRAM0 + TILE_SIZE_4BPP * tileStart, sheet->size); } void LoadTilesForSpriteSheets(struct SpriteSheet *sheets) @@ -1592,8 +1589,7 @@ void RequestSpriteSheetCopy(const struct SpriteSheet *sheet) { const u8 *data = sheet->data; u16 tileStart = GetSpriteTileStartByTag(sheet->tag); - // RequestSpriteCopy(data, OBJ_VRAM0 + tileStart * TILE_SIZE_4BPP, sheet->size); - RequestSpriteCopy(data, OBJ_VRAM0_TEMP[tileStart], sheet->size); + RequestSpriteCopy(data, OBJ_VRAM0 + tileStart * TILE_SIZE_4BPP, sheet->size); } u16 LoadSpriteSheetDeferred(const struct SpriteSheet *sheet) diff --git a/src/engine/text.c b/src/engine/text.c index 5d2abe785..fe18a6d79 100644 --- a/src/engine/text.c +++ b/src/engine/text.c @@ -552,7 +552,6 @@ const struct WindowTemplate gWindowTemplate_81E6C74 = 30, // width 20, // height OBJ_VRAM0, // tile data - // OBJ_VRAM0_TEMP, // tile data NULL, // tilemap }; @@ -1687,7 +1686,6 @@ const struct WindowTemplate gWindowTemplate_81E725C = 30, // width 20, // height OBJ_VRAM0, // tile data - // OBJ_VRAM0_TEMP, // tile data NULL, // tilemap }; |