Version 0.8

Author: davemoore22

.vscode/settings.json

@@ -53,7 +53,8 @@
 		"ranges": "c",
 		"span": "c",
 		"strings.h": "c",
-		"snake.h": "c"
+		"snake.h": "c",
+		"memory": "c"
 	},
 	"editor.rulers": [
 		80

README.md

@@ -33,6 +33,12 @@ The basis for this remake is the original port by Mosaik Software available [her
 
 **Version History**
 
+*Version 0.8 (20/12/2023)*
+
+* Fixed Responsiveness of Controls in main game
+* In easy mode, Nibbler now remembers on a level which gems are eaten
+* In the High Score Table, no additional keypress is needed to finish entering a score
+
 *Version 0.7 (12/12/2023)*
 
 * Added a difficulty toggle

inc/debug.h

@@ -21,9 +21,9 @@
 #include <main.h>
 
 /* Debug Defines to allow easier testing */
-#define DEBUG_SKIP_DEMO
-#define DEBUG_SKIP_TITLE
-#define DEBUG_SKIP_BETWEEN
+#undef DEBUG_SKIP_DEMO
+#undef DEBUG_SKIP_TITLE
+#undef DEBUG_SKIP_BETWEEN
 #undef DEBUG_NO_COLLISION_DETECTION
 #define DEBUG_LEVEL_SKIP
 

inc/game.h

@@ -32,14 +32,13 @@ u32 g_start(void);
 void g_stop(void);
 
 /* Private Functions */
-static bool g_play_level(const u8 level, const u8 gems);
+static bool g_play_level(const u8 level, u8 *gems_left);
 static void g_interrupt(void);
-static void g_load_level(const u8 level, u8 *gems_left, const bool reset);
+static void g_load_level(const u8 level, u8 *gems_left, const bool reset_gems);
 static void g_reset_snake(snake_t *snake, snake_t *snake_buf);
 static bool g_test_can_move(
 	const u8 *pf, const u8 w, const snake_t *snake, const dir_t dir);
 static void g_display_HUD(void);
 static void g_redraw_score(const u32 score);
-static void g_redraw_gems(const u8 gems_left);
 static void g_display_lives(const u8 x, const u8 y);
 

inc/video.h

@@ -22,7 +22,7 @@
 /* Public Functions */
 void v_draw_logo(void);
 void v_draw_pf(const u8 *pf, const pos_t *loc, const dim_t *sz);
-void v_draw_gems(const gem_t *gems, const pos_t *loc, const dim_t *sz);
+void v_draw_gems(const gem_t *gems, const pos_t *loc);
 void v_draw_snake(const snake_t *snake, const pos_t *loc);
 void v_erase_snake_seg(const snake_t *snake, const pos_t *loc, const u8 seg);
 void v_draw_snake_seg(

nibdx.dsk

@@ -24,7 +24,7 @@ const char *const g_strings[] = {
 	"A REMAKE BY", "DAVE MOORE (c) 2024", "    ORIGINAL BY    ",
 	"  CHRISTOPH VON RHEIN & ROMAN MAJER  ", " (C) MOSAIK SOFTWARE 1984 ",
 	"BASED ON NIBBLER BY", "JOSEPH H. ULOWETZ & JOHN M. JAUGILAS ",
-	"(C) ROCK-OLA MFG CORP 1982", "V0.7: 12/12/2023", "",
+	"(C) ROCK-OLA MFG CORP 1982", "V0.8: 20/12/2023", "",
 	/* Title Screen 10-29 */
 	"1.", "2.", "3.", "4.", "9.", "0.", "DIFFICULTY", "SET CONTROLS",
 	"MUSIC/SFX ON/OFF", "SHOW INSTRUCTONS", "PLAY GAME", "QUIT",

src/data/strings.c

@@ -56,6 +56,10 @@ static snake_t sn_buf;
 static const u8 sn_len = 10;
 static const u8 sn_max = 62;
 
+/* Whither or not we need to reset gems */
+static bool easy_mode;
+static bool reset_gems = false;
+
 /* Set default options and hiscores (precalculated for speed) */
 void g_setup(void) {
 
@@ -81,10 +85,13 @@ u32 g_start(void) {
 	u8 gems_left;
 	bool reset_gems = true;
 
+	/* Initial Settings */
 	level = 1;
 	round = 1;
 	lives = 3;
 	score = 0;
+	easy_mode = g_options[0];
+	reset_gems = true;
 
 	/* Keep going until game over! */
 	while (!game_over) {
@@ -98,12 +105,13 @@ u32 g_start(void) {
 		/* Load the appropriate level data */
 		g_load_level(level, &gems_left, reset_gems);
 		g_reset_snake(&sn, &sn_buf);
+		if (easy_mode)
+			reset_gems = false;
 
 		/* Draw the fixed elements of the HUD */
 		g_display_HUD();
-		g_redraw_gems(gems_left);
 		v_draw_pf(pf, &pf_loc, &pf_sz);
-		v_draw_gems(gems, &pf_loc, &pf_sz);
+		v_draw_gems(gems, &pf_loc);
 		v_draw_snake(&sn, &pf_loc);
 
 		/*
@@ -121,7 +129,7 @@ u32 g_start(void) {
 		g_clock_on = true;
 
 		/* Start the game */
-		lvl_complete = g_play_level(level, gems_left);
+		lvl_complete = g_play_level(level, &gems_left);
 		g_stop();
 		g_clock_on = false;
 
@@ -150,11 +158,9 @@ u32 g_start(void) {
 				game_over = true;
 			} else {
 				v_wipe_scr(true);
+				cpct_removeInterruptHandler();
 				--lives;
-				if (!g_options[0])
-					reset_gems = true;
-				else
-					reset_gems = false;
+				reset_gems = !easy_mode;
 			}
 		}
 	}
@@ -172,15 +178,14 @@ void g_stop(void) {
 }
 
 /* Handle the Game Level Playing */
-static bool g_play_level(const u8 level, const u8 gems_total) {
+static bool g_play_level(const u8 level, u8* gems_left) {
 
 	volatile bool finished = false, success = false;
 	volatile u16 count = 0;
 	bool move_l = false, move_r = false;
 	bool paused, moved;
 	u16 key_l, key_r;
 	u8 c_offset = g_options[1] ? 0 : 2;
-	u8 gems_left = gems_total;
 	dir_t dir = DIR_EAST;
 	const u8 diff_c = g_options[0] ? 5 : 2;
 	const u8 diff_mod = g_options[0] ? 1 : 10;
@@ -249,16 +254,13 @@ static bool g_play_level(const u8 level, const u8 gems_total) {
 				gems[gem_ate].active = false;
 				gems[gem_ate].loc.x = 0;
 				gems[gem_ate].loc.y = 0;
-				--gems_left;
+				--*gems_left;
 				score += level * level * round * 10 * diff_mod;
 				g_redraw_score(score);
-				g_redraw_gems(gems_left);
-				DEBUG_NUM(gems_left, true);
-				DEBUG_RESET(true);
 			}
 
 			/* If we have eaten all the Gems! */
-			if (gems_left == 0) {
+			if (*gems_left == 0) {
 
 				success = true;
 				break;
@@ -377,14 +379,6 @@ static void g_redraw_score(const u32 score) {
 	width = u_get_width(score);
 	v_print_n(score, 16 + (20 - (width * 2)), y, 1);
 }
-	
-/* Display Remaining Gems */
-static void g_redraw_gems(const u8 gems_left) {
-
-	u8 y = (hud_loc.y + 2) * LINE_PY;
-	v_print(g_strings[58], 32, y, 2);
-	v_print_n(gems_left, 32, y, 1);
-}
 
 /* Draw Remaining Lives */
 static void g_display_lives(const u8 x, const u8 y) {
@@ -448,7 +442,7 @@ static void g_interrupt(void) {
 }
 
 /* Load data for current level */
-static void g_load_level(const u8 level, u8 *gems_left, const bool reset) {
+static void g_load_level(const u8 level, u8 *gems_left, const bool reset_gems) {
 
 	pos_t* gem_source;
 
@@ -457,8 +451,8 @@ static void g_load_level(const u8 level, u8 *gems_left, const bool reset) {
 	cpct_memcpy(&pf, g_game_pf[level - 1], sizeof(pf));
 
 	/* Reload the Gems if necessary */
-	if (reset) {
-		// TODO: in easy mode, stop resetting gems left after a loss of life
+	if (reset_gems) {
+
 		*gems_left = g_game_pf_count[level - 1];
 		cpct_memset(&gems, 0x00, sizeof(gem_t));
 		gem_source = g_game_gems[level - 1];
@@ -473,7 +467,8 @@ static void g_load_level(const u8 level, u8 *gems_left, const bool reset) {
 				gems[i].active = false;
 			}
 		}
-	}
+	} else
+		*gems_left = *gems_left;
 }
 
 /* Reset Game Snake to starting position and size */

src/game.c

@@ -45,7 +45,7 @@ void h_start(const u32 score) {
 
 		/* Handle Initial Input */
 		y = ei_loc.y * LINE_PY;
-		while (len <= 3) {
+		while (len <= 2) {
 
 			if (count % 200 == 0) {
 

src/hiscore.c

@@ -208,7 +208,7 @@ void v_draw_pf(const u8 *pf, const pos_t *loc, const dim_t *sz) {
 }
 
 /* Draw the Gems on a Playfield */
-void v_draw_gems(const gem_t *gems, const pos_t *loc, const dim_t *sz) {
+void v_draw_gems(const gem_t *gems, const pos_t *loc) {
 
 	int top_x = loc->x * LINE_PX, top_y = loc->y * LINE_PY;
 	u8 *pos;
@@ -314,8 +314,6 @@ void v_erase_snake_timed(const snake_t *snake, const pos_t *loc, const int n) {
 		u_wait(n);
 	}
 
-	DEBUG_STR("erer", true);
-
 	x = (snake->body[0].x + loc->x) * CHAR_BYTES_W;
 	y = (snake->body[0].y + loc->y) * CHAR_BYTES_H;
 	head_pos = v_get_sp(x, y);