Accept FS#10068 by Teruaki Kawashima correcting the instructions built into a couple of plugins

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20565 a1c6a512-1295-4272-9138-f99709370657

5 files changed, 44 insertions, 10 deletions

diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c
index cb0a653..825d554 100644
--- a/apps/plugins/blackjack.c
+++ b/apps/plugins/blackjack.c
@@ -1258,18 +1258,28 @@ static unsigned int blackjack_menu(struct game_context* bj) {
             rb->lcd_puts(0, 3, "POWER to exit");
             rb->lcd_puts(0, 4, "VOL+ to hit");
             rb->lcd_puts(0, 5, "VOL- to stay");
-            rb->lcd_puts(0, 6, "CENTER to double down");
-            rb->lcd_puts(0, 6, "RIGHT to view highscores ");
+            rb->lcd_puts(0, 6, "SELECT to double down");
+            rb->lcd_puts(0, 7, "RIGHT to view highscores ");
+            rb->lcd_puts(0, 8, "MENU to save/resume");
+            rb->snprintf(str, 21, "High Score: $%d", bj->highscores[0]);
+            rb->lcd_puts(0, 9, str);
+#elif CONFIG_KEYPAD == GIGABEAT_S_PAD
+            rb->lcd_puts(0, 2, "PLAY to start");
+            rb->lcd_puts(0, 3, "BACK to exit");
+            rb->lcd_puts(0, 4, "VOL+ to hit");
+            rb->lcd_puts(0, 5, "VOL- to stay");
+            rb->lcd_puts(0, 6, "SELECT to double down");
+            rb->lcd_puts(0, 7, "RIGHT to view highscores ");
             rb->lcd_puts(0, 8, "MENU to save/resume");
             rb->snprintf(str, 21, "High Score: $%d", bj->highscores[0]);
             rb->lcd_puts(0, 9, str);
 #elif CONFIG_KEYPAD == MROBE100_PAD
-            rb->lcd_puts(0, 2, "CENTER to start");
+            rb->lcd_puts(0, 2, "SELECT to start");
             rb->lcd_puts(0, 3, "POWER to exit");
             rb->lcd_puts(0, 4, "MENU to hit");
             rb->lcd_puts(0, 5, "DISPLAY to stay");
             rb->lcd_puts(0, 6, "DOWN to double down");
-            rb->lcd_puts(0, 6, "RIGHT to view highscores ");
+            rb->lcd_puts(0, 7, "RIGHT to view highscores ");
             rb->lcd_puts(0, 8, "PLAY to save/resume");
             rb->snprintf(str, 21, "High Score: $%d", bj->highscores[0]);
             rb->lcd_puts(0, 9, str);
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c
index ae0b1db..a1807b4 100644
--- a/apps/plugins/flipit.c
+++ b/apps/plugins/flipit.c
@@ -722,6 +722,12 @@ enum plugin_status plugin_start(const void* parameter)
     rb->lcd_putsxy(2, 28, "[PL-LEFT] shuffle");
     rb->lcd_putsxy(2, 38, "[PL-RIGHT] solution");
     rb->lcd_putsxy(2, 48, "[PL-UP] step by step");
+#elif CONFIG_KEYPAD == GIGABEAT_S_PAD
+    rb->lcd_putsxy(2, 8, "[BACK] to stop");
+    rb->lcd_putsxy(2, 18, "[SELECT] toggle");
+    rb->lcd_putsxy(2, 28, "[MENU] shuffle");
+    rb->lcd_putsxy(2, 38, "[VOL+] solution");
+    rb->lcd_putsxy(2, 48, "[VOL-] step by step");
 #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
       (CONFIG_KEYPAD == SANSA_C200_PAD)
     rb->lcd_putsxy(2, 8, "[POWER] to stop");
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c
index c5c8c67..df8e445 100644
--- a/apps/plugins/sliding_puzzle.c
+++ b/apps/plugins/sliding_puzzle.c
@@ -682,7 +682,7 @@ enum plugin_status plugin_start(
         rb->lcd_putsxy(0, 28, "[REC] shuffle");
         rb->lcd_putsxy(0, 38, "[PLAY] change pic");
 #elif CONFIG_KEYPAD == GIGABEAT_PAD
-        rb->lcd_putsxy(0, 18, "[OFF] to stop");
+        rb->lcd_putsxy(0, 18, "[POWER] to stop");
         rb->lcd_putsxy(0, 28, "[SELECT] shuffle");
         rb->lcd_putsxy(0, 38, "[A] change pic");
 #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
@@ -694,6 +694,10 @@ enum plugin_status plugin_start(
         rb->lcd_putsxy(0, 18, "[OFF] to stop");
         rb->lcd_putsxy(0, 28, "[REW] shuffle");
         rb->lcd_putsxy(0, 38, "[PLAY] change pic");
+#elif CONFIG_KEYPAD == GIGABEAT_S_PAD
+        rb->lcd_putsxy(0, 18, "[BACK] to stop");
+        rb->lcd_putsxy(0, 28, "[SELECT] shuffle");
+        rb->lcd_putsxy(0, 38, "[MENU] change pic");
 #elif CONFIG_KEYPAD == IAUDIO_M3_PAD
         rb->lcd_putsxy(0, 18, "[REC] to stop");
         rb->lcd_putsxy(0, 28, "[MODE] shuffle");
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c
index e8ccdac..f071af1 100644
--- a/apps/plugins/sokoban.c
+++ b/apps/plugins/sokoban.c
@@ -1335,6 +1335,13 @@ static int sokoban_menu(void)
                 rb->lcd_putsxy(3, 36, "[SELECT+DOWN] Previous Level");
                 rb->lcd_putsxy(3, 46, "[SELECT+RIGHT] Restart Level");
                 rb->lcd_putsxy(3, 56, "[SELECT+UP] Next Level");
+#elif CONFIG_KEYPAD == GIGABEAT_S_PAD
+                rb->lcd_putsxy(3,  6, "[MENU] Menu");
+                rb->lcd_putsxy(3, 16, "[VOL+] Undo");
+                rb->lcd_putsxy(3, 26, "[VOL-] Redo");
+                rb->lcd_putsxy(3, 36, "[PREV] Previous Level");
+                rb->lcd_putsxy(3, 46, "[PLAY] Restart Level");
+                rb->lcd_putsxy(3, 56, "[NEXT] Next Level");
 #endif
 
 #ifdef HAVE_TOUCHSCREEN
diff --git a/apps/plugins/star.c b/apps/plugins/star.c
index c4251cd..344c11b 100644
--- a/apps/plugins/star.c
+++ b/apps/plugins/star.c
@@ -1086,11 +1086,11 @@ static int star_menu(void)
                                   "[REC] Next level", true);
 #elif CONFIG_KEYPAD == GIGABEAT_PAD
                 star_display_text("KEYS\n\n"
-                                  "[MENU] Toggle Control\n"
-                                  "[A] Exit\n"
-                                  "[PWR+DOWN] Prev. level\n"
-                                  "[PWR+RIGHT] Reset level\n"
-                                  "[PWR+UP] Next level", true);
+                                  "[SELECT] Toggle Control\n"
+                                  "[POWER] Exit\n"
+                                  "[VOL DOWN] Prev. level\n"
+                                  "[A] Reset level\n"
+                                  "[VOL UP] Next level", true);
 #elif CONFIG_KEYPAD == IRIVER_H10_PAD
                 star_display_text("KEYS\n\n"
                                   "[REW] Toggle Ctl\n"
@@ -1098,6 +1098,13 @@ static int star_menu(void)
                                   "[PLAY+DOWN] Prev. level\n"
                                   "[PLAY+RIGHT] Reset level\n"
                                   "[PLAY+UP] Next level", true);
+#elif CONFIG_KEYPAD == GIGABEAT_S_PAD
+                star_display_text("KEYS\n\n"
+                                  "[SELECT] Toggle Control\n"
+                                  "[BACK] Exit\n"
+                                  "[VOL DOWN] Prev. level\n"
+                                  "[MENU] Reset level\n"
+                                  "[VOL UP] Next level", true);
 #endif
 #ifdef HAVE_TOUCHSCREEN
                 star_display_text("KEYS\n\n"