added exa movement and file operations

makefile

···
 # ----------------------------
 
 NAME = HACKMTCH
-DESCRIPTION = "A Tetris-like game of block-moving and -swapping designed by Zachtronics"
+DESCRIPTION = "A fast-paced match-4 designed by Zachtronics"
 COMPRESSED = YES
 ARCHIVED = NO
+
+DEPS = src/gfx/gfx.h
 
 CFLAGS = -Wall -Wextra -Oz
 CXXFLAGS = -Wall -Wextra -Oz
···
 # ----------------------------
 
 include $(shell cedev-config --makefile)
+
+src/gfx/gfx.h:
+	make gfx

src/gfx/convimg.yaml

···
       - color: {index: 0, r: 0, g: 0, b: 0}
       - color: {index: 1, r: 255, g: 255, b: 255}
       - color: {index: 2, r: 181, g: 49, b: 33}
+      - color: {index: 3, r: 179, g: 243, b: 204}
     images: automatic
 
 converts:
-  - name: sprites
+  - name: misc
+    palette: global_palette
+    style: rlet
+    transparent-color-index: 4
+    images:
+      - background.png
+      - exa_empty.png
+      - exa_full.png
+      - title.png
+  - name: grid_icons
+    palette: global_palette
+    style: palette
+    images:
+      - file_blue.png
+      - file_cyan.png
+      - file_locked.png
+      - file_purple.png
+      - file_red.png
+      - file_yellow.png
+      - star_blue.png
+      - star_cyan.png
+      - star_purple.png
+      - star_red.png
+      - star_yellow.png
+  - name: digits
     palette: global_palette
-    images: automatic
+    style: palette
+    images:
+      - digit_0.png
+      - digit_1.png
+      - digit_2.png
+      - digit_3.png
+      - digit_4.png
+      - digit_5.png
+      - digit_6.png
+      - digit_7.png
+      - digit_8.png
+      - digit_9.png
+      - digit_0_grey.png
 
 outputs:
   - type: c
···
     palettes:
       - global_palette
     converts:
-      - sprites
+      - misc
+      - grid_icons
+      - digits
 

src/main.c

···
 
 #include "gfx/gfx.h"
 
-#define NO_BUFFER
+// uncomment this line out to draw directly to the screen
+// #define NO_BUFFER
 
 #define SAVE_VAR_NAME "HKMCHDAT"
 
-#define FRAME_TIME 1600
+#define FRAME_TIME 3200
 
 #define COLOR_BLACK 0
 #define COLOR_WHITE 1
 #define COLOR_RED 2
+#define COLOR_DASH 3
 
 #define TITLE_SPRITE_HOFFSET ((GFX_LCD_WIDTH - title_width) / 2)
 #define TITLE_SPRITE_VOFFSET 36
···
 #define MAX_ROWS 11
 #define NUM_INITIAL_ROWS 3
 #define NUM_BLOCK_COLORS 5
+#define EXA_START_COL 2
 
 #define BG_HOFFSET ((GFX_LCD_WIDTH - background_width) / 2)
 #define BG_VOFFSET ((GFX_LCD_HEIGHT - background_height) / 2)
+
 #define GRID_HOFFSET (BG_HOFFSET + 48)
 #define GRID_VOFFSET (BG_VOFFSET + 23)
 #define GRID_SIZE 16
+
+#define EXA_HOFFSET (BG_HOFFSET + 44)
+#define EXA_VOFFSET (BG_VOFFSET + 193)
+#define EXA_HELD_HOFFSET 4
+#define EXA_HELD_VOFFSET 6
+#define DASH_HOFFSET 8
+#define DASH_VOFFSET 3
+#define DASH_INTERVAL 4
+
 #define SCORE_HOFFSET (BG_HOFFSET + 160)
 #define SCORE_VOFFSET (BG_VOFFSET + 41)
 #define HIGH_SCORE_HOFFSET (BG_HOFFSET + 160)
 #define HIGH_SCORE_VOFFSET (BG_VOFFSET + 97)
 #define NUM_DISPLAY_DIGITS 6
 
