From bd61e21ba04ce57e7b20181cd9b0503f256287a3 Mon Sep 17 00:00:00 2001
From: Brycey92 <bbrowner@optonline.net>
Date: Fri, 18 Nov 2022 02:22:02 -0500
Subject: [PATCH 01/26] Add pause on start button to tiltrads

---
 main/modes/mode_tiltrads.c | 384 ++++++++++++++++++++-----------------
 1 file changed, 211 insertions(+), 173 deletions(-)

diff --git a/main/modes/mode_tiltrads.c b/main/modes/mode_tiltrads.c
index 043cf649..0dd1bc61 100644
--- a/main/modes/mode_tiltrads.c
+++ b/main/modes/mode_tiltrads.c
@@ -42,6 +42,7 @@
 #define BTN_GAME_HARD_DROP UP
 #define BTN_GAME_ROTATE_CW BTN_A
 #define BTN_GAME_ROTATE_ACW BTN_B
+#define BTN_GAME_PAUSE START
 
 // Controls (scores)
 #define BTN_SCORES_CLEAR_SCORES SELECT
@@ -1345,6 +1346,7 @@ typedef struct
     int64_t dropTimer;  // The timer for dropping the current tetrad one level.
     int64_t dropTime; // The amount of time it takes for a tetrad to drop. Changes based on the level.
     int64_t dropFXTime; // This is specifically used for handling the perspective effect correctly with regards to increasing dropSpeed.
+    bool isPaused;
     
     // Score related vars
     uint32_t linesClearedTotal; // The number of lines cleared total.
@@ -1795,6 +1797,11 @@ void ttTitleInput(void)
 
 void ttGameInput(void)
 {
+    if (ttIsButtonPressed(BTN_GAME_PAUSE))
+    {
+        tiltrads->isPaused = !tiltrads->isPaused;
+    }
+
     // Reset the check for if the active tetrad moved, dropped, or landed.
     tiltrads->activeTetradChange = false;
 
@@ -1802,7 +1809,7 @@ void ttGameInput(void)
     refreshTetradsGrid(GRID_COLS, GRID_ROWS, tiltrads->tetradsGrid, tiltrads->landedTetrads, &(tiltrads->activeTetrad), false);
 
     // Only respond to input when the clear animation isn't running.
-    if (!tiltrads->inClearAnimation)
+    if (!tiltrads->inClearAnimation && !tiltrads->isPaused)
     {
         // Rotate piece.
         if(ttIsButtonPressed(BTN_GAME_ROTATE_CW))
@@ -1942,221 +1949,224 @@ void ttGameUpdate(void)
     // Refresh the tetrads grid.
     refreshTetradsGrid(GRID_COLS, GRID_ROWS, tiltrads->tetradsGrid, tiltrads->landedTetrads, &(tiltrads->activeTetrad), false);
 
-    // Land tetrad.
-    // Update score.
-    // Start clear animation.
-    // End clear animation.
-    // Clear lines.
-    // Spawn new active tetrad.
-
-    if (tiltrads->inClearAnimation)
+    if (!tiltrads->isPaused)
     {
-        tiltrads->clearTimer += tiltrads->deltaTime;
-
-        double clearProgress = (double)tiltrads->clearTimer / (double)tiltrads->clearTime;
-        singlePulseLEDs(NUM_LEDS, clearColor, clearProgress);
-
-        if (tiltrads->clearTimer >= tiltrads->clearTime)
+        // Land tetrad.
+        // Update score.
+        // Start clear animation.
+        // End clear animation.
+        // Clear lines.
+        // Spawn new active tetrad.
+
+        if (tiltrads->inClearAnimation)
         {
-            stopClearAnimation();
+            tiltrads->clearTimer += tiltrads->deltaTime;
 
-            // Actually clear the lines.
-            clearLines(GRID_COLS, GRID_ROWS, tiltrads->tetradsGrid, tiltrads->landedTetrads);
-
-            // Spawn the next tetrad.
-            spawnNextTetrad(&(tiltrads->activeTetrad), tiltrads->randomizer, tiltrads->tetradCounter, GRID_COLS, GRID_ROWS, tiltrads->tetradsGrid);
-
-            // Reset the drop info to whatever is appropriate for the current level.
-            tiltrads->dropTime = getDropTime(tiltrads->currentLevel);
-            tiltrads->dropTimer = 0;
+            double clearProgress = (double)tiltrads->clearTimer / (double)tiltrads->clearTime;
+            singlePulseLEDs(NUM_LEDS, clearColor, clearProgress);
 
-            // There's a new active tetrad, so that's a change.
-            tiltrads->activeTetradChange = true;
-        }
-    }
-    else
-    {
-#ifndef NO_STRESS_TRIS
-        tiltrads->dropTimer += tiltrads->deltaTime;
-#endif
+            if (tiltrads->clearTimer >= tiltrads->clearTime)
+            {
+                stopClearAnimation();
 
-        // Update the LED FX.
-        // Progress is the drop time for this row. (Too fast)
-        //double dropProgress = (double)tiltrads->dropTimer / (double)tiltrads->dropTime;
+                // Actually clear the lines.
+                clearLines(GRID_COLS, GRID_ROWS, tiltrads->tetradsGrid, tiltrads->landedTetrads);
 
-        // Progress is how close it is to landing on the floor. (Too nebulous or unhelpful?)
-        double totalFallTime = (GRID_ROWS - 1) * tiltrads->dropTime;
-        int32_t fallDistance = getFallDistance(&(tiltrads->activeTetrad), GRID_COLS, GRID_ROWS, tiltrads->tetradsGrid);
+                // Spawn the next tetrad.
+                spawnNextTetrad(&(tiltrads->activeTetrad), tiltrads->randomizer, tiltrads->tetradCounter, GRID_COLS, GRID_ROWS, tiltrads->tetradsGrid);
 
-        double totalFallProgress = totalFallTime - (((fallDistance + 1) * tiltrads->dropTime) - tiltrads->dropTimer);
-        double countdownProgress = totalFallProgress / totalFallTime;
+                // Reset the drop info to whatever is appropriate for the current level.
+                tiltrads->dropTime = getDropTime(tiltrads->currentLevel);
+                tiltrads->dropTimer = 0;
 
-        // NOTE: this check is here because under unknown circumstances the math above can produce bad countdownProgress values, causing a slight flicker when a tetrad lands.
-        // Ideally the math above should be fixed, but this is an acceptable fix for now.
-        if (countdownProgress >= 0.0 && countdownProgress <= 1.0)
-        {
-            countdownLEDs(NUM_LEDS, tetradColors[tiltrads->activeTetrad.type - 1], countdownProgress);
+                // There's a new active tetrad, so that's a change.
+                tiltrads->activeTetradChange = true;
+            }
         }
-
-        if (tiltrads->dropTimer >= tiltrads->dropTime)
+        else
         {
-            tiltrads->dropTimer = 0;
+    #ifndef NO_STRESS_TRIS
+            tiltrads->dropTimer += tiltrads->deltaTime;
+    #endif
 
-            // The active tetrad has either dropped or landed, redraw required either way.
-            tiltrads->activeTetradChange = true;
+            // Update the LED FX.
+            // Progress is the drop time for this row. (Too fast)
+            //double dropProgress = (double)tiltrads->dropTimer / (double)tiltrads->dropTime;
 
-            if (ttIsButtonDown(BTN_GAME_SOFT_DROP))
+            // Progress is how close it is to landing on the floor. (Too nebulous or unhelpful?)
+            double totalFallTime = (GRID_ROWS - 1) * tiltrads->dropTime;
+            int32_t fallDistance = getFallDistance(&(tiltrads->activeTetrad), GRID_COLS, GRID_ROWS, tiltrads->tetradsGrid);
+
+            double totalFallProgress = totalFallTime - (((fallDistance + 1) * tiltrads->dropTime) - tiltrads->dropTimer);
+            double countdownProgress = totalFallProgress / totalFallTime;
+
+            // NOTE: this check is here because under unknown circumstances the math above can produce bad countdownProgress values, causing a slight flicker when a tetrad lands.
+            // Ideally the math above should be fixed, but this is an acceptable fix for now.
+            if (countdownProgress >= 0.0 && countdownProgress <= 1.0)
             {
-                tiltrads->score += SCORE_SOFT_DROP;
+                countdownLEDs(NUM_LEDS, tetradColors[tiltrads->activeTetrad.type - 1], countdownProgress);
             }
 
-            // If we couldn't drop, then we've landed.
-            if (!dropTetrad(&(tiltrads->activeTetrad), GRID_COLS, GRID_ROWS, tiltrads->tetradsGrid))
+            if (tiltrads->dropTimer >= tiltrads->dropTime)
             {
-                tiltrads->landTetradFX = true;
+                tiltrads->dropTimer = 0;
+
+                // The active tetrad has either dropped or landed, redraw required either way.
+                tiltrads->activeTetradChange = true;
 
-                // Land the current tetrad.
-                tetrad_t* landedTetrad = malloc(sizeof(tetrad_t));
-                landedTetrad->type = tiltrads->activeTetrad.type;
-                landedTetrad->gridValue = tiltrads->activeTetrad.gridValue;
-                landedTetrad->rotation = tiltrads->activeTetrad.rotation;
-                landedTetrad->topLeft = tiltrads->activeTetrad.topLeft;
+                if (ttIsButtonDown(BTN_GAME_SOFT_DROP))
+                {
+                    tiltrads->score += SCORE_SOFT_DROP;
+                }
 
-                coord_t origin;
-                origin.c = 0;
-                origin.r = 0;
-                copyGrid(origin, TETRAD_GRID_SIZE, TETRAD_GRID_SIZE, tiltrads->activeTetrad.shape, TETRAD_GRID_SIZE, TETRAD_GRID_SIZE,
-                         landedTetrad->shape);
+                // If we couldn't drop, then we've landed.
+                if (!dropTetrad(&(tiltrads->activeTetrad), GRID_COLS, GRID_ROWS, tiltrads->tetradsGrid))
+                {
+                    tiltrads->landTetradFX = true;
 
-                push(tiltrads->landedTetrads, landedTetrad);
+                    // Land the current tetrad.
+                    tetrad_t* landedTetrad = malloc(sizeof(tetrad_t));
+                    landedTetrad->type = tiltrads->activeTetrad.type;
+                    landedTetrad->gridValue = tiltrads->activeTetrad.gridValue;
+                    landedTetrad->rotation = tiltrads->activeTetrad.rotation;
+                    landedTetrad->topLeft = tiltrads->activeTetrad.topLeft;
 
-                tiltrads->tetradCounter++;
+                    coord_t origin;
+                    origin.c = 0;
+                    origin.r = 0;
+                    copyGrid(origin, TETRAD_GRID_SIZE, TETRAD_GRID_SIZE, tiltrads->activeTetrad.shape, TETRAD_GRID_SIZE, TETRAD_GRID_SIZE,
+                            landedTetrad->shape);
 
-                // Check for any clears now that the new tetrad has landed.
-                uint32_t linesClearedThisDrop = checkLineClears(GRID_COLS, GRID_ROWS, tiltrads->tetradsGrid, tiltrads->landedTetrads);
+                    push(tiltrads->landedTetrads, landedTetrad);
 
-                int32_t landingSFX;
+                    tiltrads->tetradCounter++;
 
-                switch( linesClearedThisDrop )
-                {
-                    case 1:
-                        tiltrads->score += SCORE_SINGLE * (tiltrads->currentLevel + 1);
-                        buzzer_play_sfx(&singleLineClearSFX);
-                        break;
-                    case 2:
-                        tiltrads->score += SCORE_DOUBLE * (tiltrads->currentLevel + 1);
-                        buzzer_play_sfx(&doubleLineClearSFX);
-                        break;
-                    case 3:
-                        tiltrads->score += SCORE_TRIPLE * (tiltrads->currentLevel + 1);
-                        buzzer_play_sfx(&tripleLineClearSFX);
-                        break;
-                    case 4:
-                        tiltrads->score += SCORE_QUAD * (tiltrads->currentLevel + 1);
-                        buzzer_play_sfx(&quadLineClearSFX);
-                        break;
-                    case 0:
-                        // Full grid height is GRID_ROWS, we have NUM_LAND_FX SFX, offset results by an amount so that sfx[15] correctly plays at the playfield floor and the first row above it.
-                        landingSFX = getLowestActiveRow(landedTetrad) - ((GRID_ROWS - NUM_LAND_FX) - 1);
-                        if (landingSFX < 0)
-                        {
-                            landingSFX = 0;
-                        }
-                        if (landingSFX > NUM_LAND_FX - 1)
-                        {
-                            landingSFX = NUM_LAND_FX - 1;
-                        }
-                        buzzer_play_sfx(landSFX[landingSFX]);
-                        break;
-                    default:    // Are more than 4 line clears possible? I don't think so.
-                        break;
-                }
+                    // Check for any clears now that the new tetrad has landed.
+                    uint32_t linesClearedThisDrop = checkLineClears(GRID_COLS, GRID_ROWS, tiltrads->tetradsGrid, tiltrads->landedTetrads);
 
-                // This code assumes building combo, and combos are sums of lines cleared.
-                if (tiltrads->linesClearedLastDrop > 0 && linesClearedThisDrop > 0)
-                {
-                    tiltrads->comboCount += linesClearedThisDrop;
-                    tiltrads->score += SCORE_COMBO * tiltrads->comboCount * (tiltrads->currentLevel + 1);
-                }
-                else
-                {
-                    tiltrads->comboCount = 0;
-                }
+                    int32_t landingSFX;
+
+                    switch( linesClearedThisDrop )
+                    {
+                        case 1:
+                            tiltrads->score += SCORE_SINGLE * (tiltrads->currentLevel + 1);
+                            buzzer_play_sfx(&singleLineClearSFX);
+                            break;
+                        case 2:
+                            tiltrads->score += SCORE_DOUBLE * (tiltrads->currentLevel + 1);
+                            buzzer_play_sfx(&doubleLineClearSFX);
+                            break;
+                        case 3:
+                            tiltrads->score += SCORE_TRIPLE * (tiltrads->currentLevel + 1);
+                            buzzer_play_sfx(&tripleLineClearSFX);
+                            break;
+                        case 4:
+                            tiltrads->score += SCORE_QUAD * (tiltrads->currentLevel + 1);
+                            buzzer_play_sfx(&quadLineClearSFX);
+                            break;
+                        case 0:
+                            // Full grid height is GRID_ROWS, we have NUM_LAND_FX SFX, offset results by an amount so that sfx[15] correctly plays at the playfield floor and the first row above it.
+                            landingSFX = getLowestActiveRow(landedTetrad) - ((GRID_ROWS - NUM_LAND_FX) - 1);
+                            if (landingSFX < 0)
+                            {
+                                landingSFX = 0;
+                            }
+                            if (landingSFX > NUM_LAND_FX - 1)
+                            {
+                                landingSFX = NUM_LAND_FX - 1;
+                            }
+                            buzzer_play_sfx(landSFX[landingSFX]);
+                            break;
+                        default:    // Are more than 4 line clears possible? I don't think so.
+                            break;
+                    }
+
+                    // This code assumes building combo, and combos are sums of lines cleared.
+                    if (tiltrads->linesClearedLastDrop > 0 && linesClearedThisDrop > 0)
+                    {
+                        tiltrads->comboCount += linesClearedThisDrop;
+                        tiltrads->score += SCORE_COMBO * tiltrads->comboCount * (tiltrads->currentLevel + 1);
+                    }
+                    else
+                    {
+                        tiltrads->comboCount = 0;
+                    }
 
-                // Increase total number of lines cleared.
-                tiltrads->linesClearedTotal += linesClearedThisDrop;
+                    // Increase total number of lines cleared.
+                    tiltrads->linesClearedTotal += linesClearedThisDrop;
 
-                // Update the level if necessary.
-                tiltrads->currentLevel = tiltrads->linesClearedTotal / LINE_CLEARS_PER_LEVEL;
+                    // Update the level if necessary.
+                    tiltrads->currentLevel = tiltrads->linesClearedTotal / LINE_CLEARS_PER_LEVEL;
 
-                // Keep track of the last number of line clears.
-                tiltrads->linesClearedLastDrop = linesClearedThisDrop;
+                    // Keep track of the last number of line clears.
+                    tiltrads->linesClearedLastDrop = linesClearedThisDrop;
 
-                if (linesClearedThisDrop > 0)
-                {
-                    // Start the clear animation.
-                    startClearAnimation(linesClearedThisDrop);
-                }
-                else
-                {
-                    // Spawn the next tetrad.
-                    spawnNextTetrad(&(tiltrads->activeTetrad), tiltrads->randomizer, tiltrads->tetradCounter, GRID_COLS, GRID_ROWS, tiltrads->tetradsGrid);
+                    if (linesClearedThisDrop > 0)
+                    {
+                        // Start the clear animation.
+                        startClearAnimation(linesClearedThisDrop);
+                    }
+                    else
+                    {
+                        // Spawn the next tetrad.
+                        spawnNextTetrad(&(tiltrads->activeTetrad), tiltrads->randomizer, tiltrads->tetradCounter, GRID_COLS, GRID_ROWS, tiltrads->tetradsGrid);
 
-                    // Reset the drop info to whatever is appropriate for the current level.
-                    tiltrads->dropTime = getDropTime(tiltrads->currentLevel);
-                    tiltrads->dropTimer = 0;
+                        // Reset the drop info to whatever is appropriate for the current level.
+                        tiltrads->dropTime = getDropTime(tiltrads->currentLevel);
+                        tiltrads->dropTimer = 0;
+                    }
                 }
-            }
-
-            // Clear out empty tetrads.
-            node_t* current = tiltrads->landedTetrads->last;
-            for (int32_t t = tiltrads->landedTetrads->length - 1; t >= 0; t--)
-            {
-                tetrad_t* currentTetrad = (tetrad_t*)current->val;
-                bool empty = true;
 
-                // Go from bottom-to-top on each position of the tetrad.
-                for (int32_t tr = TETRAD_GRID_SIZE - 1; tr >= 0; tr--)
+                // Clear out empty tetrads.
+                node_t* current = tiltrads->landedTetrads->last;
+                for (int32_t t = tiltrads->landedTetrads->length - 1; t >= 0; t--)
                 {
-                    for (int32_t tc = 0; tc < TETRAD_GRID_SIZE; tc++)
+                    tetrad_t* currentTetrad = (tetrad_t*)current->val;
+                    bool empty = true;
+
+                    // Go from bottom-to-top on each position of the tetrad.
+                    for (int32_t tr = TETRAD_GRID_SIZE - 1; tr >= 0; tr--)
                     {
-                        if (currentTetrad->shape[tr][tc] != EMPTY)
+                        for (int32_t tc = 0; tc < TETRAD_GRID_SIZE; tc++)
                         {
-                            empty = false;
+                            if (currentTetrad->shape[tr][tc] != EMPTY)
+                            {
+                                empty = false;
+                            }
                         }
                     }
-                }
 
-                // Adjust the current counter.
-                current = current->prev;
+                    // Adjust the current counter.
+                    current = current->prev;
 
-                // Remove the empty tetrad.
-                if (empty)
-                {
-                    tetrad_t* emptyTetrad = removeIdx(tiltrads->landedTetrads, t);
-                    free(emptyTetrad);
+                    // Remove the empty tetrad.
+                    if (empty)
+                    {
+                        tetrad_t* emptyTetrad = removeIdx(tiltrads->landedTetrads, t);
+                        free(emptyTetrad);
+                    }
                 }
-            }
 
-            refreshTetradsGrid(GRID_COLS, GRID_ROWS, tiltrads->tetradsGrid, tiltrads->landedTetrads, &(tiltrads->activeTetrad), false);
+                refreshTetradsGrid(GRID_COLS, GRID_ROWS, tiltrads->tetradsGrid, tiltrads->landedTetrads, &(tiltrads->activeTetrad), false);
 
-            // Handle cascade from tetrads that can now fall freely.
-            /*bool possibleCascadeClear = false;
-            for (int32_t t = 0; t < numLandedTetrads; t++)
-            {
-                // If a tetrad could drop, then more clears might have happened.
-                if (dropTetrad(&(landedTetrads[t]), GRID_COLS, GRID_ROWS, tetradsGrid))
+                // Handle cascade from tetrads that can now fall freely.
+                /*bool possibleCascadeClear = false;
+                for (int32_t t = 0; t < numLandedTetrads; t++)
                 {
-                    possibleCascadeClear = true;
+                    // If a tetrad could drop, then more clears might have happened.
+                    if (dropTetrad(&(landedTetrads[t]), GRID_COLS, GRID_ROWS, tetradsGrid))
+                    {
+                        possibleCascadeClear = true;
+                    }
                 }
-            }
 
 
-            if (possibleCascadeClear)
-            {
-                // Check for any clears now that this new.
-                checkLineClears(GRID_COLS, GRID_ROWS, tetradsGrid, landedTetrads);
-            }*/
+                if (possibleCascadeClear)
+                {
+                    // Check for any clears now that this new.
+                    checkLineClears(GRID_COLS, GRID_ROWS, tetradsGrid, landedTetrads);
+                }*/
+            }
         }
     }
 
@@ -2416,6 +2426,34 @@ void ttGameDisplay(void)
     playTextX = getCenteredTextX(&(tiltrads->ibm_vga8), "UP/DOWN", xFromGridCol(GRID_X, GRID_COLS, GRID_UNIT_SIZE), tiltrads->disp->w);
     playTextY = tiltrads->disp->h - (tiltrads->ibm_vga8.h * botIncrement);
     drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, "UP/DOWN", playTextX, playTextY);
+
+    if (tiltrads->isPaused)
+    {
+        // Draw a centered bordered window.
+        int16_t leftWindowXMargin = 82;
+        int16_t rightWindowXMargin = 80;
+        int16_t windowYMarginTop = 99;
+        int16_t windowYMarginBot = 99;
+
+        int16_t titleTextYOffset = 3;
+        int16_t controlTextYOffset = tiltrads->disp->h - windowYMarginBot - tiltrads->ibm_vga8.h - 2;
+        int16_t controlTextXPadding = 2;
+
+        // Draw a centered bordered window.
+        fillDisplayArea(tiltrads->disp, leftWindowXMargin, windowYMarginTop, tiltrads->disp->w - rightWindowXMargin, tiltrads->disp->h - windowYMarginBot, c000);
+        plotRect(tiltrads->disp, leftWindowXMargin, windowYMarginTop, tiltrads->disp->w - rightWindowXMargin, tiltrads->disp->h - windowYMarginBot, c540);
+
+        // PAUSED
+        int16_t headerTextX = getCenteredTextX(&(tiltrads->ibm_vga8), "PAUSED", 0, tiltrads->disp->w);
+        drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, "PAUSED", headerTextX, windowYMarginTop + titleTextYOffset);
+
+        // START TO RESUME (centered)
+        //drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, "START TO RESUME", (tiltrads->disp->w + leftWindowXMargin - rightWindowXMargin - textWidth(&(tiltrads->ibm_vga8), "START TO RESUME")) / 2 + controlTextXPadding, controlTextYOffset);
+
+        // START TO RESUME (cheating)
+        drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, "START", leftWindowXMargin + controlTextXPadding, controlTextYOffset);
+        drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, "TO RESUME", tiltrads->disp->w - rightWindowXMargin - textWidth(&(tiltrads->ibm_vga8), "TO RESUME") - controlTextXPadding, controlTextYOffset);
+    }
 }
 
 void ttScoresDisplay(void)
