From f7e7482c491584966dbc77c2926a57b938100b78 Mon Sep 17 00:00:00 2001
From: David Volovskiy <devolov@gmail.com>
Date: Tue, 12 Aug 2025 19:43:28 -0400
Subject: [PATCH] Moved away from watch_display_string

---
 .../complication/higher_lower_game_face.c     | 36 +++++++++----------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/watch-faces/complication/higher_lower_game_face.c b/watch-faces/complication/higher_lower_game_face.c
index 260412d9..cfbbb98e 100755
--- a/watch-faces/complication/higher_lower_game_face.c
+++ b/watch-faces/complication/higher_lower_game_face.c
@@ -37,8 +37,6 @@
 #define MAX_BOARDS 40
 #define GUESSES_PER_SCREEN 5
 #define WIN_SCORE (MAX_BOARDS * GUESSES_PER_SCREEN)
-#define STATUS_DISPLAY_START 0
-#define BOARD_SCORE_DISPLAY_START 2
 #define BOARD_DISPLAY_START 4
 #define BOARD_DISPLAY_END 9
 #define MIN_CARD_VALUE 2
@@ -141,8 +139,8 @@ static void reset_board(bool first_round) {
 
 static void init_game(void) {
     watch_clear_display();
-    watch_display_string(TITLE_TEXT, BOARD_DISPLAY_START);
-    watch_display_string("GA", STATUS_DISPLAY_START);
+    watch_display_text(WATCH_POSITION_BOTTOM, TITLE_TEXT);
+    watch_display_text(WATCH_POSITION_TOP_LEFT, "HL");
     reset_deck();
     reset_board(true);
     score = 0;
@@ -214,16 +212,16 @@ static void render_board_count(void) {
     // Render completed boards (screens)
     char buf[3] = {0};
     snprintf(buf, sizeof(buf), "%2hhu", completed_board_count);
-    watch_display_string(buf, BOARD_SCORE_DISPLAY_START);
+    watch_display_text(WATCH_POSITION_TOP_RIGHT, buf);
 }
 
 static void render_final_score(void) {
-    watch_display_string("SC", STATUS_DISPLAY_START);
+    watch_display_text_with_fallback(WATCH_POSITION_TOP_LEFT, "SCO", "SC");
     char buf[7] = {0};
     const uint8_t complete_boards = score / GUESSES_PER_SCREEN;
     snprintf(buf, sizeof(buf), "%2hu %03hu", complete_boards, score);
     watch_set_colon();
-    watch_display_string(buf, BOARD_DISPLAY_START);
+    watch_display_text(WATCH_POSITION_BOTTOM, buf);
 }
 
 static guess_t get_answer(void) {
@@ -256,13 +254,13 @@ static void do_game_loop(guess_t user_guess) {
             // Render answer indicator
             switch (answer) {
                 case HL_GUESS_EQUAL:
-                    watch_display_string("==", STATUS_DISPLAY_START);
+                    watch_display_text(WATCH_POSITION_TOP_LEFT, "==");
                     break;
                 case HL_GUESS_HIGHER:
-                    watch_display_string("HI", STATUS_DISPLAY_START);
+                    watch_display_text(WATCH_POSITION_TOP_LEFT, "HI");
                     break;
                 case HL_GUESS_LOWER:
-                    watch_display_string("LO", STATUS_DISPLAY_START);
+                    watch_display_text(WATCH_POSITION_TOP_LEFT, "LO");
                     break;
             }
 
@@ -273,7 +271,7 @@ static void do_game_loop(guess_t user_guess) {
                 // No score for two consecutive identical cards
             } else {
                 // Incorrect guess, game over
-                watch_display_string("GO", STATUS_DISPLAY_START);
+                watch_display_text_with_fallback(WATCH_POSITION_TOP_LEFT, "End", "GO");
                 game_board[guess_position].revealed = true;
                 render_board_position(guess_position);
                 game_state = HL_GS_LOSE;
@@ -282,9 +280,9 @@ static void do_game_loop(guess_t user_guess) {
 
             if (score >= WIN_SCORE) {
                 // Win, perhaps some kind of animation sequence?
-                watch_display_string("WI", STATUS_DISPLAY_START);
-                watch_display_string("  ", BOARD_SCORE_DISPLAY_START);
-                watch_display_string("------", BOARD_DISPLAY_START);
+                watch_display_text_with_fallback(WATCH_POSITION_TOP_LEFT, "WIN", "WI");
+                watch_display_text(WATCH_POSITION_TOP_RIGHT, "  ");
+                watch_display_text(WATCH_POSITION_BOTTOM, "------");
                 game_state = HL_GS_WIN;
                 return;
             }
@@ -314,12 +312,12 @@ static void do_game_loop(guess_t user_guess) {
             break;
         case HL_GS_SHOW_SCORE:
             watch_clear_display();
-            watch_display_string(TITLE_TEXT, BOARD_DISPLAY_START);
-            watch_display_string("GA", STATUS_DISPLAY_START);
+            watch_display_text(WATCH_POSITION_BOTTOM, TITLE_TEXT);
+            watch_display_text(WATCH_POSITION_TOP_LEFT, "HL");
             game_state = HL_GS_TITLE_SCREEN;
             break;
         default:
-            watch_display_string("ERROR", BOARD_DISPLAY_START);
+            watch_display_text(WATCH_POSITION_BOTTOM, "ERROR");
             break;
     }
 }
@@ -358,8 +356,8 @@ bool higher_lower_game_face_loop(movement_event_t event, void *context) {
     switch (event.event_type) {
         case EVENT_ACTIVATE:
             // Show your initial UI here.
-            watch_display_string(TITLE_TEXT, BOARD_DISPLAY_START);
-            watch_display_string("GA", STATUS_DISPLAY_START);
+            watch_display_text(WATCH_POSITION_BOTTOM, TITLE_TEXT);
+            watch_display_text(WATCH_POSITION_TOP_LEFT, "HL");
             break;
         case EVENT_TICK:
             // If needed, update your display here.