1 files changed, 9 insertions, 14 deletions

diff --git a/src/isogfx.c b/src/isogfx.c
index baf422f..53a6650 100644
--- a/src/isogfx.c
+++ b/src/isogfx.c
@@ -49,10 +49,6 @@ typedef struct TileData {
   uint16_t pixels_handle; // Handle to the tile's pixels in the pixel pool.
 } TileData;
 
-// File format is already convenient for working in memory.
-typedef Ss_Row         SpriteSheetRow;
-typedef Ss_SpriteSheet SpriteSheetData;
-
 typedef struct SpriteData {
   SpriteSheet sheet; // Handle to the sprite's sheet.
   ivec2       position;
@@ -64,7 +60,7 @@ DEF_MEMPOOL_DYN(TilePool, TileData)
 DEF_MEM_DYN(PixelPool, Pixel)
 
 DEF_MEMPOOL_DYN(SpritePool, SpriteData)
-DEF_MEM_DYN(SpriteSheetPool, SpriteSheetData)
+DEF_MEM_DYN(SpriteSheetPool, Ss_SpriteSheet)
 
 typedef struct IsoGfx {
   int             screen_width;
@@ -521,8 +517,8 @@ bool isogfx_load_sprite_sheet(
   if (file == NULL) {
     goto cleanup;
   }
-  const size_t     sheet_size = get_file_size(file);
-  SpriteSheetData* ss_sheet   = mem_alloc(&iso->sheets, sheet_size);
+  const size_t    sheet_size = get_file_size(file);
+  Ss_SpriteSheet* ss_sheet   = mem_alloc(&iso->sheets, sheet_size);
   if (!ss_sheet) {
     goto cleanup;
   }
@@ -591,11 +587,10 @@ void isogfx_update(IsoGfx* iso, double t) {
     // TODO: Consider linking animated sprites in a list so that we only walk
     // over those here and not also the static sprites.
     mempool_foreach(&iso->sprites, sprite, {
-      const SpriteSheetData* sheet = mem_get_chunk(&iso->sheets, sprite->sheet);
+      const Ss_SpriteSheet* sheet = mem_get_chunk(&iso->sheets, sprite->sheet);
       assert(sheet); // TODO: Make this a hard assert inside the mem/pool.
-      const SpriteSheetRow* row =
-          get_sprite_sheet_row(sheet, sprite->animation);
-      sprite->frame = (sprite->frame + 1) % row->num_cols;
+      const Ss_Row* row = get_sprite_sheet_row(sheet, sprite->animation);
+      sprite->frame     = (sprite->frame + 1) % row->num_cols;
     });
 
     iso->last_animation_time = t;
@@ -740,7 +735,7 @@ static void draw_world(IsoGfx* iso) {
 
 static void draw_sprite(
     IsoGfx* iso, ivec2 origin, const SpriteData* sprite,
-    const SpriteSheetData* sheet) {
+    const Ss_SpriteSheet* sheet) {
   assert(iso);
   assert(sprite);
   assert(sheet);
@@ -748,7 +743,7 @@ static void draw_sprite(
   assert(sprite->animation < sheet->num_rows);
   assert(sprite->frame >= 0);
 
-  const SpriteSheetRow* row = get_sprite_sheet_row(sheet, sprite->animation);
+  const Ss_Row*  row   = get_sprite_sheet_row(sheet, sprite->animation);
   const uint8_t* frame = get_sprite_sheet_sprite(sheet, row, sprite->frame);
   draw_rect(
       iso, origin, sheet->sprite_width, sheet->sprite_height,
@@ -761,7 +756,7 @@ static void draw_sprites(IsoGfx* iso) {
   const CoordSystem iso_space = make_iso_coord_system(iso);
 
   mempool_foreach(&iso->sprites, sprite, {
-    const SpriteSheetData* sheet = mem_get_chunk(&iso->sheets, sprite->sheet);
+    const Ss_SpriteSheet* sheet = mem_get_chunk(&iso->sheets, sprite->sheet);
     assert(sheet);
 
     const ivec2 screen_origin =