@@ -2547,8 +2585,8 @@ void ttGameoverDisplay(void)
         snprintf(scoreStr, sizeof(scoreStr), "%d", tiltrads->score);
         drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, scoreStr, tiltrads->gameoverScoreX, windowYMarginTop + scoreTextYOffset);
 
-        // SELECT FOR   START TO
-        // TITLE         RESTART
+        // SELECT    START
+        // TITLE   RESTART
         drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, "SELECT", leftWindowXMargin + controlTextXPadding, controlTextYOffset - tiltrads->ibm_vga8.h - 1);
         drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, "TITLE", leftWindowXMargin + controlTextXPadding, controlTextYOffset);
 

From d7f5b568417e681592351ea615fe55d6d2ffd1a0 Mon Sep 17 00:00:00 2001
From: Brycey92 <bbrowner@optonline.net>
Date: Fri, 18 Nov 2022 03:05:12 -0500
Subject: [PATCH 02/26] Stop/restart tiltrads game music when paused/unpaused

The restart is commented out because the initial play is commented out too
---
 main/modes/mode_tiltrads.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/main/modes/mode_tiltrads.c b/main/modes/mode_tiltrads.c
index 0dd1bc61..6a7cef3f 100644
--- a/main/modes/mode_tiltrads.c
+++ b/main/modes/mode_tiltrads.c
@@ -1800,6 +1800,15 @@ void ttGameInput(void)
     if (ttIsButtonPressed(BTN_GAME_PAUSE))
     {
         tiltrads->isPaused = !tiltrads->isPaused;
+
+        if(tiltrads->isPaused)
+        {
+            buzzer_stop();
+        }
+        else
+        {
+            //buzzer_play_bgm(&gameMusic);
+        }
     }
 
     // Reset the check for if the active tetrad moved, dropped, or landed.

From 615c3221cb106d5738ab8d1a344bde6c05bc87a4 Mon Sep 17 00:00:00 2001
From: Brycey92 <bbrowner@optonline.net>
Date: Fri, 18 Nov 2022 17:25:54 -0500
Subject: [PATCH 03/26] Replace ambiguous empty picross row/col hints with 0s

This is the method Nintendo uses to indicate empty rows, rather than using empty hints like the swadge game did. There is less ambiguity in this new method, as some grid-style games use empty hints just to increase difficulty, instead of indicating empty rows.

I still need to have the 0s start grayed out on level start, but the new behavior is definitively clearer than before even without the level-start graying fix.
---
 main/modes/picross/mode_picross.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/main/modes/picross/mode_picross.c b/main/modes/picross/mode_picross.c
index 936c40a4..2397801b 100644
--- a/main/modes/picross/mode_picross.c
+++ b/main/modes/picross/mode_picross.c
@@ -1311,6 +1311,11 @@ void drawHint(display_t* d,font_t* font, picrossHint_t hint)
                 j++;
             }
         }
+
+        if(j == 0)
+        {
+            drawNumberAtCoord(d,font,hintColor,0,-1,hint.index,0,0);
+        }
     }else{
         uint8_t j = 0;
          //if current col, draw background square
@@ -1324,12 +1329,17 @@ void drawHint(display_t* d,font_t* font, picrossHint_t hint)
         //draw the line of hints
         for(uint8_t i = 0;i<PICROSS_MAX_HINTCOUNT;i++)
         {
-            h = hint.hints[PICROSS_MAX_HINTCOUNT-1-i];      
+            h = hint.hints[PICROSS_MAX_HINTCOUNT-1-i];
             if(h != 0){
                 drawNumberAtCoord(d,font,hintColor,h,hint.index,-j-1,0,0);
                 j++;
             }
         }
+
+        if(j == 0)
+        {
+            drawNumberAtCoord(d,font,hintColor,0,hint.index,-1,0,0);
+        }
     }
 }
 /**
@@ -1370,7 +1380,7 @@ int8_t getHintShift(uint8_t hint)
     switch(hint)
     {
         case 0:
-            return 0;
+            return p->vFontPad + 2;
         case 1:
             return p->vFontPad + 2;
         case 2:

From ea664d8af817065e68164960cce69bd5534d9689 Mon Sep 17 00:00:00 2001
From: Brycey92 <bbrowner@optonline.net>
Date: Fri, 18 Nov 2022 20:00:34 -0500
Subject: [PATCH 04/26] Gray out "0" hints at level start

---
 main/modes/picross/mode_picross.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/main/modes/picross/mode_picross.c b/main/modes/picross/mode_picross.c
index 2397801b..dc215121 100644
--- a/main/modes/picross/mode_picross.c
+++ b/main/modes/picross/mode_picross.c
@@ -244,6 +244,9 @@ void picrossSetupPuzzle(bool cont)
     p->vFontPad = (p->drawScale - p->hintFont.h)/2;
     //Calculate the shift to move the font square to the center of the level square.
     //fontShiftLeft = p->hont_font->w
+
+    //Check the level immediately, in case there are any empty rows or columns whose hints we need to gray out at the start
+    picrossCheckLevel();
 }
 
 //Scans the levelWSG and creates the finished version of the puzzle in the proper data format (2D array of enum).

From 7eb44e392101da8e6bf33f70b7860df2511ba297 Mon Sep 17 00:00:00 2001
From: Brycey92 <bbrowner@optonline.net>
Date: Sat, 19 Nov 2022 21:25:56 -0500
Subject: [PATCH 05/26] Initial text positioning for switch gamepad touch
 labels

---
 main/modes/mode_gamepad.c | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/main/modes/mode_gamepad.c b/main/modes/mode_gamepad.c
index 5953e5bc..cb38dd25 100644
--- a/main/modes/mode_gamepad.c
+++ b/main/modes/mode_gamepad.c
@@ -87,6 +87,12 @@ void gamepadStart(display_t* disp, gamepadType_t type);
 static const char str_gamepadTitle[] = "Gamepad Type";
 static const char str_pc[] = "PC";
 static const char str_ns[] = "Switch";
+// static const char str_y[] = "Y";
+// static const char str_x[] = "X";
+// static const char str_L[] = "L";
+// static const char str_r[] = "R";
+// static const char str_zL[] = "ZL";
+// static const char str_zr[] = "ZR";
 static const char str_exit[] = "Exit";
 
 typedef struct
@@ -486,20 +492,25 @@ void gamepadMainLoop(int64_t elapsedUs __attribute__((unused)))
         int16_t tBarX = gamepad->disp->w - TOUCHBAR_WIDTH;
         uint8_t numTouchElem = (sizeof(touchMap) / sizeof(touchMap[0]));
         for(uint8_t touchIdx = 0; touchIdx < numTouchElem; touchIdx++)
-        {            
+        {
+            int16_t x1 = tBarX - 1;
+            int16_t x2 = tBarX + (TOUCHBAR_WIDTH / numTouchElem);
+
             if((gamepad->gamepadType == GAMEPAD_GENERIC) ? gamepad->gpState.buttons & touchMap[touchIdx]:gamepad->gpNsState.buttons & touchMapNs[touchIdx])
             {
                 fillDisplayArea(gamepad->disp,
-                                tBarX - 1, TOUCHBAR_Y_OFF,
-                                tBarX + (TOUCHBAR_WIDTH / numTouchElem), TOUCHBAR_Y_OFF + TOUCHBAR_HEIGHT,
+                                x1, TOUCHBAR_Y_OFF,
+                                x2, TOUCHBAR_Y_OFF + TOUCHBAR_HEIGHT,
                                 c111);
             }
             else
             {
                 plotRect(gamepad->disp,
-                         tBarX - 1, TOUCHBAR_Y_OFF,
-                         tBarX + (TOUCHBAR_WIDTH / numTouchElem), TOUCHBAR_Y_OFF + TOUCHBAR_HEIGHT,
+                         x1, TOUCHBAR_Y_OFF,
+                         x2, TOUCHBAR_Y_OFF + TOUCHBAR_HEIGHT,
                          c111);
+
+                drawText(gamepad->disp, &gamepad->ibmFont, c555, "?", x1 + (x2 - x1 - textWidth(&gamepad->ibmFont, "?")) / 2, TOUCHBAR_Y_OFF + (TOUCHBAR_HEIGHT - gamepad->ibmFont.h) / 2);
             }
             tBarX += (TOUCHBAR_WIDTH / numTouchElem);
         }

From 34a074ab68673780a35df9aa9446e85072619a7f Mon Sep 17 00:00:00 2001
From: Bryce Browner <Brycey92@users.noreply.github.com>
Date: Fri, 25 Nov 2022 00:26:29 -0500
Subject: [PATCH 06/26] Finish implementing gamepad NS touchpad button labels

---
 main/modes/mode_gamepad.c | 74 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 66 insertions(+), 8 deletions(-)

diff --git a/main/modes/mode_gamepad.c b/main/modes/mode_gamepad.c
index 1b0e2711..abc7569c 100644
--- a/main/modes/mode_gamepad.c
+++ b/main/modes/mode_gamepad.c
@@ -79,6 +79,8 @@ void gamepadMenuTouchCb(touch_event_t* evt);
 void gamepadMenuAccelCb(accel_t* accel);
 void gamepadStart(display_t* disp, gamepadType_t type);
 
+static const char* getButtonName(hid_gamepad_button_bm_t button);
+
 //==============================================================================
 // Variables
 //==============================================================================
@@ -87,12 +89,6 @@ void gamepadStart(display_t* disp, gamepadType_t type);
 static const char str_gamepadTitle[] = "Gamepad Type";
 static const char str_pc[] = "PC";
 static const char str_ns[] = "Switch";
-// static const char str_y[] = "Y";
-// static const char str_x[] = "X";
-// static const char str_L[] = "L";
-// static const char str_r[] = "R";
-// static const char str_zL[] = "ZL";
-// static const char str_zr[] = "ZR";
 static const char str_exit[] = "Exit";
 
 typedef struct
@@ -169,7 +165,7 @@ void gamepadEnterMode(display_t* disp)
     
     loadFont("mm.font", &(gm->mmFont));
 
-    gm->menu = initMeleeMenu("Gamepad", &(gm->mmFont), gamepadMainMenuCb);
+    gm->menu = initMeleeMenu(modeGamepad.modeName, &(gm->mmFont), gamepadMainMenuCb);
 
     setGamepadMainMenu();
 }
@@ -510,8 +506,14 @@ void gamepadMainLoop(int64_t elapsedUs __attribute__((unused)))
                          x2, TOUCHBAR_Y_OFF + TOUCHBAR_HEIGHT,
                          c111);
 
-                drawText(gamepad->disp, &gamepad->ibmFont, c555, "?", x1 + (x2 - x1 - textWidth(&gamepad->ibmFont, "?")) / 2, TOUCHBAR_Y_OFF + (TOUCHBAR_HEIGHT - gamepad->ibmFont.h) / 2);
             }
+
+            if(gamepad->gamepadType == GAMEPAD_NS)
+            {
+                const char* buttonName = getButtonName(touchMapNs[touchIdx]);
+                drawText(gamepad->disp, &gamepad->ibmFont, c444, buttonName, x1 + (x2 - x1 - textWidth(&gamepad->ibmFont, buttonName)) / 2, TOUCHBAR_Y_OFF + (TOUCHBAR_HEIGHT - gamepad->ibmFont.h) / 2);
+            }
+
             tBarX += (TOUCHBAR_WIDTH / numTouchElem);
         }
 
@@ -815,3 +817,59 @@ void gamepadReportStateToHost(void)
         
     }    
 }
+
+static const char* getButtonName(hid_gamepad_button_bm_t button)
+{
+    switch(button)
+    {
+        case GAMEPAD_NS_BUTTON_Y:
+        {
+            return "Y";
+        }
+        case GAMEPAD_NS_BUTTON_B:
+        {
+            return "B";
+        }
+        case GAMEPAD_NS_BUTTON_A:
+        {
+            return "A";
+        }
+        case GAMEPAD_NS_BUTTON_X:
+        {
+            return "X";
+        }
+        case GAMEPAD_NS_BUTTON_TL:
+        {
+            return "L";
+        }
+        case GAMEPAD_NS_BUTTON_TR:
+        {
+            return "R";
+        }
+        case GAMEPAD_NS_BUTTON_TL2:
+        {
+            return "ZL";
+        }
+        case GAMEPAD_NS_BUTTON_TR2:
+        {
+            return "ZR";
+        }
+        case GAMEPAD_NS_BUTTON_SELECT:
+        {
+            return "Select";
+        }
+        case GAMEPAD_NS_BUTTON_START:
+        {
+            return "Start";
+        }
+        case GAMEPAD_NS_BUTTON_THUMBL:
+        case GAMEPAD_NS_BUTTON_THUMBR:
+        case GAMEPAD_NS_BUTTON_MODE:
+        case GAMEPAD_NS_BUTTON_C:
+        case GAMEPAD_NS_BUTTON_Z:
+        default:
+        {
+            return "";
+        }
+    }
+}

From d121716a3f9659b317f91296a11dfe72f1f78027 Mon Sep 17 00:00:00 2001
From: Brycey92 <bbrowner@optonline.net>
Date: Mon, 28 Nov 2022 16:46:51 -0500
Subject: [PATCH 07/26] Separate tiltrads NO_STRESS_TRIS into noStressTris and
 DEBUG

User controls to enable noStressTris coming in a subsequent commit
---
 main/modes/mode_tiltrads.c | 78 ++++++++++++++++++--------------------
 1 file changed, 37 insertions(+), 41 deletions(-)

diff --git a/main/modes/mode_tiltrads.c b/main/modes/mode_tiltrads.c
index ba1b957a..f10cb84a 100644
--- a/main/modes/mode_tiltrads.c
+++ b/main/modes/mode_tiltrads.c
@@ -29,7 +29,7 @@
 
 // Any defines go here.
 
-//#define NO_STRESS_TRIS // Debug mode that when enabled, stops tetrads from dropping automatically, they will only drop when the drop button is pressed. Useful for testing line clears.
+//#define DEBUG
 
 // Controls (title)
 #define BTN_TITLE_START_SCORES SELECT
@@ -1336,6 +1336,7 @@ typedef struct
     bool holdingClearScore;
     
     // Game state vars
+    bool noStressTris; // When enabled, stops tetrads from dropping automatically, they will only drop when the drop button is pressed. Useful for testing line clears. Used to be a debug mode.
     uint32_t tetradsGrid[GRID_ROWS][GRID_COLS];
     uint32_t nextTetradGrid[NEXT_GRID_ROWS][NEXT_GRID_COLS];
     tetrad_t activeTetrad;
@@ -1450,8 +1451,10 @@ void refreshTetradsGrid(uint8_t gridCols, uint8_t gridRows, uint32_t gridData[][
                         list_t* fieldTetrads, tetrad_t* movingTetrad, bool includeMovingTetrad);
 int16_t xFromGridCol(int16_t x0, int16_t gridCol, uint8_t unitSize);
 int16_t yFromGridRow(int16_t y0, int16_t gridRow, uint8_t unitSize);
-// void debugPrintGrid(uint8_t gridCols, uint8_t gridRows, uint32_t gridData[][gridCols]);
 
+#ifdef DEBUG
+void debugPrintGrid(uint8_t gridCols, uint8_t gridRows, uint32_t gridData[][gridCols]);
+#endif
 
 // Tetrad operations
 bool rotateTetrad(tetrad_t* tetrad, int32_t newRotation, uint8_t gridCols, uint8_t gridRows,
@@ -1598,6 +1601,7 @@ void ttInit(display_t* disp)
 
     // Game state
     tiltrads->currState = TT_TITLE;
+    tiltrads->noStressTris = false;
 
     tiltrads->landTetradFX = false;
 
@@ -1748,11 +1752,13 @@ static void ttUpdate(int64_t elapsedUs __attribute__((unused)))
     //plotLine(tiltrads->disp, 280, 0, 280, 240, c200, 5);
     //plotLine(tiltrads->disp, 0, 120, 280, 120, c200, 5);
 
+#ifdef DEBUG
     // Draw debug FPS counter.
-    /*double seconds = ((double)stateTime * (double)US_TO_MS_FACTOR * (double)MS_TO_S_FACTOR);
+    double seconds = ((double)stateTime * (double)US_TO_MS_FACTOR * (double)MS_TO_S_FACTOR);
     int32_t fps = (int)((double)stateFrames / seconds);
     snprintf(uiStr, sizeof(uiStr), "FPS: %d", fps);
-    drawText(tiltrads->disp->w - getTextWidth(uiStr, TOM_THUMB) - 1, tiltrads->disp->h - (1 * (ibm_vga8.h + 1)), uiStr, TOM_THUMB, c555);*/
+    drawText(tiltrads->disp->w - getTextWidth(uiStr, TOM_THUMB) - 1, tiltrads->disp->h - (1 * (ibm_vga8.h + 1)), uiStr, TOM_THUMB, c555);
+#endif
 }
 
 void ttTitleInput(void)
