From 10dc668d9eab7683db0c6fc38a37d64fe4bbb75a Mon Sep 17 00:00:00 2001
From: hkz <tabaglio@posteo.net>
Date: Fri, 25 Jul 2025 19:51:08 +0200
Subject: [PATCH] Add hi-score  graphics

---
 graphics/highscores.aseprite | Bin 0 -> 685 bytes
 graphics/highscores.png      | Bin 0 -> 464 bytes
 linker-files/linker.scm      |   4 ++--
 src/game_graphics.c          |  24 ++++++++++++++++++++----
 src/game_graphics.h          |   2 +-
 src/graph_misc_data.c        |  10 ++++++++++
 src/graph_misc_data.h        |   4 ++++
 src/main.c                   |   5 ++++-
 8 files changed, 41 insertions(+), 8 deletions(-)
 create mode 100644 graphics/highscores.aseprite
 create mode 100644 graphics/highscores.png

diff --git a/graphics/highscores.aseprite b/graphics/highscores.aseprite
new file mode 100644
index 0000000000000000000000000000000000000000..7a55faf00c83c6087c66196c2ae33590569b6d8c
GIT binary patch
literal 685
zcmZ3>#K7=iDI<dggA9WL10w?iLkbWh08k7h$RGfOv;ew5`+t381>4FBv_K4q*%iQ6
zB3YLOWV3)=rvPLqDVVrw*rZt+_J>*DFI2m^Ano1ZS-(G-&3qb=wa>tON}hM7evr3{
zk&UIjeThLrQ*_?L<k|n@&ptVQ`_KRX|7Wk=-cr||nUxh87F6ccwZ_QkW_a@T>RtWQ
zy}I%Zlt4Bq@B>L0_zz@oF*qeAXQvnCm*%C&1Nkfp%rI#n4N}3*;FDOHTBKkY19T;;
z0z~#d&~p#~3f_u2cPHQGI_$vV^7+60T|3rOM&@sKY4YkkS+w}L;q}tJ>z?gg@1@g~
zE+zW6v-o=0-<5F}uU?)1D0p5?UGe!Wwa$Mk^OM7KI+ic`-%_7>|J3fTf5E#?*0|`z
z{uQq2S^ntmsX4FwKd+1nk$Jr0)%*{6bL}4o{#|<JWM2L0wyXu;PYG}3Uiq){u8VPb
zjn4K}_IqcaV;7se!Se6qdmHU0ORC<Ro8<lLUuo_0nX4!MT2>_7CtJ5J=H&i^NfWNU
zs|tN)a{j85t@8YcwO?b~m+tb;W9w4we1D|u+os2cyUX9Kc*YXHYVnN==0~R=DSbA-
zB4XwKdyDM?{I<&N+BIjcZQ;jPdta5RM<2gjvVBJ1>r!?9U-MOKH&pI^u4#5`@{hw+
tg~mZUcmIf}y{4Vy9dSw0;D2OHDt~OA(E5GqmVN7A-`zjQ{HB-qBmnbF@nHY}

literal 0
HcmV?d00001

diff --git a/graphics/highscores.png b/graphics/highscores.png
new file mode 100644
index 0000000000000000000000000000000000000000..aebcd2a491d39aaa04a152c489951717ad1e45d5
GIT binary patch
literal 464
zcmV;>0WbcEP)<h;3K|Lk000e1NJLTq001}u000~a0ssI2yV>h$00001b5ch_0Itp)
z=>Px$ib+I4R9J<zS4*<PFbIn~@BUYI7nyn(AqgDkv1(%iLgtt2+L1ZuoU>E_o%~8^
zC(CC``?{_%26YTN04O8t*f|2KtjFi@Wc(!ScsoZxBVj6rCR@~wGX4Z;CgvuLdWwJH
zh}uz3H-JXM%;}wuw+=<=?YsaqVp93EsO?<6vGW4Zk{EbS8`cAYyFla3F50p)8dy~J
zc21>iK#?=r@T0!5W2D9CZgW<r59};y0rf2qIt$GTRbl;0|7+@Xz(q};waU(^P_MgN
z#fx@`37_oBG3`fX-T0NtO>MZrd}a9vUZl6&v<V8udO;J&RCL6#p1@na&Q!jVVrtHG
z@Uc+Ffn;o+F3x!y@&c@=*v=;qGU_h^=#10IyHOt}W+yCwLe{H32OYFjGZ59<k1?nS
za%Ctcl#Uumo$Aawa)jorYVKox>of0;Ao<jd(5=E$bi(gkaLp-77+s@9jdBx-|0+_e
zNk@2alo$v-J61Ve_Iw{L0xeVC>vUrCm1q1Sh!+-_f0Hk_K@ZO5S3N2K0000<MNUMn
GLSTYTV9~z-

literal 0
HcmV?d00001

diff --git a/linker-files/linker.scm b/linker-files/linker.scm
index 2951d50..7d71a02 100644
--- a/linker-files/linker.scm
+++ b/linker-files/linker.scm
@@ -7,8 +7,8 @@
 ;;;		(section (programStart #x801) (startup #x80e) code switch idata cdata data_init_table))
 		(section (programStart #x801) (startup #x80e) code))
 	(memory displayPage1 (address (#x2000 . #x3fff)) (type ram) (section loadscreen))
-	(memory datamem (address (#x4000 . #x91ff)) (type ram) (section cstack zdata data heap)) ;;; usermem goes from 0x4000 to 0x9FFFF (included), we are splitting it
-	(memory upperData (address (#x9200 . #x9fff)) (type ram) (section switch idata cdata data_init_table))
+	(memory datamem (address (#x4000 . #x8fff)) (type ram) (section cstack zdata data heap)) ;;; usermem goes from 0x4000 to 0x9FFFF (included), we are splitting it
+	(memory upperData (address (#x9000 . #x9fff)) (type ram) (section switch idata cdata data_init_table))
 	(memory displayPage2 (address (#xa000 . #xbfff)) (type ram))
 	(memory io (address (#xc000 . #xc0ff)) (type ram))
 	(memory rombank (address (#xc100 . #xffff)) (type rom))
diff --git a/src/game_graphics.c b/src/game_graphics.c
index 47ba2f8..34ef116 100644
--- a/src/game_graphics.c
+++ b/src/game_graphics.c
@@ -49,7 +49,7 @@ static const uint8_t box_content_win[BOX_CONTENT_SIZE] = {
 
 static const uint8_t box_content_lose[BOX_CONTENT_SIZE] = {
 	 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  7,  1, 13,  5,  0, 15, 22,  5, 18, 33,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+	 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  7,  1, 13,  5,  0, 15, 22,  5, 18, 33,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 	 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 	 0,  0, 77,  0, 77,  0, 83, 77, 84,  0, 77,  0, 77,  0,  0, 77,  0,  0,  0, 83, 77, 84,  0, 83, 77,192,  0, 77, 77, 77,  0,  0,
 	 0,  0, 77,  0, 77,  0, 77,  0, 77,  0, 77,  0, 77,  0,  0, 77,  0,  0,  0, 77,  0, 77,  0,212, 77, 84,  0, 77,  0,  0,  0,  0,
@@ -93,12 +93,19 @@ static const uint8_t box_content_start[BOX_CONTENT_SIZE] = {
 
 void draw_field_borders_on_buffer(uint8_t brd, uint8_t* buf);
 void draw_picture(uint8_t w, uint8_t h, uint8_t x, uint8_t y, const uint8_t *data, uint8_t *dest);
+void direct_draw_number(uint16_t n, uint8_t len, uint8_t x, uint8_t y, uint8_t *disp_buf);
+
 
 void ddraw_field_borders_on_buffer(uint8_t brd) {
 	draw_field_borders_on_buffer(brd, front_buf);
 }
 
-void draw_game_background(void) {
+
+#define HIGH_TEXT_X 32
+#define HIGH_TEXT_Y 107
+#define HIGH_TEXT_WIDTH 5
+
+void draw_game_background(uint16_t hi_score) {
 	// Draw the background on display page 1
 	uint8_t* buf = (uint8_t*)DISPLAY_PAGE_1;
 
@@ -108,6 +115,11 @@ void draw_game_background(void) {
 	// Draw required pics
 	draw_picture(SCORE_PIC_WIDTH_BYTES, SCORE_PIC_HEIGHT, 31, 14, score_pic_data, buf);
 	draw_picture(MOVES_PIC_WIDTH_BYTES, MOVES_PIC_HEIGHT, 31, 45, moves_pic_data, buf);
+	draw_picture(HIGH_PIC_WIDTH_BYTES,	HIGH_PIC_HEIGHT, 31, 76, high_pic_data, buf);
+	draw_picture(SCORE_PIC_WIDTH_BYTES, SCORE_PIC_HEIGHT, 31, 90, score_pic_data, buf);
+
+	// Draw the high-score. This won't change at every turn, so makes sense to just draw once
+	direct_draw_number(hi_score, HIGH_TEXT_WIDTH, HIGH_TEXT_X, HIGH_TEXT_Y, front_buf);
 
 	// Copy the data from display page 1 to 2
 	memcpy((void*)DISPLAY_PAGE_2, (void*)DISPLAY_PAGE_1, DISPLAY_PAGE_SIZE);
@@ -133,7 +145,7 @@ void ddraw_single_tile(uint8_t offset) {
 	}
 }
 
-void draw_number(uint16_t n, uint8_t len, uint8_t x, uint8_t y) {
+void direct_draw_number(uint16_t n, uint8_t len, uint8_t x, uint8_t y, uint8_t *disp_buf) {
 	uint8_t buf[len];
 	
 	// Decode the number into the buffer
@@ -142,11 +154,15 @@ void draw_number(uint16_t n, uint8_t len, uint8_t x, uint8_t y) {
 	for(uint8_t row = 0; row < CHAR_HEIGHT; row++) {
 		uint16_t offset =  line_offset_map[y + row];
 		for(uint8_t col = 0; col < len; col++) {
-			back_buf[(offset + (len - 1) - col) + x] = CHARSET[NUM_OFFSET + (buf[col] * CHAR_HEIGHT) + row];
+			disp_buf[(offset + (len - 1) - col) + x] = CHARSET[NUM_OFFSET + (buf[col] * CHAR_HEIGHT) + row];
 		}
 	}
 }
 
+void draw_number(uint16_t n, uint8_t len, uint8_t x, uint8_t y) {
+	direct_draw_number(n, len, x, y, back_buf);
+}
+
 void draw_tiles(void) {
 	uint8_t* grid = get_front_grid();
 	
diff --git a/src/game_graphics.h b/src/game_graphics.h
index ae5629d..eb04e18 100644
--- a/src/game_graphics.h
+++ b/src/game_graphics.h
@@ -21,7 +21,7 @@ typedef enum {
 } arrow_direction;
 
 void ddraw_field_borders_on_buffer(uint8_t brd);
-void draw_game_background(void);
+void draw_game_background(uint16_t hi_score);
 void draw_number(uint16_t n, uint8_t len, uint8_t x, uint8_t y);
 void draw_tiles(void);
 void ddraw_single_tile(uint8_t offset);
diff --git a/src/graph_misc_data.c b/src/graph_misc_data.c
index 1098e0d..0652f60 100644
--- a/src/graph_misc_data.c
+++ b/src/graph_misc_data.c
@@ -19,3 +19,13 @@ const uint8_t moves_pic_data[] = {
 	0x71, 0x0E, 0x0E, 0x7F, 0x6C, 0x03, 0x38, 0x66, 0x41, 0x07, 0x07, 0x3F, 0x3E, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x06, 0x00
 };
+
+const uint8_t high_pic_data[] = {
+	0x00, 0x00, 0x06, 0x60, 0x21, 0x30, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x64, 0x78, 0x51, 0x20, 0x00, 0x00, 0x00,
+	0x0E, 0x6E, 0x1D, 0x72, 0x70, 0x00, 0x00, 0x00, 0x06, 0x7E, 0x1E, 0x33, 0x30, 0x00, 0x00, 0x00, 0x0E, 0x33,
+	0x0E, 0x71, 0x18, 0x00, 0x00, 0x00, 0x07, 0x7B, 0x05, 0x38, 0x18, 0x00, 0x00, 0x00, 0x5F, 0x1B, 0x07, 0x79,
+	0x1D, 0x00, 0x00, 0x00, 0x7B, 0x59, 0x73, 0x59, 0x0F, 0x00, 0x00, 0x40, 0x27, 0x5D, 0x43, 0x3C, 0x0A, 0x00,
+	0x00, 0x20, 0x51, 0x4C, 0x61, 0x0A, 0x05, 0x00, 0x00, 0x40, 0x71, 0x4C, 0x63, 0x0C, 0x07, 0x00, 0x00, 0x60,
+	0x61, 0x06, 0x31, 0x0E, 0x06, 0x00, 0x00, 0x60, 0x30, 0x02, 0x3E, 0x06, 0x03, 0x00, 0x00, 0x20, 0x20, 0x00,
+	0x00, 0x02, 0x02, 0x00
+};
diff --git a/src/graph_misc_data.h b/src/graph_misc_data.h
index 3626703..e3f1724 100644
--- a/src/graph_misc_data.h
+++ b/src/graph_misc_data.h
@@ -11,4 +11,8 @@ extern const uint8_t score_pic_data[];
 #define MOVES_PIC_HEIGHT 14
 extern const uint8_t moves_pic_data[];
 
+#define HIGH_PIC_WIDTH_BYTES 8
+#define HIGH_PIC_HEIGHT 14
+extern const uint8_t high_pic_data[];
+
 #endif /* _GRAPH_MISC_DATA_HEADER_ */
diff --git a/src/main.c b/src/main.c
index 335f694..96d4195 100644
--- a/src/main.c
+++ b/src/main.c
@@ -22,6 +22,9 @@
 #define SCORE_TEXT_Y 29
 #define SCORE_TEXT_WIDTH 5
 
+#define HIGH_TEXT_X 32
+#define HIGH_TEXT_Y 107
+
 #define WIN_SCORE_BONUS 10000
 
 void init(void);
@@ -64,7 +67,7 @@ __task int main(void) {
 		score = reset_game();
 
 		// Draw the initial state of the game
-		draw_game_background();
+		draw_game_background(hi_score);
 		draw_number(moves_count, MOVES_TEXT_WIDTH, MOVES_TEXT_X, MOVES_TEXT_Y);
 		draw_number(score, SCORE_TEXT_WIDTH, SCORE_TEXT_X, SCORE_TEXT_Y);
 		draw_tiles();