diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES index de347fd1aa..f8ec9385b2 100644 --- a/apps/plugins/bitmaps/native/SOURCES +++ b/apps/plugins/bitmaps/native/SOURCES @@ -514,8 +514,10 @@ rockblox_background.128x160x16.bmp rockblox_background.128x128x16.bmp #elif (LCD_WIDTH == 132) && (LCD_HEIGHT == 80) rockblox_background.132x80x16.bmp -#elif ((LCD_WIDTH == 128 && LCD_HEIGHT == 96) || (LCD_WIDTH == 96 && LCD_HEIGHT == 96)) +#elif (LCD_WIDTH == 128 && LCD_HEIGHT == 96) rockblox_background.128x96x2.bmp +#elif (LCD_WIDTH == 96 && LCD_HEIGHT == 96) +rockblox_background.96x96x16.bmp #endif #elif LCD_DEPTH == 2 /* greyscale versions */ #if (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) diff --git a/apps/plugins/bitmaps/native/rockblox_background.96x96x16.bmp b/apps/plugins/bitmaps/native/rockblox_background.96x96x16.bmp new file mode 100644 index 0000000000..cb8f1b130e Binary files /dev/null and b/apps/plugins/bitmaps/native/rockblox_background.96x96x16.bmp differ diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index 17eadd65be..8db4a3497f 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c @@ -670,19 +670,21 @@ #define LEVEL_X 78 #define LINES_Y 51 -#elif LCD_WIDTH == 96 && LCD_HEIGHT == 96 +#elif (LCD_WIDTH == 96) && (LCD_HEIGHT == 96) -#define BLOCK_WIDTH 3 -#define BLOCK_HEIGHT 3 -#define BOARD_X 9 -#define BOARD_Y 3 -#define PREVIEW_X 59 -#define PREVIEW_Y 5 +#define BLOCK_WIDTH 4 +#define BLOCK_HEIGHT 4 +#define BOARD_X 5 +#define BOARD_Y 4 +#define PREVIEW_X 64 +#define PREVIEW_Y 76 #define LABEL_X 59 -#define SCORE_Y 32 -#define LEVEL_Y 13 -#define LEVEL_X 78 -#define LINES_Y 51 +#define SCORE_Y 15 +#define SCORE_X 58 +#define LEVEL_Y 39 +#define LEVEL_X 58 +#define LINES_Y 62 +#define LINES_X 58 #endif #ifndef LEVEL_X diff --git a/docs/CREDITS b/docs/CREDITS index 3619b6aea8..aa915c6896 100644 --- a/docs/CREDITS +++ b/docs/CREDITS @@ -621,6 +621,7 @@ Albert Barca Fukuda Takafumi Dimitar Dimitrov Osborne Jacobs +Marty Miller The libmad team The wavpack team