@@ -1818,30 +1824,14 @@ void ttGameInput(void)
                                               tiltrads->tetradsGrid);
         }
 
-#ifdef NO_STRESS_TRIS
-        if(ttIsButtonPressed(BTN_GAME_SOFT_DROP))
+        // Button down = soft drop piece.
+        if(!tiltrads->noStressTris && ttIsButtonDown(BTN_GAME_SOFT_DROP))
         {
-            tiltrads->dropTimer = tiltrads->dropTime;
+            softDropTetrad();
         }
-        else if (ttIsButtonPressed(BTN_GAME_HARD_DROP)) 
+        else if(tiltrads->noStressTris && ttIsButtonPressed(BTN_GAME_SOFT_DROP))
         {
-            // Drop piece as far as it will go before landing.
-            int32_t dropDistance = 0;
-            while (dropTetrad(&(tiltrads->activeTetrad), GRID_COLS, GRID_ROWS, tiltrads->tetradsGrid))
-            {
-                dropDistance++;
-            }
-
-            tiltrads->score += dropDistance * SCORE_HARD_DROP;
-            // Set the drop timer so it will land on update.
             tiltrads->dropTimer = tiltrads->dropTime;
-            debugPrintGrid(GRID_COLS, GRID_ROWS, tiltrads->tetradsGrid);
-        }
-#else
-        // Button down = soft drop piece.
-        if(ttIsButtonDown(BTN_GAME_SOFT_DROP))
-        {
-            softDropTetrad();
         }
         // Button up = hard drop piece.
         else if (ttIsButtonPressed(BTN_GAME_HARD_DROP)) 
@@ -1855,8 +1845,11 @@ void ttGameInput(void)
             tiltrads->score += dropDistance * SCORE_HARD_DROP;
             // Set the drop timer so it will land on update.
             tiltrads->dropTimer = tiltrads->dropTime;
-        }
+
+#ifdef DEBUG
+            debugPrintGrid(GRID_COLS, GRID_ROWS, tiltrads->tetradsGrid);
 #endif
+        }
 
         // Only move tetrads left and right when the fast drop button isn't being held down.
         if(ttIsButtonUp(BTN_GAME_SOFT_DROP) && ttIsButtonUp(BTN_GAME_HARD_DROP))
@@ -1978,9 +1971,10 @@ void ttGameUpdate(void)
     }
     else
     {
-#ifndef NO_STRESS_TRIS
-        tiltrads->dropTimer += tiltrads->deltaTime;
-#endif
+        if(!tiltrads->noStressTris)
+        {
+            tiltrads->dropTimer += tiltrads->deltaTime;
+        }
 
         // Update the LED FX.
         // Progress is the drop time for this row. (Too fast)
@@ -2207,7 +2201,7 @@ void ttTitleDisplay(void)
                           2.0,
                           tiltrads->stateTime, c112);
 
-    // LEFT FOR
+    // SELECT FOR
     int16_t scoresTextX = getCenteredTextX(&(tiltrads->ibm_vga8), "SELECT FOR", 0, GRID_X);
     int16_t scoresTextY = tiltrads->disp->h - (tiltrads->ibm_vga8.h * 7 + 1);
     drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, "SELECT FOR", scoresTextX, scoresTextY);
@@ -2793,18 +2787,20 @@ int16_t yFromGridRow(int16_t y0, int16_t gridRow, uint8_t unitSize)
     return (y0 + 1) + (gridRow * unitSize);
 }
 
-// void debugPrintGrid(uint8_t gridCols, uint8_t gridRows, uint32_t gridData[][gridCols])
-// {
-//     ESP_LOGW("EMU", "Grid Dimensions: c%d x r%d", gridCols, gridRows);
-//     for (int32_t y = 0; y < gridRows; y++)
-//     {
-//         for (int32_t x = 0; x < gridCols; x++)
-//         {
-//             printf(" %2d ", gridData[y][x]);
-//         }
-//         printf("\n");
-//     }
-// }
+#ifdef DEBUG
+void debugPrintGrid(uint8_t gridCols, uint8_t gridRows, uint32_t gridData[][gridCols])
+{
+    ESP_LOGW("EMU", "Grid Dimensions: c%d x r%d", gridCols, gridRows);
+    for (int32_t y = 0; y < gridRows; y++)
+    {
+        for (int32_t x = 0; x < gridCols; x++)
+        {
+            printf(" %2d ", gridData[y][x]);
+        }
+        printf("\n");
+    }
+}
+#endif
 
 // This assumes only complete tetrads can be rotated.
 bool rotateTetrad(tetrad_t* tetrad, int32_t newRotation, uint8_t gridCols, uint8_t gridRows,

From f055414a749c393a09d27ae64843d6cad67ed4f0 Mon Sep 17 00:00:00 2001
From: Brycey92 <bbrowner@optonline.net>
Date: Mon, 28 Nov 2022 17:20:15 -0500
Subject: [PATCH 08/26] Deduplicate tiltrads strings

---
 main/modes/mode_tiltrads.c | 178 +++++++++++++++++++++++--------------
 1 file changed, 111 insertions(+), 67 deletions(-)

diff --git a/main/modes/mode_tiltrads.c b/main/modes/mode_tiltrads.c
index f10cb84a..a0856b66 100644
--- a/main/modes/mode_tiltrads.c
+++ b/main/modes/mode_tiltrads.c
@@ -132,6 +132,46 @@
 // Music and SFX
 #define NUM_LAND_FX 16
 
+
+// Any const strings go here.
+
+static const char str_select_for[] = "SELECT FOR";
+static const char str_scores[] = "SCORES";
+static const char str_start_to[] = "START TO";
+static const char str_play[] = "PLAY";
+static const char str_tiltrads[] = "TILTRADS";
+static const char str_color[] = "COLOR";
+//static const char str_exit[] = "B TO EXIT";
+static const char str_start[] = "START";
+static const char str_restart[] = "RESTART";
+static const char str_next[] = "NEXT";
+static const char str_high_new[] = "HIGH (NEW)";
+static const char str_high[] = "HIGH";
+static const char str_d_format[] = "%d";
+static const char str_score[] = "SCORE";
+static const char str_lines[] = "LINES";
+static const char str_level[] = "LEVEL";
+static const char str_rotate[] = "ROTATE";
+static const char str_b_a[] = "B/A";
+static const char str_drop[] = "DROP";
+static const char str_up_down[] = "UP/DOWN";
+static const char str_high_scores[] = "HIGH SCORES";
+static const char str_clear[] = "CLEAR";
+static const char str_select_to[] = "SELECT TO";
+static const char str_start_for[] = "START FOR";
+static const char str_title[] = "TITLE";
+static const char str_select[] = "SELECT";
+static const char str_game_over[] = "GAME OVER";
+static const char str_high_score[] = "HIGH SCORE!";
+static const char str_your_score[] = "YOUR SCORE:";
+
+static const char KEY_HIGH_SCORE_FORMAT[] = "tt_high_score_%d";
+
+#if defined(EMU) && defined(DEBUG)
+static const char str_emu[] = "EMU";
+#endif
+
+
 // Any typedefs go here.
 
 // Mode state
@@ -2202,24 +2242,24 @@ void ttTitleDisplay(void)
                           tiltrads->stateTime, c112);
 
     // SELECT FOR
-    int16_t scoresTextX = getCenteredTextX(&(tiltrads->ibm_vga8), "SELECT FOR", 0, GRID_X);
+    int16_t scoresTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_select_for, 0, GRID_X);
     int16_t scoresTextY = tiltrads->disp->h - (tiltrads->ibm_vga8.h * 7 + 1);
-    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, "SELECT FOR", scoresTextX, scoresTextY);
+    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_select_for, scoresTextX, scoresTextY);
 
     // SCORES
-    scoresTextX = getCenteredTextX(&(tiltrads->ibm_vga8), "SCORES", 0, GRID_X);
+    scoresTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_scores, 0, GRID_X);
     scoresTextY = tiltrads->disp->h - (tiltrads->ibm_vga8.h * 6);
-    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, "SCORES", scoresTextX, scoresTextY);
+    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_scores, scoresTextX, scoresTextY);
 
     // START TO
-    int16_t playTextX = getCenteredTextX(&(tiltrads->ibm_vga8), "START TO", xFromGridCol(GRID_X, GRID_COLS, GRID_UNIT_SIZE), tiltrads->disp->w);
+    int16_t playTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_start_to, xFromGridCol(GRID_X, GRID_COLS, GRID_UNIT_SIZE), tiltrads->disp->w);
     int16_t playTextY = tiltrads->disp->h - (tiltrads->ibm_vga8.h * 7 + 1);
-    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, "START TO", playTextX, playTextY);
+    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_start_to, playTextX, playTextY);
 
     // PLAY
-    playTextX = getCenteredTextX(&(tiltrads->ibm_vga8), "PLAY", xFromGridCol(GRID_X, GRID_COLS, GRID_UNIT_SIZE), tiltrads->disp->w);
+    playTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_play, xFromGridCol(GRID_X, GRID_COLS, GRID_UNIT_SIZE), tiltrads->disp->w);
     playTextY = tiltrads->disp->h - (tiltrads->ibm_vga8.h * 6);
-    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, "PLAY", playTextX, playTextY);
+    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_play, playTextX, playTextY);
 
     // Clear the grid data. (may not want to do this every frame)
     refreshTetradsGrid(TUTORIAL_GRID_COLS, TUTORIAL_GRID_ROWS, tiltrads->tutorialTetradsGrid, tiltrads->landedTetrads, &(tiltrads->tutorialTetrad),
@@ -2234,18 +2274,18 @@ void ttTitleDisplay(void)
     plotGrid(tiltrads->disp, GRID_X, GRID_Y, GRID_UNIT_SIZE, TUTORIAL_GRID_COLS, TUTORIAL_GRID_ROWS, tiltrads->tutorialTetradsGrid, false, c224);
 
     // TILTRADS
-    int16_t titleTextX = getCenteredTextX(&(tiltrads->radiostars), "TILTRADS", 0, tiltrads->disp->w);
+    int16_t titleTextX = getCenteredTextX(&(tiltrads->radiostars), str_tiltrads, 0, tiltrads->disp->w);
     int16_t titleTextY = DISPLAY_HALF_HEIGHT - tiltrads->radiostars.h - 2;
-    drawText(tiltrads->disp, &(tiltrads->radiostars), c540, "TILTRADS", titleTextX, titleTextY);
+    drawText(tiltrads->disp, &(tiltrads->radiostars), c540, str_tiltrads, titleTextX, titleTextY);
 
     // COLOR (rotating color fx)
-    titleTextX = getCenteredTextX(&(tiltrads->radiostars), "COLOR", 0, tiltrads->disp->w);
+    titleTextX = getCenteredTextX(&(tiltrads->radiostars), str_color, 0, tiltrads->disp->w);
     titleTextY += tiltrads->radiostars.h + 2;
-    drawText(tiltrads->disp, &(tiltrads->radiostars), tiltrads->stateFrames % c555, "COLOR", titleTextX, titleTextY);
+    drawText(tiltrads->disp, &(tiltrads->radiostars), tiltrads->stateFrames % c555, str_color, titleTextX, titleTextY);
 
     /*
     // SELECT TO EXIT
-    int16_t exitX = getCenteredTextX(&(tiltrads->ibm_vga8), "B TO EXIT", 0, tiltrads->disp->w);
+    int16_t exitX = getCenteredTextX(&(tiltrads->ibm_vga8), str_exit, 0, tiltrads->disp->w);
     int16_t exitY = tiltrads->disp->h - tiltrads->ibm_vga8.h - 2;
     // Fill the SELECT TO EXIT area depending on how long the button's held down.
     if (tiltrads->exitTimer != 0)
@@ -2258,7 +2298,7 @@ void ttTitleDisplay(void)
         int16_t holdAreaY1 = tiltrads->disp->h - 1;
         fillDisplayArea(tiltrads->disp, holdAreaX0, holdAreaY0, holdAreaX1, holdAreaY1, c321);
     }
-    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, "B TO EXIT", exitX, exitY);
+    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_exit, exitX, exitY);
     */
 
     // Fill in the floor of the grid on-screen for visual consistency.
@@ -2318,8 +2358,8 @@ void ttGameDisplay(void)
 
     // NEXT
     currY = NEXT_GRID_Y - 2 - tiltrads->ibm_vga8.h;
-    int16_t nextHeaderTextStart = getCenteredTextX(&(tiltrads->ibm_vga8), "NEXT", NEXT_GRID_X, xFromGridCol(NEXT_GRID_X, NEXT_GRID_COLS, GRID_UNIT_SIZE));
-    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, "NEXT", nextHeaderTextStart, currY);
+    int16_t nextHeaderTextStart = getCenteredTextX(&(tiltrads->ibm_vga8), str_next, NEXT_GRID_X, xFromGridCol(NEXT_GRID_X, NEXT_GRID_COLS, GRID_UNIT_SIZE));
+    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_next, nextHeaderTextStart, currY);
 
     // Fill area of grid background.
     fillDisplayArea(tiltrads->disp, NEXT_GRID_X, NEXT_GRID_Y, xFromGridCol(NEXT_GRID_X, NEXT_GRID_COLS, GRID_UNIT_SIZE),
@@ -2347,30 +2387,30 @@ void ttGameDisplay(void)
     int16_t numFieldEnd = 0;
 
     // HIGH
-    int16_t highScoreHeaderTextStart = getCenteredTextX(&(tiltrads->ibm_vga8), tiltrads->newHighScore ? "HIGH (NEW)" : "HIGH", 0, GRID_X);
-    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, tiltrads->newHighScore ? "HIGH (NEW)" : "HIGH", highScoreHeaderTextStart, currY);
+    int16_t highScoreHeaderTextStart = getCenteredTextX(&(tiltrads->ibm_vga8), tiltrads->newHighScore ? str_high_new : str_high, 0, GRID_X);
+    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, tiltrads->newHighScore ? str_high_new : str_high, highScoreHeaderTextStart, currY);
 
     // 99999
     currY += (tiltrads->ibm_vga8.h + 1);
