1 files changed, 4 insertions, 53 deletions

diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c
index 62812e0237..3cc1555e83 100644
--- a/apps/plugins/sokoban.c
+++ b/apps/plugins/sokoban.c
@@ -64,11 +64,7 @@
 #endif
 
 /* size of code+bss */
-#if CONFIG_CPU == SH7034
-#define CODE_SIZE 0x3000 /* 12k */
-#else
 #define CODE_SIZE 0x5000 /* 20k */
-#endif
 
 #define CODE_AND_UNDO_SIZE (CODE_SIZE+0x1000) /* + 4k */
 
@@ -104,39 +100,8 @@
 #define SOKOBAN_MOVE_MIN     SOKOBAN_MOVE_DOWN
 
 /* variable button definitions */
-#if (CONFIG_KEYPAD == RECORDER_PAD)
-#define SOKOBAN_LEFT BUTTON_LEFT
-#define SOKOBAN_RIGHT BUTTON_RIGHT
-#define SOKOBAN_UP BUTTON_UP
-#define SOKOBAN_DOWN BUTTON_DOWN
-#define SOKOBAN_MENU BUTTON_OFF
-#define SOKOBAN_UNDO BUTTON_ON
-#define SOKOBAN_REDO BUTTON_PLAY
-#define SOKOBAN_LEVEL_DOWN BUTTON_F1
-#define SOKOBAN_LEVEL_REPEAT BUTTON_F2
-#define SOKOBAN_LEVEL_UP BUTTON_F3
-#define SOKOBAN_PAUSE BUTTON_PLAY
-#define BUTTON_SAVE BUTTON_ON
-#define BUTTON_SAVE_NAME "ON"
-
-#elif CONFIG_KEYPAD == ONDIO_PAD
-#define SOKOBAN_LEFT BUTTON_LEFT
-#define SOKOBAN_RIGHT BUTTON_RIGHT
-#define SOKOBAN_UP BUTTON_UP
-#define SOKOBAN_DOWN BUTTON_DOWN
-#define SOKOBAN_MENU BUTTON_OFF
-#define SOKOBAN_UNDO_PRE BUTTON_MENU
-#define SOKOBAN_UNDO (BUTTON_MENU | BUTTON_REL)
-#define SOKOBAN_REDO (BUTTON_MENU | BUTTON_DOWN)
-#define SOKOBAN_LEVEL_DOWN (BUTTON_MENU | BUTTON_LEFT)
-#define SOKOBAN_LEVEL_REPEAT (BUTTON_MENU | BUTTON_UP)
-#define SOKOBAN_LEVEL_UP (BUTTON_MENU | BUTTON_RIGHT)
-#define SOKOBAN_PAUSE BUTTON_MENU
-#define BUTTON_SAVE BUTTON_MENU
-#define BUTTON_SAVE_NAME "MENU"
-
-#elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \
-      (CONFIG_KEYPAD == IRIVER_H300_PAD)
+#if (CONFIG_KEYPAD == IRIVER_H100_PAD) || \
+    (CONFIG_KEYPAD == IRIVER_H300_PAD)
 #define SOKOBAN_LEFT BUTTON_LEFT
 #define SOKOBAN_RIGHT BUTTON_RIGHT
 #define SOKOBAN_UP BUTTON_UP
@@ -1642,22 +1607,8 @@ static int sokoban_menu(void)
                     rb->screens[i]->clear_display();
                 rb->lcd_setfont(SOKOBAN_FONT);
 
-#if (CONFIG_KEYPAD == RECORDER_PAD)
-                rb->lcd_putsxy(3,  6, "[OFF] Menu");
-                rb->lcd_putsxy(3, 16, "[ON] Undo");
-                rb->lcd_putsxy(3, 26, "[PLAY] Redo");
-                rb->lcd_putsxy(3, 36, "[F1] Down a Level");
-                rb->lcd_putsxy(3, 46, "[F2] Restart Level");
-                rb->lcd_putsxy(3, 56, "[F3] Up a Level");
-#elif CONFIG_KEYPAD == ONDIO_PAD
-                rb->lcd_putsxy(3,  6, "[OFF] Menu");
-                rb->lcd_putsxy(3, 16, "[MODE] Undo");
-                rb->lcd_putsxy(3, 26, "[MODE+DOWN] Redo");
-                rb->lcd_putsxy(3, 36, "[MODE+LEFT] Previous Level");
-                rb->lcd_putsxy(3, 46, "[MODE+UP] Restart Level");
-                rb->lcd_putsxy(3, 56, "[MODE+RIGHT] Up Level");
-#elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \
-      (CONFIG_KEYPAD == IRIVER_H300_PAD)
+#if (CONFIG_KEYPAD == IRIVER_H100_PAD) || \
+    (CONFIG_KEYPAD == IRIVER_H300_PAD)
                 rb->lcd_putsxy(3,  6, "[STOP] Menu");
                 rb->lcd_putsxy(3, 16, "[REC] Undo");
                 rb->lcd_putsxy(3, 26, "[MODE] Redo");