+#define FILE_EMPTY 0
+#define FILE_RED 1
+#define FILE_YELLOW 2
+#define FILE_CYAN 3
+#define FILE_BLUE 4
+#define FILE_PURPLE 5
+#define FILE_LOCKED 6
+
 bool toExit;
+
 unsigned int score;
 unsigned int highScore;
 
-enum file_t {
-	EMPTY,
-	RED,
-	YELLOW,
-	CYAN,
-	BLUE,
-	PURPLE,
-	LOCKED
-};
+unsigned char files[NUM_COLS][MAX_ROWS];
+unsigned char exaCol;
+bool isHoldingFile;
+unsigned char heldFile;
 
 const struct gfx_sprite_t *fileSprites[] = {
 	0,
···
 	digit_9
 };
 
-unsigned char files[NUM_COLS][MAX_ROWS];
+gfx_UninitedSprite(behindExa, exa_empty_width, exa_empty_height);
+
+unsigned char prev2nd, prevAlpha;
+
+void drawExa()
+{
+	const unsigned char exaX = EXA_HOFFSET + GRID_SIZE * exaCol;
+
+	if (isHoldingFile)
+	{
+		gfx_Sprite_NoClip(fileSprites[heldFile], exaX + EXA_HELD_HOFFSET, EXA_VOFFSET + EXA_HELD_VOFFSET);
+		gfx_RLETSprite_NoClip(exa_full, exaX, EXA_VOFFSET);
+	}
+	else
+	{
+		gfx_RLETSprite_NoClip(exa_empty, exaX, EXA_VOFFSET);
+	}
+}
+
+unsigned char *getTargetedFile()
+{
+	for (unsigned char row = MAX_ROWS - 1; row > 0; row--)
+	{
+		if (files[exaCol][row] == FILE_EMPTY) continue;
+		return &files[exaCol][row];
+	}
+	return 0;
+}
+
+unsigned char *getTargetedSpace()
+{
+	for (unsigned char row = 0; row < MAX_ROWS; row++)
+	{
+		if (files[exaCol][row] != FILE_EMPTY) continue;
+		return &files[exaCol][row];
+	}
+	return 0;
+}
+
+bool grab() // all of these return true if something changed
+{
+	unsigned char *targetedFile = getTargetedFile();
+	if (targetedFile == 0) return false; // column is empty
+	
+	isHoldingFile = true;
+	heldFile = *targetedFile;
+	*targetedFile = FILE_EMPTY;
+	return true;
+}
+
+bool drop()
+{
+	unsigned char *targetedSpace = getTargetedSpace();
+	if (targetedSpace == 0) return false;
+
+	isHoldingFile = false;
+	*targetedSpace = heldFile;
+	return true;
+}
+
+bool swap()
+{
+	unsigned char *targetedFile = getTargetedFile();
+	if (targetedFile == 0) return false;
+
+	const unsigned char swapFile = *targetedFile;
+	*targetedFile = heldFile;
+	heldFile = swapFile;
+	return true;
+}
 
 bool doInput()
 {
-	return os_GetCSC();
+	kb_Scan();
+
+	const unsigned char oldExaCol = exaCol;
+
+	if (kb_IsDown(kb_KeyRight) && exaCol < NUM_COLS - 1) exaCol++;
+	if (kb_IsDown(kb_KeyLeft) && exaCol > 0) exaCol--;
+
+	bool changedExaLook = false;
+
+	// the three main operations
+	if (kb_IsDown(kb_Key2nd) && !prev2nd)
+	{
+		if (isHoldingFile) changedExaLook = drop();
+		else changedExaLook = grab();
+	}
+	if (kb_IsDown(kb_KeyAlpha) && !prevAlpha)
+	{
+		if (isHoldingFile) changedExaLook = swap();
+		// else nothing happens :(
+	}
+
+	prev2nd = kb_IsDown(kb_Key2nd);
+	prevAlpha = kb_IsDown(kb_KeyAlpha);
+
+	if (exaCol != oldExaCol || changedExaLook) // redraw the exa
+	{
+		const unsigned char oldExaX = EXA_HOFFSET + GRID_SIZE * oldExaCol;
+		gfx_Sprite(behindExa, oldExaX, EXA_VOFFSET);
+
+		const unsigned char exaX = EXA_HOFFSET + GRID_SIZE * exaCol;
+		gfx_GetSprite(behindExa, exaX, EXA_VOFFSET);
+
+		drawExa();
+	}
+
+	return kb_IsDown(kb_KeyClear);
 }
 
 void updateGrid()