-    snprintf(uiStr, sizeof(uiStr), "%d", tiltrads->newHighScore ? tiltrads->score : tiltrads->highScores[0]);
+    snprintf(uiStr, sizeof(uiStr), str_d_format, tiltrads->newHighScore ? tiltrads->score : tiltrads->highScores[0]);
     getNumCentering(&(tiltrads->ibm_vga8), uiStr, 0, GRID_X, &numFieldStart, &numFieldEnd);
     drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, uiStr, numFieldStart, currY);
 
     // SCORE
     currY += tiltrads->ibm_vga8.h + (tiltrads->ibm_vga8.h + 1);
-    int16_t scoreHeaderTextStart = getCenteredTextX(&(tiltrads->ibm_vga8), "SCORE", 0, GRID_X);
-    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, "SCORE", scoreHeaderTextStart, currY);
+    int16_t scoreHeaderTextStart = getCenteredTextX(&(tiltrads->ibm_vga8), str_score, 0, GRID_X);
+    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_score, scoreHeaderTextStart, currY);
 
     // 99999
     currY += (tiltrads->ibm_vga8.h + 1);
-    snprintf(uiStr, sizeof(uiStr), "%d", tiltrads->score);
+    snprintf(uiStr, sizeof(uiStr), str_d_format, tiltrads->score);
     getNumCentering(&(tiltrads->ibm_vga8), uiStr, 0, GRID_X, &numFieldStart, &numFieldEnd);
     drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, uiStr, numFieldStart, currY);
 
     // LINES
     currY += tiltrads->ibm_vga8.h + (tiltrads->ibm_vga8.h + 1) + 1;
-    int16_t linesHeaderTextStart = getCenteredTextX(&(tiltrads->ibm_vga8), "LINES", 0, GRID_X);
-    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, "LINES", linesHeaderTextStart, currY);
+    int16_t linesHeaderTextStart = getCenteredTextX(&(tiltrads->ibm_vga8), str_lines, 0, GRID_X);
+    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_lines, linesHeaderTextStart, currY);
 
     // 999
     currY += (tiltrads->ibm_vga8.h + 1);
@@ -2380,12 +2420,12 @@ void ttGameDisplay(void)
 
     // LEVEL
     currY = yFromGridRow(NEXT_GRID_Y, NEXT_GRID_ROWS, GRID_UNIT_SIZE) + 3;
-    int16_t levelHeaderTextStart = getCenteredTextX(&(tiltrads->ibm_vga8), "LEVEL", NEXT_GRID_X, xFromGridCol(NEXT_GRID_X, NEXT_GRID_COLS, GRID_UNIT_SIZE));
-    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, "LEVEL", levelHeaderTextStart, currY);
+    int16_t levelHeaderTextStart = getCenteredTextX(&(tiltrads->ibm_vga8), str_level, NEXT_GRID_X, xFromGridCol(NEXT_GRID_X, NEXT_GRID_COLS, GRID_UNIT_SIZE));
+    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_level, levelHeaderTextStart, currY);
 
     // 99
     currY += (tiltrads->ibm_vga8.h + 1);
-    snprintf(uiStr, sizeof(uiStr), "%d", (int)(tiltrads->currentLevel + 1)); // Levels are displayed with 1 as the base level.
+    snprintf(uiStr, sizeof(uiStr), str_d_format, (int)(tiltrads->currentLevel + 1)); // Levels are displayed with 1 as the base level.
     getNumCentering(&(tiltrads->ibm_vga8), uiStr, NEXT_GRID_X, xFromGridCol(NEXT_GRID_X, NEXT_GRID_COLS, GRID_UNIT_SIZE), &numFieldStart,
                     &numFieldEnd);
     drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, uiStr, numFieldStart, currY);
@@ -2394,24 +2434,24 @@ void ttGameDisplay(void)
     int botIncrement = 7;
 
     // ROTATE
-    int16_t scoresTextX = getCenteredTextX(&(tiltrads->ibm_vga8), "ROTATE", 0, GRID_X);
+    int16_t scoresTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_rotate, 0, GRID_X);
     int16_t scoresTextY = tiltrads->disp->h - (tiltrads->ibm_vga8.h * topIncrement + 1);
-    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, "ROTATE", scoresTextX, scoresTextY);
+    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_rotate, scoresTextX, scoresTextY);
 
     // B/A
-    scoresTextX = getCenteredTextX(&(tiltrads->ibm_vga8), "B/A", 0, GRID_X);
+    scoresTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_b_a, 0, GRID_X);
     scoresTextY = tiltrads->disp->h - (tiltrads->ibm_vga8.h * botIncrement);
-    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, "B/A", scoresTextX, scoresTextY);
+    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_b_a, scoresTextX, scoresTextY);
 
     // DROP
-    int16_t playTextX = getCenteredTextX(&(tiltrads->ibm_vga8), "DROP", xFromGridCol(GRID_X, GRID_COLS, GRID_UNIT_SIZE), tiltrads->disp->w);
+    int16_t playTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_drop, xFromGridCol(GRID_X, GRID_COLS, GRID_UNIT_SIZE), tiltrads->disp->w);
     int16_t playTextY = tiltrads->disp->h - (tiltrads->ibm_vga8.h * topIncrement + 1);
-    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, "DROP", playTextX, playTextY);
+    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_drop, playTextX, playTextY);
 
     // UP/DOWN
-    playTextX = getCenteredTextX(&(tiltrads->ibm_vga8), "UP/DOWN", xFromGridCol(GRID_X, GRID_COLS, GRID_UNIT_SIZE), tiltrads->disp->w);
+    playTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_up_down, xFromGridCol(GRID_X, GRID_COLS, GRID_UNIT_SIZE), tiltrads->disp->w);
     playTextY = tiltrads->disp->h - (tiltrads->ibm_vga8.h * botIncrement);
-    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, "UP/DOWN", playTextX, playTextY);
+    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_up_down, playTextX, playTextY);
 }
 
 void ttScoresDisplay(void)
@@ -2436,9 +2476,9 @@ void ttScoresDisplay(void)
 
 
     // HIGH SCORES
-    int16_t headerTextX = getCenteredTextX(&(tiltrads->ibm_vga8), "HIGH SCORES", 0, tiltrads->disp->w);
+    int16_t headerTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_high_scores, 0, tiltrads->disp->w);
     int16_t headerTextY = SCORE_SCREEN_TITLE_Y;
-    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, "HIGH SCORES", headerTextX, headerTextY);
+    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_high_scores, headerTextX, headerTextY);
 
     char uiStr[32] = {0};
 
@@ -2462,7 +2502,7 @@ void ttScoresDisplay(void)
         double holdProgress = ((double)(tiltrads->clearScoreTimer) / (double)CLEAR_SCORES_HOLD_TIME);
         int16_t holdAreaX0 = clearScoresTextX - 1;
         int16_t holdAreaY0 = (tiltrads->disp->h - (tiltrads->ibm_vga8.h + 1)) - 1;
-        double holdAreaWidth = textWidth(&(tiltrads->ibm_vga8), "CLEAR") + 3;
+        double holdAreaWidth = textWidth(&(tiltrads->ibm_vga8), str_clear) + 3;
         int16_t holdAreaX1 = holdAreaX0 + (int16_t)(holdProgress * holdAreaWidth);
         int16_t holdAreaY1 = tiltrads->disp->h - 1;
         plotRect(tiltrads->disp, holdAreaX0, holdAreaY0, holdAreaX0 + holdAreaWidth, holdAreaY1, c321);
@@ -2470,24 +2510,24 @@ void ttScoresDisplay(void)
     }
 
     // SELECT TO
-    int16_t scoresTextX = getCenteredTextX(&(tiltrads->ibm_vga8), "SELECT TO", 0, GRID_X);
+    int16_t scoresTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_select_to, 0, GRID_X);
     int16_t scoresTextY = tiltrads->disp->h - (tiltrads->ibm_vga8.h * 7 + 1);
-    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, "SELECT TO", scoresTextX, scoresTextY);
+    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_select_to, scoresTextX, scoresTextY);
 
     // CLEAR
-    scoresTextX = getCenteredTextX(&(tiltrads->ibm_vga8), "CLEAR", 0, GRID_X);
+    scoresTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_clear, 0, GRID_X);
     scoresTextY = tiltrads->disp->h - (tiltrads->ibm_vga8.h * 6);
-    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, "CLEAR", scoresTextX, scoresTextY);
+    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_clear, scoresTextX, scoresTextY);
 
     // START FOR
-    int16_t playTextX = getCenteredTextX(&(tiltrads->ibm_vga8), "START FOR", xFromGridCol(GRID_X, GRID_COLS, GRID_UNIT_SIZE), tiltrads->disp->w);
+    int16_t playTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_start_for, xFromGridCol(GRID_X, GRID_COLS, GRID_UNIT_SIZE), tiltrads->disp->w);
     int16_t playTextY = tiltrads->disp->h - (tiltrads->ibm_vga8.h * 7 + 1);
-    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, "START FOR", playTextX, playTextY);
+    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_start_for, playTextX, playTextY);
 
     // TITLE
-    playTextX = getCenteredTextX(&(tiltrads->ibm_vga8), "TITLE", xFromGridCol(GRID_X, GRID_COLS, GRID_UNIT_SIZE), tiltrads->disp->w);
+    playTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_title, xFromGridCol(GRID_X, GRID_COLS, GRID_UNIT_SIZE), tiltrads->disp->w);
     playTextY = tiltrads->disp->h - (tiltrads->ibm_vga8.h * 6);
-    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, "TITLE", playTextX, playTextY);
+    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_title, playTextX, playTextY);
 }
 
 void ttGameoverDisplay(void)
@@ -2523,33 +2563,33 @@ void ttGameoverDisplay(void)
         plotRect(tiltrads->disp, leftWindowXMargin, windowYMarginTop, tiltrads->disp->w - rightWindowXMargin, tiltrads->disp->h - windowYMarginBot, c540);
 
         // GAME OVER
-        int16_t headerTextX = getCenteredTextX(&(tiltrads->ibm_vga8), "GAME OVER", 0, tiltrads->disp->w);
-        drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, "GAME OVER", headerTextX, windowYMarginTop + titleTextYOffset);
+        int16_t headerTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_game_over, 0, tiltrads->disp->w);
+        drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_game_over, headerTextX, windowYMarginTop + titleTextYOffset);
 
         // HIGH SCORE! or YOUR SCORE:
         if (tiltrads->newHighScore)
         {
-            headerTextX = getCenteredTextX(&(tiltrads->ibm_vga8), "HIGH SCORE!", 0, tiltrads->disp->w);
-            drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, "HIGH SCORE!", headerTextX, windowYMarginTop + highScoreTextYOffset);
+            headerTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_high_score, 0, tiltrads->disp->w);
+            drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_high_score, headerTextX, windowYMarginTop + highScoreTextYOffset);
         }
         else
         {
-            headerTextX = getCenteredTextX(&(tiltrads->ibm_vga8), "YOUR SCORE:", 0, tiltrads->disp->w);
-            drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, "YOUR SCORE:", headerTextX, windowYMarginTop + highScoreTextYOffset);
+            headerTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_your_score, 0, tiltrads->disp->w);
+            drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_your_score, headerTextX, windowYMarginTop + highScoreTextYOffset);
         }
 
         // 1230495
         char scoreStr[32] = {0};
-        snprintf(scoreStr, sizeof(scoreStr), "%d", tiltrads->score);
+        snprintf(scoreStr, sizeof(scoreStr), str_d_format, tiltrads->score);
         drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, scoreStr, tiltrads->gameoverScoreX, windowYMarginTop + scoreTextYOffset);
 
-        // SELECT FOR   START TO
-        // TITLE         RESTART
-        drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, "SELECT", leftWindowXMargin + controlTextXPadding, controlTextYOffset - tiltrads->ibm_vga8.h - 1);
-        drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, "TITLE", leftWindowXMargin + controlTextXPadding, controlTextYOffset);
+        // SELECT   START
+        // TITLE  RESTART
+        drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_select, leftWindowXMargin + controlTextXPadding, controlTextYOffset - tiltrads->ibm_vga8.h - 1);
+        drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_title, leftWindowXMargin + controlTextXPadding, controlTextYOffset);
 
-        drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, "START", tiltrads->disp->w - rightWindowXMargin - textWidth(&(tiltrads->ibm_vga8), "START") - controlTextXPadding, controlTextYOffset - tiltrads->ibm_vga8.h - 1);
-        drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, "RESTART", tiltrads->disp->w - rightWindowXMargin - textWidth(&(tiltrads->ibm_vga8), "RESTART") - controlTextXPadding, controlTextYOffset);
+        drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_start, tiltrads->disp->w - rightWindowXMargin - textWidth(&(tiltrads->ibm_vga8), str_start) - controlTextXPadding, controlTextYOffset - tiltrads->ibm_vga8.h - 1);
+        drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_restart, tiltrads->disp->w - rightWindowXMargin - textWidth(&(tiltrads->ibm_vga8), str_restart) - controlTextXPadding, controlTextYOffset);
     }
 
     tiltrads->gameoverLEDAnimCycle = ((double)tiltrads->stateTime * US_TO_MS_FACTOR) / DISPLAY_REFRESH_MS;
@@ -2670,7 +2710,7 @@ void ttChangeState(tiltradsState_t newState)
             // Get the correct offset for the high score.
             x0 = 18;
             x1 = tiltrads->disp->w - x0;
-            snprintf(uiStr, sizeof(uiStr), "%d", tiltrads->score);
+            snprintf(uiStr, sizeof(uiStr), str_d_format, tiltrads->score);
             tiltrads->gameoverScoreX = getCenteredTextX(&(tiltrads->ibm_vga8), uiStr, x0, x1);
             tiltrads->gameoverLEDAnimCycle = ((double)tiltrads->stateTime * US_TO_MS_FACTOR) / DISPLAY_REFRESH_MS;
 
@@ -2790,7 +2830,7 @@ int16_t yFromGridRow(int16_t y0, int16_t gridRow, uint8_t unitSize)
 #ifdef DEBUG
 void debugPrintGrid(uint8_t gridCols, uint8_t gridRows, uint32_t gridData[][gridCols])
 {
-    ESP_LOGW("EMU", "Grid Dimensions: c%d x r%d", gridCols, gridRows);
+    ESP_LOGW(str_emu, "Grid Dimensions: c%d x r%d", gridCols, gridRows);
     for (int32_t y = 0; y < gridRows; y++)
     {
         for (int32_t x = 0; x < gridCols; x++)
@@ -2984,10 +3024,12 @@ bool moveTetrad(tetrad_t* tetrad, uint8_t gridCols, uint8_t gridRows,
 
     bool moved = false;
 
-    //ESP_LOGW("EMU", "ttAccel.y: %d", tiltrads->ttAccel.y);
     int32_t yMod = tiltrads->ttAccel.y / ACCEL_SEG_SIZE;
-    //ESP_LOGW("EMU", "yMod: %d", yMod);
-    //ESP_LOGW("EMU", "ttAccel.delta: %d", abs(tiltrads->ttAccel.y - tiltrads->ttLastTestAccel.y));
+#if defined(EMU) && defined(DEBUG)
+    ESP_LOGW(str_emu, "ttAccel.y: %d", tiltrads->ttAccel.y);
+    ESP_LOGW(str_emu, "yMod: %d", yMod);
+    ESP_LOGW(str_emu, "ttAccel.delta: %d", abs(tiltrads->ttAccel.y - tiltrads->ttLastTestAccel.y));
+#endif
 
     coord_t targetPos;
     targetPos.r = tetrad->topLeft.r;
@@ -3009,7 +3051,9 @@ bool moveTetrad(tetrad_t* tetrad, uint8_t gridCols, uint8_t gridRows,
     // Emulator only (control with d pad)
 #ifdef EMU
     targetPos.c = tetrad->topLeft.c;
-    //ESP_LOGW("EMU", "%d modeFrames", modeFrames);
+#ifdef DEBUG
+    ESP_LOGW(str_emu, "%d modeFrames", modeFrames);
+#endif
     if (ttIsButtonPressed(LEFT))
     {
         targetPos.c -= 1;
@@ -3704,7 +3748,7 @@ void ttGetHighScores(void)
     char keyStr[32] = {0};
     for (int32_t i = 0; i < NUM_TT_HIGH_SCORES; i++)
     {
-        snprintf(keyStr, sizeof(keyStr), "tt_high_score_%d", i);
+        snprintf(keyStr, sizeof(keyStr), KEY_HIGH_SCORE_FORMAT, i);
         if (!readNvs32(keyStr, &(tiltrads->highScores[i])))
         {
             tiltrads->highScores[i] = 0;
@@ -3717,7 +3761,7 @@ void ttSetHighScores(void)
     char keyStr[32] = {0};
     for (int32_t i = 0; i < NUM_TT_HIGH_SCORES; i++)
     {
-        snprintf(keyStr, sizeof(keyStr), "tt_high_score_%d", i);
+        snprintf(keyStr, sizeof(keyStr), KEY_HIGH_SCORE_FORMAT, i);
         writeNvs32(keyStr, tiltrads->highScores[i]);
     }
 }

From 736dca5ca01def2e0c4c0b363478c4f26bf2435d Mon Sep 17 00:00:00 2001
From: Brycey92 <bbrowner@optonline.net>
Date: Mon, 28 Nov 2022 17:35:14 -0500
Subject: [PATCH 09/26] Display tiltrads no-stress-tris controls to title
 screen

---
 main/modes/mode_tiltrads.c | 39 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/main/modes/mode_tiltrads.c b/main/modes/mode_tiltrads.c
index a0856b66..104290a7 100644
--- a/main/modes/mode_tiltrads.c
+++ b/main/modes/mode_tiltrads.c
@@ -135,6 +135,10 @@
 
 // Any const strings go here.
 
+static const char str_y_for[] ="Y FOR";
+static const char str_no_stress[] = "NO-STRESS-";
+static const char str_tris[] = "TRIS";
+static const char str_x_to_play[] = "X TO PLAY";
 static const char str_select_for[] = "SELECT FOR";
 static const char str_scores[] = "SCORES";
 static const char str_start_to[] = "START TO";
@@ -2241,6 +2245,41 @@ void ttTitleDisplay(void)
                           2.0,
                           tiltrads->stateTime, c112);
 
+    // Y FOR
+    int16_t noStressScoresTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_y_for, 0, GRID_X);
+    int16_t noStressScoresTextY = tiltrads->disp->h - (tiltrads->ibm_vga8.h * 15 + 3);
+    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_y_for, noStressScoresTextX, noStressScoresTextY);
+
+    // NO-STRESS-
+    noStressScoresTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_no_stress, 0, GRID_X);
+    noStressScoresTextY = tiltrads->disp->h - (tiltrads->ibm_vga8.h * 14 + 2);
+    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_no_stress, noStressScoresTextX, noStressScoresTextY);
+
+    // TRIS
+    noStressScoresTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_tris, 0, GRID_X);
+    noStressScoresTextY = tiltrads->disp->h - (tiltrads->ibm_vga8.h * 13 + 1);
+    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_tris, noStressScoresTextX, noStressScoresTextY);
+
+    // SCORES
+    noStressScoresTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_scores, 0, GRID_X);
+    noStressScoresTextY = tiltrads->disp->h - (tiltrads->ibm_vga8.h * 12);
+    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_scores, noStressScoresTextX, noStressScoresTextY);
+
+    // X TO PLAY
+    int16_t noStressPlayTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_x_to_play, xFromGridCol(GRID_X, GRID_COLS, GRID_UNIT_SIZE), tiltrads->disp->w);
+    int16_t noStressPlayTextY = tiltrads->disp->h - (tiltrads->ibm_vga8.h * 15 + 3);
+    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_x_to_play, noStressPlayTextX, noStressPlayTextY);
+
+    // NO-STRESS-
+    noStressPlayTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_no_stress, xFromGridCol(GRID_X, GRID_COLS, GRID_UNIT_SIZE), tiltrads->disp->w);
+    noStressPlayTextY = tiltrads->disp->h - (tiltrads->ibm_vga8.h * 14 + 2);
+    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_no_stress, noStressPlayTextX, noStressPlayTextY);
+
+    // TRIS
+    noStressPlayTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_tris, xFromGridCol(GRID_X, GRID_COLS, GRID_UNIT_SIZE), tiltrads->disp->w);
+    noStressPlayTextY = tiltrads->disp->h - (tiltrads->ibm_vga8.h * 13 + 1);
+    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_tris, noStressPlayTextX, noStressPlayTextY);
+
     // SELECT FOR
     int16_t scoresTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_select_for, 0, GRID_X);
     int16_t scoresTextY = tiltrads->disp->h - (tiltrads->ibm_vga8.h * 7 + 1);

