1 files changed, 11 insertions, 8 deletions

diff --git a/src/uxn/devices/ppu.c b/src/uxn/devices/ppu.c
index 0935329..d70afdd 100644
--- a/src/uxn/devices/ppu.c
+++ b/src/uxn/devices/ppu.c
@@ -167,8 +167,8 @@ putpixel(Ppu *p, Uint32 *layer, Uint16 x, Uint16 y, Uint8 color) {
     size_t tile_y = y / 8;
     size_t start_col = x % 8;
     size_t start_row = y % 8;
-    Uint32 pos = (start_row + ((tile_x + tile_y * 30) * 8));
-    Uint32 shift = start_col * 4;
+    size_t pos = (start_row + ((tile_x + tile_y * 30) * 8));
+    size_t shift = start_col * 4;
     layer[pos] = (layer[pos] & (~(0xF << shift))) | (color << shift);
     dirty_tiles[tile_y] |= 1 << tile_x;
 }
@@ -180,13 +180,16 @@ puticn(Ppu *p, Uint32 *layer, Uint16 x, Uint16 y, Uint8 *sprite, Uint8 color,
     size_t tile_y = y / 8;
     size_t start_col = x % 8;
     size_t start_row = y % 8;
-    Uint32 pos = (start_row + ((tile_x + tile_y * 30) * 8));
-    Uint32 shift_left = start_col * 4;
-    Uint32 shift_right = (8 - start_col) * 4;
-        Uint32 *layer_ptr = &layer[pos];
-        if (flipy) flipy = 7;
+    size_t shift_left = start_col * 4;
+    size_t shift_right = (8 - start_col) * 4;
 
-        Uint32 *lut = flipx ? unpack_icon_lut : unpack_icon_lut_flipx;
+        if (flipy) {
+        flipy = 7;
+    }
+
+    size_t pos = (start_row + ((tile_x + tile_y * 30) * 8));
+        size_t *layer_ptr = &layer[pos];
+        size_t *lut = flipx ? unpack_icon_lut : unpack_icon_lut_flipx;
 
     // There are 4 possible cases:
     // 1. The sprite is exactly at the tile boundary. We can just copy the