···
 		remainder -= divisor * thisDigit;
 		if (thisDigit > 0) significant = true;
 
-		if (!significant) gfx_Sprite(digit_0_grey, digitX, y);
-		else gfx_Sprite(digitSprites[thisDigit], digitX, y);
+		if (!significant) gfx_Sprite_NoClip(digit_0_grey, digitX, y);
+		else gfx_Sprite_NoClip(digitSprites[thisDigit], digitX, y);
 
 		digitX += 8;
 	}
···
 
 void drawFrame()
 {
-	// draw the grid
-	gfx_SetColor(COLOR_BLACK); // to fill in empty cells
+	// clear the old grid
+	gfx_SetColor(COLOR_BLACK);
+	gfx_FillRectangle_NoClip(GRID_HOFFSET, GRID_VOFFSET, NUM_COLS * GRID_SIZE, MAX_ROWS * GRID_SIZE);
+
+	// draw the new grid
+	gfx_SetColor(COLOR_DASH);
 	unsigned char y = GRID_VOFFSET;
 	for (unsigned char row = 0; row < MAX_ROWS; row++)
 	{
 		unsigned int x = GRID_HOFFSET;
 		for (unsigned char col = 0; col < NUM_COLS; col++)
 		{
-			if (files[col][row] == EMPTY) gfx_FillRectangle(x, y, GRID_SIZE, GRID_SIZE);
-			else gfx_Sprite(fileSprites[files[col][row]], x, y);
+			if (files[col][row] != FILE_EMPTY)
+			{
+				// just draw a file
+				gfx_Sprite_NoClip(fileSprites[files[col][row]], x, y);
+			}
+			else if (col == exaCol)
+			{
+				// draw the dashed line up from the exa
+				const unsigned char xx = x + DASH_HOFFSET;
+				for (unsigned char yy = y + DASH_VOFFSET; yy < y + GRID_SIZE; yy += DASH_INTERVAL)
+				{
+					gfx_SetPixel(xx, yy);
+				}
+			}
 			x += GRID_SIZE;
 		}
 		y += GRID_SIZE;
 	}
+
+	drawExa(); // otherwise its head gets cut off by the grid update
 
 	// draw the score
 	drawNumber(SCORE_HOFFSET, SCORE_VOFFSET, score);
···
 {
 	// draw the background
 	gfx_FillScreen(COLOR_BLACK);
-	gfx_Sprite(background, BG_HOFFSET, BG_VOFFSET);
+	gfx_RLETSprite_NoClip(background, BG_HOFFSET, BG_VOFFSET);
 
 	// draw the high score
 	drawNumber(HIGH_SCORE_HOFFSET, HIGH_SCORE_VOFFSET, highScore);
···
 		}
 	}
 
-	// get the first screen out there
+	// set and draw initial exa position
+	exaCol = EXA_START_COL;
+	gfx_GetSprite(behindExa, EXA_HOFFSET + EXA_START_COL * GRID_SIZE, EXA_VOFFSET);
+	gfx_RLETSprite(exa_empty, EXA_HOFFSET + EXA_START_COL * GRID_SIZE, EXA_VOFFSET);
+
+	// get the initial frame out there
 	drawFrame();
 }
 
···
 		ti_Read(&highScore, 3, 1, saveVar);
 	}
 	ti_Close(saveVar);
+
+	// initialize sprite storage
+	behindExa->width = exa_empty_width;
+	behindExa->height = exa_empty_height;
 }
 
 void titleScreen()
 {
 	gfx_FillScreen(COLOR_BLACK);
-	gfx_Sprite(title, TITLE_SPRITE_HOFFSET, TITLE_SPRITE_VOFFSET);
+	gfx_RLETSprite_NoClip(title, TITLE_SPRITE_HOFFSET, TITLE_SPRITE_VOFFSET);
 
 	gfx_SetTextFGColor(COLOR_RED);
 	gfx_SetTextXY(TITLE_TEXT_HOFFSET, TITLE_TEXT_VOFFSET);