From 17f31717a9d7eb7719fddabee6d22619501664b8 Mon Sep 17 00:00:00 2001
From: Brycey92 <bbrowner@optonline.net>
Date: Mon, 28 Nov 2022 18:37:14 -0500
Subject: [PATCH 10/26] Implement tiltrads no-stress-tris title screen controls

---
 main/modes/mode_tiltrads.c | 44 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/main/modes/mode_tiltrads.c b/main/modes/mode_tiltrads.c
index 104290a7..5c715986 100644
--- a/main/modes/mode_tiltrads.c
+++ b/main/modes/mode_tiltrads.c
@@ -35,6 +35,8 @@
 #define BTN_TITLE_START_SCORES SELECT
 #define BTN_TITLE_START_GAME START
 #define BTN_TITLE_START_GAME_ALT BTN_A
+#define BTN_TITLE_START_NO_STRESS_TRIS_SCORES 0 // Y
+#define BTN_TITLE_START_NO_STRESS_TRIS_GAME 4 // X
 //#define BTN_TITLE_EXIT_MODE BTN_B
 
 // Controls (game)
@@ -1420,6 +1422,10 @@ typedef struct
     uint16_t ttButtonsPressedSinceLast;
     uint16_t ttLastButtonState;
 
+    uint16_t ttTouchState;
+    uint16_t ttTouchPressedSinceLast;
+    uint16_t ttLastTouchState;
+
     int64_t modeStartTime; // Time mode started in microseconds.
     int64_t stateStartTime; // Time the most recent state started in microseconds.
     int64_t deltaTime; // Time elapsed since last update in microseconds.
@@ -1451,6 +1457,7 @@ tiltrads_t* tiltrads;
 void ttInit(display_t* disp);
 void ttDeInit(void);
 void ttButtonCallback(buttonEvt_t* evt);
+void ttTouchCallback(touch_event_t* evt);
 void ttAccelerometerCallback(accel_t* accel);
 
 // Game loop functions
@@ -1484,6 +1491,7 @@ bool ttIsButtonPressed(uint8_t button);
 // bool ttIsButtonReleased(uint8_t button);
 bool ttIsButtonDown(uint8_t button);
 bool ttIsButtonUp(uint8_t button);
+bool ttIsTouchPressed(uint8_t touchSegment);
 
 // Grid management
 void copyGrid(coord_t srcOffset, uint8_t srcCols, uint8_t srcRows, const uint32_t src[][srcCols],
@@ -1585,7 +1593,7 @@ swadgeMode modeTiltrads =
     .fnExitMode = ttDeInit,
     .fnMainLoop = ttUpdate,
     .fnButtonCallback = ttButtonCallback,
-    .fnTouchCallback = NULL,
+    .fnTouchCallback = ttTouchCallback,
     .wifiMode = NO_WIFI,
     .fnEspNowRecvCb = NULL,
     .fnEspNowSendCb = NULL,
@@ -1634,6 +1642,10 @@ void ttInit(display_t* disp)
     tiltrads->ttButtonsPressedSinceLast = 0;
     tiltrads->ttLastButtonState = 0;
 
+    tiltrads->ttTouchState = 0;
+    tiltrads->ttTouchPressedSinceLast = 0;
+    tiltrads->ttLastTouchState = 0;
+
     // Reset mode time tracking.
     tiltrads->modeStartTime = esp_timer_get_time();
     tiltrads->stateStartTime = 0;
@@ -1681,6 +1693,17 @@ void ttButtonCallback(buttonEvt_t* evt)
     }
 }
 
+void ttTouchCallback(touch_event_t* evt)
+{
+    tiltrads->ttTouchState = evt->state;  // Set the state of all touchpad segments.
+    // If this was a press
+    if(evt->down)
+    {
+        // Save this press so a quick press/release isn't ignored
+        tiltrads->ttTouchPressedSinceLast |= (1 << evt->pad);
+    }
+}
+
 void ttAccelerometerCallback(accel_t* accel)
 {
     // Set the accelerometer values.
@@ -1732,8 +1755,10 @@ static void ttUpdate(int64_t elapsedUs __attribute__((unused)))
 
     // Mark what our inputs were the last time we acted on them.
     tiltrads->ttLastButtonState = tiltrads->ttButtonState;
+    tiltrads->ttLastTouchState = tiltrads->ttTouchState;
     // Clear the buttons pressed since last check
     tiltrads->ttButtonsPressedSinceLast = 0;
+    tiltrads->ttTouchPressedSinceLast = 0;
     tiltrads->ttLastAccel = tiltrads->ttAccel;
 
     // Handle game logic. (based on the state)
@@ -1813,13 +1838,25 @@ void ttTitleInput(void)
     // Start game.
     if(ttIsButtonPressed(BTN_TITLE_START_GAME) || ttIsButtonPressed(BTN_TITLE_START_GAME_ALT))
     {
+        tiltrads->noStressTris = false;
         ttChangeState(TT_GAME);
     }
     // Go to score screen.
     else if(ttIsButtonPressed(BTN_TITLE_START_SCORES))
     {
+        tiltrads->noStressTris = false;
         ttChangeState(TT_SCORES);
     }
+    else if(ttIsTouchPressed(BTN_TITLE_START_NO_STRESS_TRIS_SCORES))
+    {
+        tiltrads->noStressTris = true;
+        ttChangeState(TT_SCORES);
+    }
+    else if(ttIsTouchPressed(BTN_TITLE_START_NO_STRESS_TRIS_GAME))
+    {
+        tiltrads->noStressTris = true;
+        ttChangeState(TT_GAME);
+    }
 
     /*
     // Exit mode.
@@ -2786,6 +2823,11 @@ bool ttIsButtonUp(uint8_t button)
     return !((tiltrads->ttButtonState | tiltrads->ttButtonsPressedSinceLast) & button);
 }
 
+bool ttIsTouchPressed(uint8_t touchSegment)
+{
+    return ((tiltrads->ttTouchState | tiltrads->ttTouchPressedSinceLast) & (1 << touchSegment)) && !(tiltrads->ttLastTouchState & (1 << touchSegment));
+}
+
 void copyGrid(coord_t srcOffset, uint8_t srcCols, uint8_t srcRows, const uint32_t src[][srcCols],
               uint8_t dstCols, uint8_t dstRows, uint32_t dst[][dstCols])
 {

From d683d43b8d993aa91ca60e0a39759fe2820bbcea Mon Sep 17 00:00:00 2001
From: Brycey92 <bbrowner@optonline.net>
Date: Mon, 28 Nov 2022 18:51:34 -0500
Subject: [PATCH 11/26] Implement separate tiltrads high scores for
 no-stress-tris

---
 main/modes/mode_tiltrads.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/main/modes/mode_tiltrads.c b/main/modes/mode_tiltrads.c
index 5c715986..dbff4b1c 100644
--- a/main/modes/mode_tiltrads.c
+++ b/main/modes/mode_tiltrads.c
@@ -172,6 +172,7 @@ static const char str_high_score[] = "HIGH SCORE!";
 static const char str_your_score[] = "YOUR SCORE:";
 
 static const char KEY_HIGH_SCORE_FORMAT[] = "tt_high_score_%d";
+static const char KEY_NO_STRESS_TRIS_HIGH_SCORE_FORMAT[] = "ttns%d";
 
 #if defined(EMU) && defined(DEBUG)
 static const char str_emu[] = "EMU";
@@ -1847,15 +1848,17 @@ void ttTitleInput(void)
         tiltrads->noStressTris = false;
         ttChangeState(TT_SCORES);
     }
-    else if(ttIsTouchPressed(BTN_TITLE_START_NO_STRESS_TRIS_SCORES))
+    // Start game of no-stress-tris.
+    else if(ttIsTouchPressed(BTN_TITLE_START_NO_STRESS_TRIS_GAME))
     {
         tiltrads->noStressTris = true;
-        ttChangeState(TT_SCORES);
+        ttChangeState(TT_GAME);
     }
-    else if(ttIsTouchPressed(BTN_TITLE_START_NO_STRESS_TRIS_GAME))
+    // Go to no-stress-tris score screen.
+    else if(ttIsTouchPressed(BTN_TITLE_START_NO_STRESS_TRIS_SCORES))
     {
         tiltrads->noStressTris = true;
-        ttChangeState(TT_GAME);
+        ttChangeState(TT_SCORES);
     }
 
     /*
@@ -3829,7 +3832,7 @@ void ttGetHighScores(void)
     char keyStr[32] = {0};
     for (int32_t i = 0; i < NUM_TT_HIGH_SCORES; i++)
     {
-        snprintf(keyStr, sizeof(keyStr), KEY_HIGH_SCORE_FORMAT, i);
+        snprintf(keyStr, sizeof(keyStr), tiltrads->noStressTris ? KEY_NO_STRESS_TRIS_HIGH_SCORE_FORMAT : KEY_HIGH_SCORE_FORMAT, i);
         if (!readNvs32(keyStr, &(tiltrads->highScores[i])))
         {
             tiltrads->highScores[i] = 0;
@@ -3842,7 +3845,7 @@ void ttSetHighScores(void)
     char keyStr[32] = {0};
     for (int32_t i = 0; i < NUM_TT_HIGH_SCORES; i++)
     {
-        snprintf(keyStr, sizeof(keyStr), KEY_HIGH_SCORE_FORMAT, i);
+        snprintf(keyStr, sizeof(keyStr), tiltrads->noStressTris ? KEY_NO_STRESS_TRIS_HIGH_SCORE_FORMAT : KEY_HIGH_SCORE_FORMAT, i);
         writeNvs32(keyStr, tiltrads->highScores[i]);
     }
 }

From 6283f0105ee31d705ddb93be2b91eba3eb47d366 Mon Sep 17 00:00:00 2001
From: Brycey92 <bbrowner@optonline.net>
Date: Mon, 28 Nov 2022 19:11:07 -0500
Subject: [PATCH 12/26] Remove the word "Type" from gamepad menu title

It no longer applies to all menu items, so it's more likely to confuse users now
---
 main/modes/mode_gamepad.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/main/modes/mode_gamepad.c b/main/modes/mode_gamepad.c
index 1eca0200..b1f2c025 100644
--- a/main/modes/mode_gamepad.c
+++ b/main/modes/mode_gamepad.c
@@ -120,7 +120,6 @@ static const char* getButtonName(hid_gamepad_button_bm_t button);
 // Variables
 //==============================================================================
 
-static const char str_gamepadTitle[] = "Gamepad Type";
 static const char str_pc[] = "PC";
 static const char str_ns[] = "Switch";
 static const char str_touch_analog_on[] = "Touch: Digi+Analog";
@@ -207,7 +206,7 @@ void gamepadExitMode(void)
 
 void setGamepadMainMenu(bool resetPos)
 {
-    resetMeleeMenu(gamepad->menu, str_gamepadTitle, gamepadMainMenuCb);
+    resetMeleeMenu(gamepad->menu, modeGamepad.modeName, gamepadMainMenuCb);
     addRowToMeleeMenu(gamepad->menu, str_pc);
     addRowToMeleeMenu(gamepad->menu, str_ns);
     addRowToMeleeMenu(gamepad->menu, gamepad->gamepadToggleSettings.touchAnalogOn ? str_touch_analog_on : str_touch_analog_off);

From 04e28772fbe59a3eaa6064f9dee20b23ddc13a21 Mon Sep 17 00:00:00 2001
From: Jonathan Moriarty <jonathan.taylor.moriarty@gmail.com>
Date: Mon, 5 Dec 2022 00:14:54 -0500
Subject: [PATCH 13/26] pause effect now pauses background scroll fx.

---
 main/modes/mode_tiltrads.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/main/modes/mode_tiltrads.c b/main/modes/mode_tiltrads.c
index 6a7cef3f..5f83423c 100644
--- a/main/modes/mode_tiltrads.c
+++ b/main/modes/mode_tiltrads.c
@@ -2177,14 +2177,14 @@ void ttGameUpdate(void)
                 }*/
             }
         }
-    }
 
-    // Drop FX time advances by the normal amount.
-    tiltrads->dropFXTime += tiltrads->deltaTime;
-    // Drop FX time advances by deltaTime * SOFT_DROP_FX_FACTOR(2) when the soft drop button is being held down. (Happens in softDropTetrad)
+        // Drop FX time advances by the normal amount.
+        tiltrads->dropFXTime += tiltrads->deltaTime;
+        // Drop FX time advances by deltaTime * SOFT_DROP_FX_FACTOR(2) when the soft drop button is being held down. (Happens in softDropTetrad)
 
-    // Drop FX time advances a little bit more according to the currentLevel.
-    tiltrads->dropFXTime += (tiltrads->deltaTime * getDropFXTimeFactor(tiltrads->currentLevel));
+        // Drop FX time advances a little bit more according to the currentLevel.
+        tiltrads->dropFXTime += (tiltrads->deltaTime * getDropFXTimeFactor(tiltrads->currentLevel));
+    }
 
     // Check if we have a new high score.
     tiltrads->newHighScore = tiltrads->score > tiltrads->highScores[0];
