diff --git a/src/game/tetromino/shapes.c b/src/game/tetromino/shapes.c
index 902f72f..378b11f 100644
--- a/src/game/tetromino/shapes.c
+++ b/src/game/tetromino/shapes.c
@@ -1,7 +1,5 @@
 #include "shapes.h"
 
-#include <string.h>
-
 #include "../../io/colour/colour8.h"
 #include "../../util/types.h"
 #include "../../util/vec.h"
@@ -41,54 +39,60 @@
 
 void shape_getblocks(u8 id, i8vec2* restrict out) {
 	struct blockdat {
-		i8vec2 memb[4];
-	};
-	struct blockdat dat;
+		u8 ax : 2, ay : 2;
+		u8 bx : 2, by : 2;
+		u8 cx : 2, cy : 2;
+		u8 dx : 2, dy : 2;
+	} dat;
+
 	switch (id) {
 	// O tetromino
 	case TETROMINO_O | TETROMINO_ROTATED_0:
 	case TETROMINO_O | TETROMINO_ROTATED_90:
 	case TETROMINO_O | TETROMINO_ROTATED_180:
-	case TETROMINO_O | TETROMINO_ROTATED_270: dat = (struct blockdat){{{1, 1}, {2, 1}, {1, 2}, {2, 2}}}; break;
+	case TETROMINO_O | TETROMINO_ROTATED_270: dat = (struct blockdat){1, 1, 2, 1, 1, 2, 2, 2}; break;
 
 	// I tetromino
-	case TETROMINO_I | TETROMINO_ROTATED_0:   dat = (struct blockdat){{{0, 1}, {1, 1}, {2, 1}, {3, 1}}}; break;
-	case TETROMINO_I | TETROMINO_ROTATED_90:  dat = (struct blockdat){{{2, 0}, {2, 1}, {2, 2}, {2, 3}}}; break;
-	case TETROMINO_I | TETROMINO_ROTATED_180: dat = (struct blockdat){{{0, 2}, {1, 2}, {2, 2}, {3, 2}}}; break;
-	case TETROMINO_I | TETROMINO_ROTATED_270: dat = (struct blockdat){{{1, 0}, {1, 1}, {1, 2}, {1, 3}}}; break;
+	case TETROMINO_I | TETROMINO_ROTATED_0:   dat = (struct blockdat){0, 1, 1, 1, 2, 1, 3, 1}; break;
+	case TETROMINO_I | TETROMINO_ROTATED_90:  dat = (struct blockdat){2, 0, 2, 1, 2, 2, 2, 3}; break;
+	case TETROMINO_I | TETROMINO_ROTATED_180: dat = (struct blockdat){0, 2, 1, 2, 2, 2, 3, 2}; break;
+	case TETROMINO_I | TETROMINO_ROTATED_270: dat = (struct blockdat){1, 0, 1, 1, 1, 2, 1, 3}; break;
 
 	// S tetromino
-	case TETROMINO_S | TETROMINO_ROTATED_0:   dat = (struct blockdat){{{1, 0}, {2, 0}, {0, 1}, {1, 1}}}; break;
-	case TETROMINO_S | TETROMINO_ROTATED_90:  dat = (struct blockdat){{{1, 0}, {1, 1}, {2, 1}, {2, 2}}}; break;
-	case TETROMINO_S | TETROMINO_ROTATED_180: dat = (struct blockdat){{{1, 1}, {2, 1}, {0, 2}, {1, 2}}}; break;
-	case TETROMINO_S | TETROMINO_ROTATED_270: dat = (struct blockdat){{{0, 0}, {0, 1}, {1, 1}, {1, 2}}}; break;
+	case TETROMINO_S | TETROMINO_ROTATED_0:   dat = (struct blockdat){1, 0, 2, 0, 0, 1, 1, 1}; break;
+	case TETROMINO_S | TETROMINO_ROTATED_90:  dat = (struct blockdat){1, 0, 1, 1, 2, 1, 2, 2}; break;
+	case TETROMINO_S | TETROMINO_ROTATED_180: dat = (struct blockdat){1, 1, 2, 1, 0, 2, 1, 2}; break;
+	case TETROMINO_S | TETROMINO_ROTATED_270: dat = (struct blockdat){0, 0, 0, 1, 1, 1, 1, 2}; break;
 
 	// Z tetromino
-	case TETROMINO_Z | TETROMINO_ROTATED_0:   dat = (struct blockdat){{{0, 0}, {1, 0}, {1, 1}, {2, 1}}}; break;
-	case TETROMINO_Z | TETROMINO_ROTATED_90:  dat = (struct blockdat){{{2, 0}, {1, 1}, {2, 1}, {1, 2}}}; break;
-	case TETROMINO_Z | TETROMINO_ROTATED_180: dat = (struct blockdat){{{0, 1}, {1, 1}, {1, 2}, {2, 2}}}; break;
-	case TETROMINO_Z | TETROMINO_ROTATED_270: dat = (struct blockdat){{{1, 0}, {0, 1}, {1, 1}, {0, 2}}}; break;
+	case TETROMINO_Z | TETROMINO_ROTATED_0:   dat = (struct blockdat){0, 0, 1, 0, 1, 1, 2, 1}; break;
+	case TETROMINO_Z | TETROMINO_ROTATED_90:  dat = (struct blockdat){2, 0, 1, 1, 2, 1, 1, 2}; break;
+	case TETROMINO_Z | TETROMINO_ROTATED_180: dat = (struct blockdat){0, 1, 1, 1, 1, 2, 2, 2}; break;
+	case TETROMINO_Z | TETROMINO_ROTATED_270: dat = (struct blockdat){1, 0, 0, 1, 1, 1, 0, 2}; break;
 
 	// T tetromino
-	case TETROMINO_T | TETROMINO_ROTATED_0:   dat = (struct blockdat){{{0, 1}, {1, 1}, {2, 1}, {1, 2}}}; break;
-	case TETROMINO_T | TETROMINO_ROTATED_90:  dat = (struct blockdat){{{1, 0}, {0, 1}, {1, 1}, {1, 2}}}; break;
-	case TETROMINO_T | TETROMINO_ROTATED_180: dat = (struct blockdat){{{1, 0}, {0, 1}, {1, 1}, {2, 1}}}; break;
-	case TETROMINO_T | TETROMINO_ROTATED_270: dat = (struct blockdat){{{1, 0}, {1, 1}, {2, 1}, {1, 2}}}; break;
+	case TETROMINO_T | TETROMINO_ROTATED_0:   dat = (struct blockdat){0, 1, 1, 1, 2, 1, 1, 2}; break;
+	case TETROMINO_T | TETROMINO_ROTATED_90:  dat = (struct blockdat){1, 0, 0, 1, 1, 1, 1, 2}; break;
+	case TETROMINO_T | TETROMINO_ROTATED_180: dat = (struct blockdat){1, 0, 0, 1, 1, 1, 2, 1}; break;
+	case TETROMINO_T | TETROMINO_ROTATED_270: dat = (struct blockdat){1, 0, 1, 1, 2, 1, 1, 2}; break;
 
 	// L tetromino
-	case TETROMINO_L | TETROMINO_ROTATED_0:   dat = (struct blockdat){{{1, 0}, {1, 1}, {1, 2}, {2, 2}}}; break;
-	case TETROMINO_L | TETROMINO_ROTATED_90:  dat = (struct blockdat){{{0, 1}, {1, 1}, {2, 1}, {0, 2}}}; break;
-	case TETROMINO_L | TETROMINO_ROTATED_180: dat = (struct blockdat){{{0, 0}, {1, 0}, {1, 1}, {1, 2}}}; break;
-	case TETROMINO_L | TETROMINO_ROTATED_270: dat = (struct blockdat){{{2, 0}, {0, 1}, {1, 1}, {2, 1}}}; break;
+	case TETROMINO_L | TETROMINO_ROTATED_0:   dat = (struct blockdat){1, 0, 1, 1, 1, 2, 2, 2}; break;
+	case TETROMINO_L | TETROMINO_ROTATED_90:  dat = (struct blockdat){0, 1, 1, 1, 2, 1, 0, 2}; break;
+	case TETROMINO_L | TETROMINO_ROTATED_180: dat = (struct blockdat){0, 0, 1, 0, 1, 1, 1, 2}; break;
+	case TETROMINO_L | TETROMINO_ROTATED_270: dat = (struct blockdat){2, 0, 0, 1, 1, 1, 2, 1}; break;
 
 	// J tetromino
-	case TETROMINO_J | TETROMINO_ROTATED_0:   dat = (struct blockdat){{{1, 0}, {1, 1}, {0, 2}, {1, 2}}}; break;
-	case TETROMINO_J | TETROMINO_ROTATED_90:  dat = (struct blockdat){{{0, 0}, {0, 1}, {1, 1}, {2, 1}}}; break;
-	case TETROMINO_J | TETROMINO_ROTATED_180: dat = (struct blockdat){{{1, 0}, {2, 0}, {1, 1}, {1, 2}}}; break;
-	case TETROMINO_J | TETROMINO_ROTATED_270: dat = (struct blockdat){{{0, 1}, {1, 1}, {2, 1}, {2, 2}}}; break;
+	case TETROMINO_J | TETROMINO_ROTATED_0:   dat = (struct blockdat){1, 0, 1, 1, 0, 2, 1, 2}; break;
+	case TETROMINO_J | TETROMINO_ROTATED_90:  dat = (struct blockdat){0, 0, 0, 1, 1, 1, 2, 1}; break;
+	case TETROMINO_J | TETROMINO_ROTATED_180: dat = (struct blockdat){1, 0, 2, 0, 1, 1, 1, 2}; break;
+	case TETROMINO_J | TETROMINO_ROTATED_270: dat = (struct blockdat){0, 1, 1, 1, 2, 1, 2, 2}; break;
 	}
 
-	memcpy(out, dat.memb, sizeof(i8vec2[4]));
+	out[0] = (i8vec2){dat.ax, dat.ay};
+	out[1] = (i8vec2){dat.bx, dat.by};
+	out[2] = (i8vec2){dat.cx, dat.cy};
+	out[3] = (i8vec2){dat.dx, dat.dy};
 }
 
 u16 shape_from_id(u8 id) {