@@ -2300,8 +2300,8 @@ void ttGameDisplay(void)
     // Draw the BG FX.
     // Goal: noticeable speed-ups when level increases and when soft drop is being held or released.
     plotPerspectiveEffect(tiltrads->disp, GRID_X, 0, xFromGridCol(GRID_X, GRID_COLS, GRID_UNIT_SIZE), tiltrads->disp->w - 1, 0, tiltrads->disp->h, 3, 3,
-                          5.0,
-                          tiltrads->dropFXTime, c112);
+                        5.0,
+                        tiltrads->dropFXTime, c112);
 
     // Draw the active tetrad.
     plotTetrad(tiltrads->disp, xFromGridCol(GRID_X, tiltrads->activeTetrad.topLeft.c, GRID_UNIT_SIZE),

From 34b773e8a8d3fc6b4944c98b21eecd596da51aa3 Mon Sep 17 00:00:00 2001
From: Brycey92 <bbrowner@optonline.net>
Date: Mon, 5 Dec 2022 05:47:56 -0500
Subject: [PATCH 14/26] Update NVS key for no-stress-tris high scores

---
 main/modes/mode_tiltrads.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/modes/mode_tiltrads.c b/main/modes/mode_tiltrads.c
index dbff4b1c..36261b20 100644
--- a/main/modes/mode_tiltrads.c
+++ b/main/modes/mode_tiltrads.c
@@ -172,7 +172,7 @@ static const char str_high_score[] = "HIGH SCORE!";
 static const char str_your_score[] = "YOUR SCORE:";
 
 static const char KEY_HIGH_SCORE_FORMAT[] = "tt_high_score_%d";
-static const char KEY_NO_STRESS_TRIS_HIGH_SCORE_FORMAT[] = "ttns%d";
+static const char KEY_NO_STRESS_TRIS_HIGH_SCORE_FORMAT[] = "tt_no_stress_%d";
 
 #if defined(EMU) && defined(DEBUG)
 static const char str_emu[] = "EMU";

From 0b9e6f57bdfa7b75d00c601e809ef10d326d1756 Mon Sep 17 00:00:00 2001
From: Brycey92 <bbrowner@optonline.net>
Date: Mon, 5 Dec 2022 06:08:40 -0500
Subject: [PATCH 15/26] Update gamepad settings storage method

---
 main/modes/mode_gamepad.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/main/modes/mode_gamepad.c b/main/modes/mode_gamepad.c
index 6d1b2e86..cd19c548 100644
--- a/main/modes/mode_gamepad.c
+++ b/main/modes/mode_gamepad.c
@@ -126,7 +126,7 @@ static const char str_touch_analog_off[] = "Touch: Digital Only";
 static const char str_accel_on[] = "Accel: On";
 static const char str_accel_off[] = "Accel: Off";
 static const char str_exit[] = "Exit";
-static const char KEY_GAMEPAD_TOGGLES[] = "gpts";
+static const char KEY_GAMEPAD_SETTINGS[] = "gp_settings";
 
 gamepad_t* gamepad;
 
@@ -969,14 +969,15 @@ void gamepadReportStateToHost(void)
 
 static bool saveGamepadToggleSettings(gamepadToggleSettings_t* toggleSettings)
 {
-    return writeNvsBlob(KEY_GAMEPAD_TOGGLES, toggleSettings, sizeof(gamepadToggleSettings_t));
+    int32_t val = ((toggleSettings->accelOn & 1) << 1) | ((toggleSettings->touchAnalogOn & 1) << 0);
+    return writeNvs32(KEY_GAMEPAD_SETTINGS, val);
 }
 
 static bool loadGamepadToggleSettings(gamepadToggleSettings_t* toggleSettings)
 {
-    size_t size = sizeof(gamepadToggleSettings_t);
-    bool r = readNvsBlob(KEY_GAMEPAD_TOGGLES, toggleSettings, &size);
-    if (!r || size != sizeof(gamepadToggleSettings_t))
+    int32_t val;
+    bool r = readNvs32(KEY_GAMEPAD_SETTINGS, &val);
+    if (!r)
     {
         memset(toggleSettings, 0, sizeof(gamepadToggleSettings_t));
         toggleSettings->accelOn = true;
@@ -984,5 +985,7 @@ static bool loadGamepadToggleSettings(gamepadToggleSettings_t* toggleSettings)
         return saveGamepadToggleSettings(toggleSettings);
     }
 
+    toggleSettings->accelOn = (val >> 1) & 1;
+    toggleSettings->touchAnalogOn = (val >> 0) & 1;
     return true;
 }

From b6e349d2faff70ee5cc36e7508ec4e3cdcd4e0f4 Mon Sep 17 00:00:00 2001
From: Brycey92 <bbrowner@optonline.net>
Date: Mon, 5 Dec 2022 22:10:50 -0500
Subject: [PATCH 16/26] Swap relative positions of no-stress-tris text and
 normal tris text

---
 main/modes/mode_tiltrads.c | 55 ++++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 26 deletions(-)

diff --git a/main/modes/mode_tiltrads.c b/main/modes/mode_tiltrads.c
index 7f1c276f..0672f351 100644
--- a/main/modes/mode_tiltrads.c
+++ b/main/modes/mode_tiltrads.c
@@ -2304,60 +2304,63 @@ void ttTitleDisplay(void)
                           2.0,
                           tiltrads->stateTime, c112);
 
+
+    // SELECT FOR
+    int16_t scoresTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_select_for, 0, GRID_X);
+    int16_t scoresTextY = tiltrads->disp->h - (tiltrads->ibm_vga8.h * 12 + 1);
+    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_select_for, scoresTextX, scoresTextY);
+
+    // SCORES
+    scoresTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_scores, 0, GRID_X);
+    scoresTextY += tiltrads->ibm_vga8.h + 1;
+    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_scores, scoresTextX, scoresTextY);
+
+    // START TO
+    int16_t playTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_start_to, xFromGridCol(GRID_X, GRID_COLS, GRID_UNIT_SIZE), tiltrads->disp->w);
+    int16_t playTextY = tiltrads->disp->h - (tiltrads->ibm_vga8.h * 12 + 1);
+    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_start_to, playTextX, playTextY);
+
+    // PLAY
+    playTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_play, xFromGridCol(GRID_X, GRID_COLS, GRID_UNIT_SIZE), tiltrads->disp->w);
+    playTextY += tiltrads->ibm_vga8.h + 1;
+    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_play, playTextX, playTextY);
+
+
     // Y FOR
     int16_t noStressScoresTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_y_for, 0, GRID_X);
-    int16_t noStressScoresTextY = tiltrads->disp->h - (tiltrads->ibm_vga8.h * 15 + 3);
+    int16_t noStressScoresTextY = tiltrads->disp->h - (tiltrads->ibm_vga8.h * 6 + 3);
     drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_y_for, noStressScoresTextX, noStressScoresTextY);
 
     // NO-STRESS-
     noStressScoresTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_no_stress, 0, GRID_X);
-    noStressScoresTextY = tiltrads->disp->h - (tiltrads->ibm_vga8.h * 14 + 2);
+    noStressScoresTextY += tiltrads->ibm_vga8.h + 1;
     drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_no_stress, noStressScoresTextX, noStressScoresTextY);
 
     // TRIS
     noStressScoresTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_tris, 0, GRID_X);
-    noStressScoresTextY = tiltrads->disp->h - (tiltrads->ibm_vga8.h * 13 + 1);
+    noStressScoresTextY += tiltrads->ibm_vga8.h + 1;
     drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_tris, noStressScoresTextX, noStressScoresTextY);
 
     // SCORES
     noStressScoresTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_scores, 0, GRID_X);
-    noStressScoresTextY = tiltrads->disp->h - (tiltrads->ibm_vga8.h * 12);
+    noStressScoresTextY += tiltrads->ibm_vga8.h + 1;
     drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_scores, noStressScoresTextX, noStressScoresTextY);
 
     // X TO PLAY
     int16_t noStressPlayTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_x_to_play, xFromGridCol(GRID_X, GRID_COLS, GRID_UNIT_SIZE), tiltrads->disp->w);
-    int16_t noStressPlayTextY = tiltrads->disp->h - (tiltrads->ibm_vga8.h * 15 + 3);
+    int16_t noStressPlayTextY = tiltrads->disp->h - (tiltrads->ibm_vga8.h * 6 + 3);
     drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_x_to_play, noStressPlayTextX, noStressPlayTextY);
 
     // NO-STRESS-
     noStressPlayTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_no_stress, xFromGridCol(GRID_X, GRID_COLS, GRID_UNIT_SIZE), tiltrads->disp->w);
-    noStressPlayTextY = tiltrads->disp->h - (tiltrads->ibm_vga8.h * 14 + 2);
+    noStressPlayTextY += tiltrads->ibm_vga8.h + 1;
     drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_no_stress, noStressPlayTextX, noStressPlayTextY);
 
     // TRIS
     noStressPlayTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_tris, xFromGridCol(GRID_X, GRID_COLS, GRID_UNIT_SIZE), tiltrads->disp->w);
-    noStressPlayTextY = tiltrads->disp->h - (tiltrads->ibm_vga8.h * 13 + 1);
+    noStressPlayTextY += tiltrads->ibm_vga8.h + 1;
     drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_tris, noStressPlayTextX, noStressPlayTextY);
 
-    // SELECT FOR
-    int16_t scoresTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_select_for, 0, GRID_X);
-    int16_t scoresTextY = tiltrads->disp->h - (tiltrads->ibm_vga8.h * 7 + 1);
-    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_select_for, scoresTextX, scoresTextY);
-
-    // SCORES
-    scoresTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_scores, 0, GRID_X);
-    scoresTextY = tiltrads->disp->h - (tiltrads->ibm_vga8.h * 6);
-    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_scores, scoresTextX, scoresTextY);
-
-    // START TO
-    int16_t playTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_start_to, xFromGridCol(GRID_X, GRID_COLS, GRID_UNIT_SIZE), tiltrads->disp->w);
-    int16_t playTextY = tiltrads->disp->h - (tiltrads->ibm_vga8.h * 7 + 1);
-    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_start_to, playTextX, playTextY);
-
-    // PLAY
-    playTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_play, xFromGridCol(GRID_X, GRID_COLS, GRID_UNIT_SIZE), tiltrads->disp->w);
-    playTextY = tiltrads->disp->h - (tiltrads->ibm_vga8.h * 6);
-    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_play, playTextX, playTextY);
 
     // Clear the grid data. (may not want to do this every frame)
     refreshTetradsGrid(TUTORIAL_GRID_COLS, TUTORIAL_GRID_ROWS, tiltrads->tutorialTetradsGrid, tiltrads->landedTetrads, &(tiltrads->tutorialTetrad),

From 0e6b4f179cd34ece67ed8f898a7ad9e596434756 Mon Sep 17 00:00:00 2001
From: Brycey92 <bbrowner@optonline.net>
Date: Mon, 5 Dec 2022 22:13:20 -0500
Subject: [PATCH 17/26] Rename no-stress-tris to no-stress mode

---
 main/modes/mode_tiltrads.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/modes/mode_tiltrads.c b/main/modes/mode_tiltrads.c
index 0672f351..ca212d08 100644
--- a/main/modes/mode_tiltrads.c
+++ b/main/modes/mode_tiltrads.c
@@ -139,8 +139,8 @@
 // Any const strings go here.
 
 static const char str_y_for[] ="Y FOR";
-static const char str_no_stress[] = "NO-STRESS-";
-static const char str_tris[] = "TRIS";
+static const char str_no_stress[] = "NO-STRESS";
+static const char str_tris[] = "MODE";
 static const char str_x_to_play[] = "X TO PLAY";
 static const char str_select_for[] = "SELECT FOR";
 static const char str_scores[] = "SCORES";

From e600e9e388deed16239eb35b8f4b296847396d8c Mon Sep 17 00:00:00 2001
From: Brycey92 <bbrowner@optonline.net>
Date: Tue, 6 Dec 2022 00:06:44 -0500
Subject: [PATCH 18/26] Add - and + button labels, and button combo text to NS
 gamepad

Also fix NS button names and comments in code
---
 .../tinyusb/tinyusb/src/class/hid/hid.h       | 31 ++++----
 emu/src/idf-inc/tusb_hid_gamepad.h            |  8 +-
 main/modes/mode_gamepad.c                     | 75 +++++++++++++++----
 3 files changed, 78 insertions(+), 36 deletions(-)

diff --git a/components/tinyusb/tinyusb/src/class/hid/hid.h b/components/tinyusb/tinyusb/src/class/hid/hid.h
index c1cecdf0..900aad74 100644
--- a/components/tinyusb/tinyusb/src/class/hid/hid.h
+++ b/components/tinyusb/tinyusb/src/class/hid/hid.h
@@ -234,22 +234,21 @@ typedef enum
 /// Switch Gamepad Buttons Bitmap
 typedef enum
 {
-  GAMEPAD_NS_BUTTON_Y      = 0x01, //TU_BIT(0),  ///< A/South button
-  GAMEPAD_NS_BUTTON_B      = 0x02, //TU_BIT(1),  ///< B/East button
-  GAMEPAD_NS_BUTTON_A      = 0x04, //TU_BIT(2),  ///< C button
-  GAMEPAD_NS_BUTTON_X      = 0x08, //TU_BIT(3),  ///< X/North button
-  GAMEPAD_NS_BUTTON_TL      = 0x10, //TU_BIT(4),  ///< Y/West button
-  GAMEPAD_NS_BUTTON_TR      = 0x20, //TU_BIT(5),  ///< Z button //CAPTURE
-  GAMEPAD_NS_BUTTON_TL2     = 0x40, //TU_BIT(6),  ///< L1 button
-  GAMEPAD_NS_BUTTON_TR2     = 0x80, //TU_BIT(7),  ///< R1 button
-  GAMEPAD_NS_BUTTON_SELECT    = 0x100, //TU_BIT(8),  ///< L2 button
-  GAMEPAD_NS_BUTTON_START    = 0x200, //TU_BIT(9),  ///< R2 button
-  GAMEPAD_NS_BUTTON_THUMBL = 0x400, //TU_BIT(10), ///< Select button
-  GAMEPAD_NS_BUTTON_THUMBR  = 0x800, //TU_BIT(11), ///< Start button
-  GAMEPAD_NS_BUTTON_MODE   = 0x1000, //TU_BIT(12), ///< Mode button //UNUSED?
-  GAMEPAD_NS_BUTTON_C = 0x2000, //TU_BIT(13), ///< L3 button
-  GAMEPAD_NS_BUTTON_Z = 0x4000, //TU_BIT(14), ///< R3 button
-//GAMEPAD_NS_BUTTON_       = TU_BIT(15), ///< Undefined button
+  GAMEPAD_NS_BUTTON_Y       = 0x01,
+  GAMEPAD_NS_BUTTON_B       = 0x02,
+  GAMEPAD_NS_BUTTON_A       = 0x04,
+  GAMEPAD_NS_BUTTON_X       = 0x08,
+  GAMEPAD_NS_BUTTON_TL      = 0x10,
+  GAMEPAD_NS_BUTTON_TR      = 0x20,
+  GAMEPAD_NS_BUTTON_TL2     = 0x40,
+  GAMEPAD_NS_BUTTON_TR2     = 0x80,
+  GAMEPAD_NS_BUTTON_MINUS   = 0x100,
+  GAMEPAD_NS_BUTTON_PLUS    = 0x200,
+  GAMEPAD_NS_BUTTON_THUMBL  = 0x400,
+  GAMEPAD_NS_BUTTON_THUMBR  = 0x800,
+  GAMEPAD_NS_BUTTON_HOME    = 0x1000,
+  GAMEPAD_NS_BUTTON_CAPTURE = 0x2000,
+  GAMEPAD_NS_BUTTON_Z       = 0x4000, ///UNUSED?
 }hid_gamepad_ns_button_bm_t;
 
 /// Standard Gamepad HAT/DPAD Buttons (from Linux input event codes)
diff --git a/emu/src/idf-inc/tusb_hid_gamepad.h b/emu/src/idf-inc/tusb_hid_gamepad.h
index 8fb0008f..386de2dc 100644
--- a/emu/src/idf-inc/tusb_hid_gamepad.h
+++ b/emu/src/idf-inc/tusb_hid_gamepad.h
@@ -88,12 +88,12 @@ typedef enum
 #define GAMEPAD_NS_BUTTON_TR      0x20
 #define GAMEPAD_NS_BUTTON_TL2     0x40
 #define GAMEPAD_NS_BUTTON_TR2     0x80
-#define GAMEPAD_NS_BUTTON_SELECT  0x100
-#define GAMEPAD_NS_BUTTON_START   0x200
+#define GAMEPAD_NS_BUTTON_MINUS   0x100
+#define GAMEPAD_NS_BUTTON_PLUS    0x200
 #define GAMEPAD_NS_BUTTON_THUMBL  0x400
 #define GAMEPAD_NS_BUTTON_THUMBR  0x800
-#define GAMEPAD_NS_BUTTON_MODE    0x1000
-#define GAMEPAD_NS_BUTTON_C       0x2000
+#define GAMEPAD_NS_BUTTON_HOME    0x1000
+#define GAMEPAD_NS_BUTTON_CAPTURE 0x2000
 #define GAMEPAD_NS_BUTTON_Z       0x4000
 
 /// Standard Gamepad HAT/DPAD Buttons (from Linux input event codes)
diff --git a/main/modes/mode_gamepad.c b/main/modes/mode_gamepad.c
index b1f2c025..13be44de 100644
--- a/main/modes/mode_gamepad.c
+++ b/main/modes/mode_gamepad.c
@@ -498,6 +498,22 @@ void gamepadMainLoop(int64_t elapsedUs __attribute__((unused)))
     int16_t tWidth = textWidth(&gamepad->ibmFont, reminderText);
     drawText(gamepad->disp, &gamepad->ibmFont, c555, reminderText, (gamepad->disp->w - tWidth) / 2, 10);
 
+    if(gamepad->gamepadType == GAMEPAD_NS)
+    {
+        // Draw button combo text, centered
+        const char captureText[] = "Down + Select:  Capture";
+        tWidth = textWidth(&gamepad->ibmFont, captureText);
+        int16_t textX = (gamepad->disp->w - tWidth) / 2;
+        int16_t afterText = drawText(gamepad->disp, &gamepad->ibmFont, c555, captureText, textX, gamepad->disp->h - gamepad->ibmFont.h * 2 - 12);
+
+        const char homeText1[] = "Down + Start:";
+        drawText(gamepad->disp, &gamepad->ibmFont, c555, homeText1, textX, gamepad->disp->h - gamepad->ibmFont.h - 10);
+
+        const char* homeText2 = getButtonName(GAMEPAD_NS_BUTTON_HOME);
+        tWidth = textWidth(&gamepad->ibmFont, homeText2);
+        drawText(gamepad->disp, &gamepad->ibmFont, c555, homeText2, afterText - tWidth - 1, gamepad->disp->h - gamepad->ibmFont.h - 10);
+    }
+
     // If it's plugged in, draw buttons
     if(gamepad->isPluggedIn)
     {
@@ -548,7 +564,7 @@ void gamepadMainLoop(int64_t elapsedUs __attribute__((unused)))
         // Select button
         switch(gamepad->gamepadType){
             case GAMEPAD_NS:{
-                drawFunc = (gamepad->gpNsState.buttons & GAMEPAD_NS_BUTTON_SELECT) ? &plotCircleFilled : &plotCircle;
+                drawFunc = (gamepad->gpNsState.buttons & GAMEPAD_NS_BUTTON_MINUS) ? &plotCircleFilled : &plotCircle;
                 break;
             }
             case GAMEPAD_GENERIC:
@@ -557,15 +573,23 @@ void gamepadMainLoop(int64_t elapsedUs __attribute__((unused)))
                 break;
             }
         }
+        int16_t x = (gamepad->disp->w / 2) - START_BTN_RADIUS - START_BTN_SEP;
+        int16_t y = (gamepad->disp->h / 4) + Y_OFF;
         drawFunc(gamepad->disp,
-                 (gamepad->disp->w / 2) - START_BTN_RADIUS - START_BTN_SEP,
-                 (gamepad->disp->h / 4) + Y_OFF,
+                 x,
+                 y,
                  START_BTN_RADIUS, c333);
 
+        if(gamepad->gamepadType == GAMEPAD_NS)
+        {
+            const char* buttonName = getButtonName(GAMEPAD_NS_BUTTON_MINUS);
+            drawText(gamepad->disp, &gamepad->ibmFont, c444, buttonName, x - textWidth(&gamepad->ibmFont, buttonName) / 2, y - gamepad->ibmFont.h / 2);
+        }
+
         // Start button
         switch(gamepad->gamepadType){ 
             case GAMEPAD_NS:{
-                drawFunc = (gamepad->gpNsState.buttons & GAMEPAD_NS_BUTTON_START) ? &plotCircleFilled : &plotCircle;
+                drawFunc = (gamepad->gpNsState.buttons & GAMEPAD_NS_BUTTON_PLUS) ? &plotCircleFilled : &plotCircle;
                 break;
             }
             case GAMEPAD_GENERIC:
@@ -574,11 +598,18 @@ void gamepadMainLoop(int64_t elapsedUs __attribute__((unused)))
                 break;
             }
         }
+        x = (gamepad->disp->w / 2) + START_BTN_RADIUS + START_BTN_SEP;
         drawFunc(gamepad->disp,
-                 (gamepad->disp->w / 2) + START_BTN_RADIUS + START_BTN_SEP,
-                 (gamepad->disp->h / 4) + Y_OFF,
+                 x,
+                 y,
                  START_BTN_RADIUS, c333);
 
+        if(gamepad->gamepadType == GAMEPAD_NS)
+        {
+            const char* buttonName = getButtonName(GAMEPAD_NS_BUTTON_PLUS);
+            drawText(gamepad->disp, &gamepad->ibmFont, c444, buttonName, x - textWidth(&gamepad->ibmFont, buttonName) / 2, y - gamepad->ibmFont.h / 2);
+        }
+
         // Button A
         switch(gamepad->gamepadType){
             case GAMEPAD_NS:{
@@ -803,17 +834,17 @@ void gamepadButtonCb(buttonEvt_t* evt)
             if(evt->state & START)
             {
                 if(evt->state & DOWN){
-                    gamepad->gpNsState.buttons |= GAMEPAD_NS_BUTTON_MODE;
+                    gamepad->gpNsState.buttons |= GAMEPAD_NS_BUTTON_HOME;
                 } else {
-                    gamepad->gpNsState.buttons |= GAMEPAD_NS_BUTTON_START;
+                    gamepad->gpNsState.buttons |= GAMEPAD_NS_BUTTON_PLUS;
                 }
             }
             if(evt->state & SELECT)
             {
                 if(evt->state & DOWN){
-                    gamepad->gpNsState.buttons |= GAMEPAD_NS_BUTTON_C;
+                    gamepad->gpNsState.buttons |= GAMEPAD_NS_BUTTON_CAPTURE;
                 } else {
-                    gamepad->gpNsState.buttons |= GAMEPAD_NS_BUTTON_SELECT;
+                    gamepad->gpNsState.buttons |= GAMEPAD_NS_BUTTON_MINUS;
                 }
             }
 
@@ -1035,18 +1066,30 @@ static const char* getButtonName(hid_gamepad_button_bm_t button)
         {
             return "ZR";
         }
-        case GAMEPAD_NS_BUTTON_SELECT:
+        case GAMEPAD_NS_BUTTON_MINUS:
         {
-            return "Select";
+            return "-";
         }
-        case GAMEPAD_NS_BUTTON_START:
+        case GAMEPAD_NS_BUTTON_PLUS:
         {
-            return "Start";
+            return "+";
+        }
+        case GAMEPAD_NS_BUTTON_HOME:
+        {
+            return "HOME";
+        }
+        case GAMEPAD_NS_BUTTON_CAPTURE:
+        {
+            return "Capture";
         }
         case GAMEPAD_NS_BUTTON_THUMBL:
+        {
+            return "Left Stick";
+        }
         case GAMEPAD_NS_BUTTON_THUMBR:
-        case GAMEPAD_NS_BUTTON_MODE:
-        case GAMEPAD_NS_BUTTON_C:
+        {
+            return "Right Stick";
+        }
         case GAMEPAD_NS_BUTTON_Z:
         default:
         {

From 40933d8fa04f0cca40e4047c2fc7beaff9012308 Mon Sep 17 00:00:00 2001
From: Brycey92 <bbrowner@optonline.net>
Date: Tue, 6 Dec 2022 00:53:08 -0500
Subject: [PATCH 19/26] Rejigger gamepad settings storage method again

---
 main/modes/mode_gamepad.c | 65 ++++++++++++++++++++-------------------
 1 file changed, 34 insertions(+), 31 deletions(-)

diff --git a/main/modes/mode_gamepad.c b/main/modes/mode_gamepad.c
index cd19c548..52fc3b10 100644
--- a/main/modes/mode_gamepad.c
+++ b/main/modes/mode_gamepad.c
@@ -66,12 +66,20 @@ typedef enum {
 // Structs
 //==============================================================================
 
-typedef struct
+typedef struct // 4 bools = 4 bytes = 32 bits
 {
-    bool touchAnalogOn;
+    bool touchAnalogOn; // Least significant byte
     bool accelOn;
+    bool _reserved1;
+    bool _reserved2; // Most significant byte
 } gamepadToggleSettings_t;
 
+union gamepadToggleSettings_u
+{
+    int32_t i;
+    gamepadToggleSettings_t settings;
+};
+
 typedef struct
 {
     display_t* disp;
@@ -88,7 +96,7 @@ typedef struct
     uint8_t gamepadType;
     bool isPluggedIn;
 
-    gamepadToggleSettings_t gamepadToggleSettings;
+    union gamepadToggleSettings_u gamepadToggleSettings;
 } gamepad_t;
 
 //==============================================================================
@@ -111,8 +119,8 @@ void gamepadMenuTouchCb(touch_event_t* evt);
 void gamepadMenuAccelCb(accel_t* accel);
 void gamepadStart(display_t* disp, gamepadType_t type);
 
-static bool saveGamepadToggleSettings(gamepadToggleSettings_t* toggleSettings);
-static bool loadGamepadToggleSettings(gamepadToggleSettings_t* toggleSettings);
+static bool saveGamepadToggleSettings(union gamepadToggleSettings_u* toggleSettings);
+static bool loadGamepadToggleSettings(union gamepadToggleSettings_u* toggleSettings);
 
 //==============================================================================
 // Variables
@@ -208,8 +216,8 @@ void setGamepadMainMenu(bool resetPos)
     resetMeleeMenu(gamepad->menu, str_gamepadTitle, gamepadMainMenuCb);
     addRowToMeleeMenu(gamepad->menu, str_pc);
     addRowToMeleeMenu(gamepad->menu, str_ns);
-    addRowToMeleeMenu(gamepad->menu, gamepad->gamepadToggleSettings.touchAnalogOn ? str_touch_analog_on : str_touch_analog_off);
-    addRowToMeleeMenu(gamepad->menu, gamepad->gamepadToggleSettings.accelOn ? str_accel_on : str_accel_off);
+    addRowToMeleeMenu(gamepad->menu, gamepad->gamepadToggleSettings.settings.touchAnalogOn ? str_touch_analog_on : str_touch_analog_off);
+    addRowToMeleeMenu(gamepad->menu, gamepad->gamepadToggleSettings.settings.accelOn ? str_accel_on : str_accel_off);
     addRowToMeleeMenu(gamepad->menu, str_exit);
 
     gamepad->screen = GAMEPAD_MENU;
@@ -253,7 +261,7 @@ void gamepadMainMenuCb(const char* opt)
     if(opt == str_touch_analog_on)
     {
         // Touch analog is on, turn it off
-        gamepad->gamepadToggleSettings.touchAnalogOn = false;
+        gamepad->gamepadToggleSettings.settings.touchAnalogOn = false;
         saveGamepadToggleSettings(&gamepad->gamepadToggleSettings);
 
         needRedraw = true;
@@ -261,7 +269,7 @@ void gamepadMainMenuCb(const char* opt)
     else if(opt == str_touch_analog_off)
     {
         // Touch analog is off, turn it on
-        gamepad->gamepadToggleSettings.touchAnalogOn = true;
+        gamepad->gamepadToggleSettings.settings.touchAnalogOn = true;
         saveGamepadToggleSettings(&gamepad->gamepadToggleSettings);
 
         needRedraw = true;
@@ -269,7 +277,7 @@ void gamepadMainMenuCb(const char* opt)
     else if(opt == str_accel_on)
     {
         // Accel is on, turn it off
-        gamepad->gamepadToggleSettings.accelOn = false;
+        gamepad->gamepadToggleSettings.settings.accelOn = false;
         saveGamepadToggleSettings(&gamepad->gamepadToggleSettings);
 
         needRedraw = true;
@@ -277,7 +285,7 @@ void gamepadMainMenuCb(const char* opt)
     else if(opt == str_accel_off)
     {
         // Accel is off, turn it on
-        gamepad->gamepadToggleSettings.accelOn = true;
+        gamepad->gamepadToggleSettings.settings.accelOn = true;
         saveGamepadToggleSettings(&gamepad->gamepadToggleSettings);
 
         needRedraw = true;
@@ -391,7 +399,7 @@ void gamepadMenuButtonCb(buttonEvt_t* evt)
                     if(str_touch_analog_on == gamepad->menu->rows[gamepad->menu->selectedRow])
                     {
                         // Touch analog is on, turn it off
-                        gamepad->gamepadToggleSettings.touchAnalogOn = false;
+                        gamepad->gamepadToggleSettings.settings.touchAnalogOn = false;
                         saveGamepadToggleSettings(&gamepad->gamepadToggleSettings);
 
                         needRedraw = true;
@@ -399,7 +407,7 @@ void gamepadMenuButtonCb(buttonEvt_t* evt)
                     else if(str_touch_analog_off == gamepad->menu->rows[gamepad->menu->selectedRow])
                     {
                         // Touch analog is off, turn it on
-                        gamepad->gamepadToggleSettings.touchAnalogOn = true;
+                        gamepad->gamepadToggleSettings.settings.touchAnalogOn = true;
                         saveGamepadToggleSettings(&gamepad->gamepadToggleSettings);
 
                         needRedraw = true;
@@ -407,7 +415,7 @@ void gamepadMenuButtonCb(buttonEvt_t* evt)
                     else if(str_accel_on == gamepad->menu->rows[gamepad->menu->selectedRow])
                     {
                         // Accel is on, turn it off
-                        gamepad->gamepadToggleSettings.accelOn = false;
+                        gamepad->gamepadToggleSettings.settings.accelOn = false;
                         saveGamepadToggleSettings(&gamepad->gamepadToggleSettings);
 
                         needRedraw = true;
@@ -415,7 +423,7 @@ void gamepadMenuButtonCb(buttonEvt_t* evt)
                     else if(str_accel_off == gamepad->menu->rows[gamepad->menu->selectedRow])
                     {
                         // Accel is off, turn it on
-                        gamepad->gamepadToggleSettings.accelOn = true;
+                        gamepad->gamepadToggleSettings.settings.accelOn = true;
                         saveGamepadToggleSettings(&gamepad->gamepadToggleSettings);
 
                         needRedraw = true;
@@ -616,7 +624,7 @@ void gamepadMainLoop(int64_t elapsedUs __attribute__((unused)))
         int16_t tBarX = gamepad->disp->w - TOUCHBAR_WIDTH;
 
         // If we're on the generic gamepad and touch analog is enabled, plot the extra indicator on the screen
-        if(gamepad->gamepadType == GAMEPAD_GENERIC && gamepad->gamepadToggleSettings.touchAnalogOn)
+        if(gamepad->gamepadType == GAMEPAD_GENERIC && gamepad->gamepadToggleSettings.settings.touchAnalogOn)
         {
             int32_t center, intensity;
             if(gamepad->gpState.buttons & ((touchMap[0] | touchMap[1] | touchMap[2] | touchMap[3] | touchMap[4])))
@@ -662,7 +670,7 @@ void gamepadMainLoop(int64_t elapsedUs __attribute__((unused)))
             tBarX += (TOUCHBAR_WIDTH / numTouchElem);
         }
 
-        if(gamepad->gamepadToggleSettings.accelOn && gamepad->gamepadType == GAMEPAD_GENERIC)
+        if(gamepad->gamepadToggleSettings.settings.accelOn && gamepad->gamepadType == GAMEPAD_GENERIC)
         {
             // Set up drawing accel bars
             int16_t barY = (gamepad->disp->h * 3) / 4;
@@ -899,7 +907,7 @@ void gamepadTouchCb(touch_event_t* evt)
  */
 void gamepadAccelCb(accel_t* accel)
 {
-    if(!gamepad->gamepadToggleSettings.accelOn)
+    if(!gamepad->gamepadToggleSettings.settings.accelOn)
     {
         return;
     }
@@ -931,7 +939,7 @@ void gamepadReportStateToHost(void)
     {
         switch(gamepad->gamepadType){
             case GAMEPAD_GENERIC: {
-                if(gamepad->gamepadToggleSettings.touchAnalogOn && gamepad->gpState.buttons & ((touchMap[0] | touchMap[1] | touchMap[2] | touchMap[3] | touchMap[4])))
+                if(gamepad->gamepadToggleSettings.settings.touchAnalogOn && gamepad->gpState.buttons & ((touchMap[0] | touchMap[1] | touchMap[2] | touchMap[3] | touchMap[4])))
                 {
                     int32_t center, intensity;
                     getTouchCentroid(&center, &intensity);
@@ -967,25 +975,20 @@ void gamepadReportStateToHost(void)
     }    
 }
 
-static bool saveGamepadToggleSettings(gamepadToggleSettings_t* toggleSettings)
+static bool saveGamepadToggleSettings(union gamepadToggleSettings_u* toggleSettings)
 {
-    int32_t val = ((toggleSettings->accelOn & 1) << 1) | ((toggleSettings->touchAnalogOn & 1) << 0);
-    return writeNvs32(KEY_GAMEPAD_SETTINGS, val);
+    return writeNvs32(KEY_GAMEPAD_SETTINGS, toggleSettings->i);
 }
 
-static bool loadGamepadToggleSettings(gamepadToggleSettings_t* toggleSettings)
+static bool loadGamepadToggleSettings(union gamepadToggleSettings_u* toggleSettings)
 {
-    int32_t val;
-    bool r = readNvs32(KEY_GAMEPAD_SETTINGS, &val);
+    bool r = readNvs32(KEY_GAMEPAD_SETTINGS, &toggleSettings->i);
     if (!r)
     {
-        memset(toggleSettings, 0, sizeof(gamepadToggleSettings_t));
-        toggleSettings->accelOn = true;
-        toggleSettings->touchAnalogOn = true;
+        memset(toggleSettings, 0, sizeof(union gamepadToggleSettings_u));
+        toggleSettings->settings.accelOn = true;
+        toggleSettings->settings.touchAnalogOn = true;
         return saveGamepadToggleSettings(toggleSettings);
     }
-
-    toggleSettings->accelOn = (val >> 1) & 1;
-    toggleSettings->touchAnalogOn = (val >> 0) & 1;
     return true;
 }

From c5409a229a31b2eefae9c11b8dd8ff7065d39d02 Mon Sep 17 00:00:00 2001
From: Brycey92 <bbrowner@optonline.net>
Date: Thu, 8 Dec 2022 19:06:01 -0500
Subject: [PATCH 20/26] Allow entry into secret menu more than once without
 reload

---
 main/modes/mode_main_menu.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/main/modes/mode_main_menu.c b/main/modes/mode_main_menu.c
index b8a48e6c..3f1c3614 100644
--- a/main/modes/mode_main_menu.c
+++ b/main/modes/mode_main_menu.c
@@ -404,6 +404,15 @@ void mainMenuButtonCb(buttonEvt_t* evt)
                 // If not on the main menu
                 if(mainMenuTitle != mainMenu->menu->title)
                 {
+                    // If we're in the secret menu, reset related variables
+                    if(mainMenuSecret == mainMenu->menu->title)
+                    {
+                        mainMenu->menuSelection = 0;
+                        mainMenu->btnState = 0;
+                        mainMenu->prevBtnState = 0;
+                        mainMenu->debugMode = false;
+                    }
+
                     // Go back to the main menu
                     mainMenuSetUpTopMenu(false);
                     return;

From cc267cbb282b6443a8aa5179ed37add1af0adcea Mon Sep 17 00:00:00 2001
From: Brycey92 <bbrowner@optonline.net>
Date: Thu, 8 Dec 2022 20:08:19 -0500
Subject: [PATCH 21/26] Add setting to show secret menu on main menu

---
 main/modes/mode_main_menu.c | 70 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 69 insertions(+), 1 deletion(-)

diff --git a/main/modes/mode_main_menu.c b/main/modes/mode_main_menu.c
index 3f1c3614..40e29554 100644
--- a/main/modes/mode_main_menu.c
+++ b/main/modes/mode_main_menu.c
@@ -32,6 +32,7 @@
 #include "mode_test.h"
 #include "mode_tiltrads.h"
 #include "mode_tunernome.h"
+#include "nvs_manager.h"
 #include "picross_menu.h"
 // #include "picross_select.h"
 #if defined(EMU)
@@ -92,6 +93,7 @@ typedef struct
     // wsg_t usb;
     int32_t autoLightDanceTimer;
     bool debugMode;
+    bool showSecretsMenu;
     char gitStr[6 + GIT_SHA1_LENGTH];
 } mainMenu_t;
 
@@ -135,6 +137,9 @@ char mainMenuLedBrightness[] = "LED Brightness: 1";
 char mainMenuMicGain[] = "Mic Gain: 1";
 char mainMenuScreensaverTimeout[] = "Screensaver: 20s";
 char mainMenuScreensaverOff[] = "Screensaver: Off";
+char mainMenuShowSecretsMenuOn[] = "ShowOnMenu: On";
+char mainMenuShowSecretsMenuOff[] = "ShowOnMenu: Off";
+char mainMenuShowSecretsMenuKey[] = "show_secrets";
 const char mainMenuCredits[] = "Credits";
 #if defined(EMU)
 const char mainMenuExit[] = "Exit";
@@ -186,6 +191,14 @@ void mainMenuEnterMode(display_t* disp)
     loadWsg("batt4.wsg", &mainMenu->batt[3]);
     // loadWsg("usb.wsg", &mainMenu->usb);
 
+    // Load setting to show secrets menu on main menu
+    int32_t val;
+    if(readNvs32(mainMenuShowSecretsMenuKey, &val))
+    {
+        mainMenu->showSecretsMenu = (bool) val;
+    }
+    // If the key doesn't exist, don't create it yet. We set its default value the first time the secret menu is opened
+
     snprintf(mainMenu->gitStr, sizeof(mainMenu->gitStr), "Git: %s", GIT_SHA1);
 
     // Initialize the menu
@@ -397,6 +410,24 @@ void mainMenuButtonCb(buttonEvt_t* evt)
                     // Redraw menu options
                     mainMenuSetUpSettingsMenu(false);
                 }
+                else if(mainMenuSecret == mainMenu->menu->title)
+                {
+                    // Save the position
+                    mainMenu->secretPos = mainMenu->menu->selectedRow;
+
+                    if(mainMenuShowSecretsMenuOn == mainMenu->menu->rows[mainMenu->menu->selectedRow])
+                    {
+                        mainMenu->showSecretsMenu = false;
+                        writeNvs32(mainMenuShowSecretsMenuKey, mainMenu->showSecretsMenu);
+                        mainMenuSetUpSecretMenu(false);
+                    }
+                    else if(mainMenuShowSecretsMenuOff == mainMenu->menu->rows[mainMenu->menu->selectedRow])
+                    {
+                        mainMenu->showSecretsMenu = true;
+                        writeNvs32(mainMenuShowSecretsMenuKey, mainMenu->showSecretsMenu);
+                        mainMenuSetUpSecretMenu(false);
+                    }
+                }
                 break;
             }
             case BTN_B:
@@ -436,6 +467,10 @@ void mainMenuSetUpTopMenu(bool resetPos)
     addRowToMeleeMenu(mainMenu->menu, mainMenuTools);
     addRowToMeleeMenu(mainMenu->menu, mainMenuMusic);
     addRowToMeleeMenu(mainMenu->menu, mainMenuSettings);
+    if(mainMenu->showSecretsMenu)
+    {
+        addRowToMeleeMenu(mainMenu->menu, mainMenuSecret);
+    }
     addRowToMeleeMenu(mainMenu->menu, mainMenuCredits);
 #if defined(EMU)
     addRowToMeleeMenu(mainMenu->menu, mainMenuExit);
@@ -476,6 +511,10 @@ void mainMenuTopLevelCb(const char* opt)
     {
         mainMenuSetUpSettingsMenu(true);
     }
+    else if(mainMenuSecret == opt)
+    {
+        mainMenuSetUpSecretMenu(true);
+    }
     else if (mainMenuCredits == opt)
     {
         switchToSwadgeMode(&modeCredits);
@@ -817,10 +856,27 @@ void mainMenuSettingsCb(const char* opt)
  */
 void mainMenuSetUpSecretMenu(bool resetPos)
 {
+    // Load setting to show secrets menu on main menu
+    int32_t val;
+    if(!readNvs32(mainMenuShowSecretsMenuKey, &val))
+    {
+        mainMenu->showSecretsMenu = true;
+        writeNvs32(mainMenuShowSecretsMenuKey, mainMenu->showSecretsMenu);
+    }
+    // If the read was successful, mainMenuSetUpTopMenu() already got the value, so no need to set it again
+
     // Set up the menu
     resetMeleeMenu(mainMenu->menu, mainMenuSecret, mainMenuSecretCb);
     addRowToMeleeMenu(mainMenu->menu, modeCopyPasta.modeName);
     addRowToMeleeMenu(mainMenu->menu, modeTest.modeName);
+    if(mainMenu->showSecretsMenu)
+    {
+        addRowToMeleeMenu(mainMenu->menu, mainMenuShowSecretsMenuOn);
+    }
+    else
+    {
+        addRowToMeleeMenu(mainMenu->menu, mainMenuShowSecretsMenuOff);
+    }
     addRowToMeleeMenu(mainMenu->menu, mainMenu->gitStr);
     addRowToMeleeMenu(mainMenu->menu, mainMenuBack);
     // Set the position
@@ -847,11 +903,23 @@ void mainMenuSecretCb(const char* opt)
         // Start copyPastas
         switchToSwadgeMode(&modeCopyPasta);
     }
-    if(modeTest.modeName == opt)
+    else if(modeTest.modeName == opt)
     {
         // Start test mode
         switchToSwadgeMode(&modeTest);
     }
+    else if(mainMenuShowSecretsMenuOn == opt)
+    {
+        mainMenu->showSecretsMenu = false;
+        writeNvs32(mainMenuShowSecretsMenuKey, mainMenu->showSecretsMenu);
+        mainMenuSetUpSecretMenu(false);
+    }
+    else if(mainMenuShowSecretsMenuOff == opt)
+    {
+        mainMenu->showSecretsMenu = true;
+        writeNvs32(mainMenuShowSecretsMenuKey, mainMenu->showSecretsMenu);
+        mainMenuSetUpSecretMenu(false);
+    }
     else if(mainMenuBack == opt)
     {
         mainMenu->menuSelection = 0;

From dde206e0ea52d71b164cd1c225b607c2efb63bcd Mon Sep 17 00:00:00 2001
From: Brycey92 <bbrowner@optonline.net>
Date: Thu, 8 Dec 2022 20:09:00 -0500
Subject: [PATCH 22/26] Rename main menu cheat code index variable

---
 main/modes/mode_main_menu.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/main/modes/mode_main_menu.c b/main/modes/mode_main_menu.c
index 40e29554..df21d32d 100644
--- a/main/modes/mode_main_menu.c
+++ b/main/modes/mode_main_menu.c
@@ -87,7 +87,7 @@ typedef struct
     uint8_t secretPos;
     int16_t btnState;
     int16_t prevBtnState;
-    uint8_t menuSelection;
+    uint8_t cheatCodeIdx;
     uint32_t battVal;
     wsg_t batt[4];
     // wsg_t usb;
@@ -293,16 +293,16 @@ void mainMenuButtonCb(buttonEvt_t* evt)
         if(!mainMenu->debugMode)
         {
             if  (
-                    (mainMenu->btnState & cheatCode[mainMenu->menuSelection])
+                    (mainMenu->btnState & cheatCode[mainMenu->cheatCodeIdx])
                     &&
-                    !(mainMenu->prevBtnState & cheatCode[mainMenu->menuSelection])
+                    !(mainMenu->prevBtnState & cheatCode[mainMenu->cheatCodeIdx])
                 )
             {
-                mainMenu->menuSelection++;
+                mainMenu->cheatCodeIdx++;
 
-                if(mainMenu->menuSelection > 10)
+                if(mainMenu->cheatCodeIdx > 10)
                 {
-                    mainMenu->menuSelection = 0;
+                    mainMenu->cheatCodeIdx = 0;
                     mainMenu->debugMode = true;
                     buzzer_play_bgm(&secretSong);
                     mainMenuSetUpSecretMenu(true);
@@ -317,7 +317,7 @@ void mainMenuButtonCb(buttonEvt_t* evt)
             }
             else
             {
-                mainMenu->menuSelection = 0;
+                mainMenu->cheatCodeIdx = 0;
             }
         }
 
@@ -438,7 +438,7 @@ void mainMenuButtonCb(buttonEvt_t* evt)
                     // If we're in the secret menu, reset related variables
                     if(mainMenuSecret == mainMenu->menu->title)
                     {
-                        mainMenu->menuSelection = 0;
+                        mainMenu->cheatCodeIdx = 0;
                         mainMenu->btnState = 0;
                         mainMenu->prevBtnState = 0;
                         mainMenu->debugMode = false;
@@ -922,7 +922,7 @@ void mainMenuSecretCb(const char* opt)
     }
     else if(mainMenuBack == opt)
     {
-        mainMenu->menuSelection = 0;
+        mainMenu->cheatCodeIdx = 0;
         mainMenu->btnState = 0;
         mainMenu->prevBtnState = 0;
         mainMenu->debugMode = false;

From dbc6aaddc09c3b47706a5c6f1bc7eae661e20d2d Mon Sep 17 00:00:00 2001
From: Jonathan Moriarty <jonathan.taylor.moriarty@gmail.com>
Date: Sat, 10 Dec 2022 15:01:08 -0500
Subject: [PATCH 23/26] Reworked No-stress mode to be a title screen toggle,
 changed button mappings to enter/exit no-stress mode, updated control
 displays to match

---
 main/modes/mode_tiltrads.c | 62 +++++++++++---------------------------
 1 file changed, 18 insertions(+), 44 deletions(-)

diff --git a/main/modes/mode_tiltrads.c b/main/modes/mode_tiltrads.c
index ca212d08..6c8b9363 100644
--- a/main/modes/mode_tiltrads.c
+++ b/main/modes/mode_tiltrads.c
@@ -35,9 +35,7 @@
 #define BTN_TITLE_START_SCORES SELECT
 #define BTN_TITLE_START_GAME START
 #define BTN_TITLE_START_GAME_ALT BTN_A
-#define BTN_TITLE_START_NO_STRESS_TRIS_SCORES 0 // Y
-#define BTN_TITLE_START_NO_STRESS_TRIS_GAME 4 // X
-//#define BTN_TITLE_EXIT_MODE BTN_B
+#define BTN_TITLE_TOGGLE_NO_STRESS_TRIS BTN_B
 
 // Controls (game)
 #define BTN_GAME_SOFT_DROP DOWN
@@ -138,10 +136,10 @@
 
 // Any const strings go here.
 
-static const char str_y_for[] ="Y FOR";
+static const char str_b_for[] ="B FOR";
 static const char str_no_stress[] = "NO-STRESS";
+static const char str_normal[] = "NORMAL";
 static const char str_tris[] = "MODE";
-static const char str_x_to_play[] = "X TO PLAY";
 static const char str_select_for[] = "SELECT FOR";
 static const char str_scores[] = "SCORES";
 static const char str_start_to[] = "START TO";
@@ -1841,26 +1839,17 @@ void ttTitleInput(void)
     // Start game.
     if(ttIsButtonPressed(BTN_TITLE_START_GAME) || ttIsButtonPressed(BTN_TITLE_START_GAME_ALT))
     {
-        tiltrads->noStressTris = false;
         ttChangeState(TT_GAME);
     }
     // Go to score screen.
     else if(ttIsButtonPressed(BTN_TITLE_START_SCORES))
     {
-        tiltrads->noStressTris = false;
         ttChangeState(TT_SCORES);
     }
     // Start game of no-stress-tris.
-    else if(ttIsTouchPressed(BTN_TITLE_START_NO_STRESS_TRIS_GAME))
+    else if(ttIsButtonPressed(BTN_TITLE_TOGGLE_NO_STRESS_TRIS))
     {
-        tiltrads->noStressTris = true;
-        ttChangeState(TT_GAME);
-    }
-    // Go to no-stress-tris score screen.
-    else if(ttIsTouchPressed(BTN_TITLE_START_NO_STRESS_TRIS_SCORES))
-    {
-        tiltrads->noStressTris = true;
-        ttChangeState(TT_SCORES);
+        tiltrads->noStressTris = !tiltrads->noStressTris;
     }
 
     /*
@@ -2326,42 +2315,21 @@ void ttTitleDisplay(void)
     drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_play, playTextX, playTextY);
 
 
-    // Y FOR
-    int16_t noStressScoresTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_y_for, 0, GRID_X);
+    // B FOR
+    int16_t noStressScoresTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_b_for, 0, GRID_X);
     int16_t noStressScoresTextY = tiltrads->disp->h - (tiltrads->ibm_vga8.h * 6 + 3);
-    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_y_for, noStressScoresTextX, noStressScoresTextY);
+    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_b_for, noStressScoresTextX, noStressScoresTextY);
 
-    // NO-STRESS-
-    noStressScoresTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_no_stress, 0, GRID_X);
+    // NO-STRESS or NORMAL
+    noStressScoresTextX = getCenteredTextX(&(tiltrads->ibm_vga8), tiltrads->noStressTris ? str_normal : str_no_stress, 0, GRID_X);
     noStressScoresTextY += tiltrads->ibm_vga8.h + 1;
-    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_no_stress, noStressScoresTextX, noStressScoresTextY);
+    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, tiltrads->noStressTris ? str_normal : str_no_stress, noStressScoresTextX, noStressScoresTextY);
 
-    // TRIS
+    // MODE
     noStressScoresTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_tris, 0, GRID_X);
     noStressScoresTextY += tiltrads->ibm_vga8.h + 1;
     drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_tris, noStressScoresTextX, noStressScoresTextY);
 
-    // SCORES
-    noStressScoresTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_scores, 0, GRID_X);
-    noStressScoresTextY += tiltrads->ibm_vga8.h + 1;
-    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_scores, noStressScoresTextX, noStressScoresTextY);
-
-    // X TO PLAY
-    int16_t noStressPlayTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_x_to_play, xFromGridCol(GRID_X, GRID_COLS, GRID_UNIT_SIZE), tiltrads->disp->w);
-    int16_t noStressPlayTextY = tiltrads->disp->h - (tiltrads->ibm_vga8.h * 6 + 3);
-    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_x_to_play, noStressPlayTextX, noStressPlayTextY);
-
-    // NO-STRESS-
-    noStressPlayTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_no_stress, xFromGridCol(GRID_X, GRID_COLS, GRID_UNIT_SIZE), tiltrads->disp->w);
-    noStressPlayTextY += tiltrads->ibm_vga8.h + 1;
-    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_no_stress, noStressPlayTextX, noStressPlayTextY);
-
-    // TRIS
-    noStressPlayTextX = getCenteredTextX(&(tiltrads->ibm_vga8), str_tris, xFromGridCol(GRID_X, GRID_COLS, GRID_UNIT_SIZE), tiltrads->disp->w);
-    noStressPlayTextY += tiltrads->ibm_vga8.h + 1;
-    drawText(tiltrads->disp, &(tiltrads->ibm_vga8), c540, str_tris, noStressPlayTextX, noStressPlayTextY);
-
-
     // Clear the grid data. (may not want to do this every frame)
     refreshTetradsGrid(TUTORIAL_GRID_COLS, TUTORIAL_GRID_ROWS, tiltrads->tutorialTetradsGrid, tiltrads->landedTetrads, &(tiltrads->tutorialTetrad),
                        true);
@@ -2379,6 +2347,12 @@ void ttTitleDisplay(void)
     int16_t titleTextY = DISPLAY_HALF_HEIGHT - tiltrads->radiostars.h - 2;
     drawText(tiltrads->disp, &(tiltrads->radiostars), c540, str_tiltrads, titleTextX, titleTextY);
 
+    if (tiltrads->noStressTris) 
+    {
+        titleTextX = getCenteredTextX(&(tiltrads->radiostars), str_no_stress, 0, tiltrads->disp->w);
+        drawText(tiltrads->disp, &(tiltrads->radiostars), tiltrads->stateFrames % c555, str_no_stress, titleTextX, titleTextY - tiltrads->radiostars.h - 2);
+    }
+
     // COLOR (rotating color fx)
     titleTextX = getCenteredTextX(&(tiltrads->radiostars), str_color, 0, tiltrads->disp->w);
     titleTextY += tiltrads->radiostars.h + 2;

From f2d72574c6f38791cf855e425ba965733a3a7a82 Mon Sep 17 00:00:00 2001
From: Jonathan Moriarty <jonathan.taylor.moriarty@gmail.com>
Date: Sat, 10 Dec 2022 15:50:14 -0500
Subject: [PATCH 24/26] Forced length 7 for --short flag for git hash to
 prevent compiler error related to string length for git hash.

---
 emu.mk              | 2 +-
 main/CMakeLists.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/emu.mk b/emu.mk
index 90ce6af7..09ded8ac 100644
--- a/emu.mk
+++ b/emu.mk
@@ -114,7 +114,7 @@ CFLAGS_WARNINGS_EXTRA = \
 ################################################################################
 
 # Create a variable with the git hash and branch name
-GIT_HASH  = \"$(shell git rev-parse --short HEAD)\"
+GIT_HASH  = \"$(shell git rev-parse --short=7 HEAD)\"
 
 # Used by the ESP SDK
 DEFINES_LIST = \
diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
index fefb7dc9..f8b7df51 100644
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -103,7 +103,7 @@ spiffs_create_partition_image(storage ../spiffs_image FLASH_IN_PROJECT)
 
 
 execute_process(
-    COMMAND git rev-parse --short HEAD
+    COMMAND git rev-parse --short=7 HEAD
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     OUTPUT_VARIABLE VERSION_SHA1 )
 

From 05022d00eec2ff1414c30130bfab29155f81fa3c Mon Sep 17 00:00:00 2001
From: gelakinetic <gelakinetic@gmail.com>
Date: Tue, 13 Dec 2022 18:13:23 -0800
Subject: [PATCH 25/26] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 026f61ea..fe48d99b 100644
--- a/README.md
+++ b/README.md
@@ -158,7 +158,7 @@ git submodule update --init --recursive
 To set up the emulator build environment, you'll need to install the following packages. If your system uses the `apt` package manager, use this command:
 
 ```bash
-sudo apt install build-essential xorg-dev libx11-dev libxinerama-dev libxext-dev mesa-common-dev libglu1-mesa-dev libasound2-dev libpulse-dev libasan
+sudo apt install build-essential xorg-dev libx11-dev libxinerama-dev libxext-dev mesa-common-dev libglu1-mesa-dev libasound2-dev libpulse-dev libasan8
 ```
 
 Or if your system uses the `dnf` package manager, use these commands:

From ff683bd01ee174c863dfdf078cfc1bd63b74ed37 Mon Sep 17 00:00:00 2001
From: gelakinetic <gelakinetic@gmail.com>
Date: Tue, 13 Dec 2022 18:14:51 -0800
Subject: [PATCH 26/26] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fe48d99b..5a81079f 100644
--- a/README.md
+++ b/README.md
@@ -165,7 +165,7 @@ Or if your system uses the `dnf` package manager, use these commands:
 
 ```bash
 sudo dnf group install "C Development Tools and Libraries" "Development Tools"
-sudo dnf install libX11-devel libXinerama-devel libXext-devel mesa-libGLU-devel alsa-lib-devel pulseaudio-libs-devel libudev-devel cmake libasan
+sudo dnf install libX11-devel libXinerama-devel libXext-devel mesa-libGLU-devel alsa-lib-devel pulseaudio-libs-devel libudev-devel cmake libasan8
 ```
 
 ## macOS