From 148e0ab4162c7a441fbd99b9524c2a2542be8103 Mon Sep 17 00:00:00 2001
From: Sebastian Leonhardt <sebastian.leonhardt@web.de>
Date: Sat, 24 May 2014 23:37:57 +0200
Subject: [PATCH] YH820: game fix and improvements

* sudoku: make colour icons (without screen was squeezed)
* jewels: add colour bitmaps
* pegbox: make game fit on screen (add small header bitmap),
  improve keymap

I left the original pegbox keymaps for samsung's YH-92x,
because they seem to make some sense there (YH92x has a
REC switch instead of pushbutton).
Someone with a YH9xx target has to check what is better...

Change-Id: Id388c9d69e4a5a1d8ad4c3d7a05cdfc1dff0d06c
Reviewed-on: http://gerrit.rockbox.org/816
Reviewed-by: Szymon Dziok <b0hoon@o2.pl>
Tested: Szymon Dziok <b0hoon@o2.pl>
---
 apps/plugins/bitmaps/native/SOURCES           |  16 +++++++++---
 .../bitmaps/native/jewels.128x96x16.bmp       | Bin 0 -> 9990 bytes
 .../native/pegbox_header.128x16x16.bmp        | Bin 0 -> 3126 bytes
 .../native/sudoku_inverse.128x96x16.bmp       | Bin 0 -> 1198 bytes
 .../native/sudoku_normal.128x96x16.bmp        | Bin 0 -> 1198 bytes
 .../bitmaps/native/sudoku_start.128x96x16.bmp | Bin 0 -> 1198 bytes
 apps/plugins/pegbox.c                         |  24 +++++++++++++++---
 apps/plugins/sudoku/sudoku.c                  |   2 +-
 8 files changed, 35 insertions(+), 7 deletions(-)
 create mode 100644 apps/plugins/bitmaps/native/jewels.128x96x16.bmp
 create mode 100644 apps/plugins/bitmaps/native/pegbox_header.128x16x16.bmp
 create mode 100644 apps/plugins/bitmaps/native/sudoku_inverse.128x96x16.bmp
 create mode 100644 apps/plugins/bitmaps/native/sudoku_normal.128x96x16.bmp
 create mode 100644 apps/plugins/bitmaps/native/sudoku_start.128x96x16.bmp

diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES
index c91d694aea..6197f168e7 100644
--- a/apps/plugins/bitmaps/native/SOURCES
+++ b/apps/plugins/bitmaps/native/SOURCES
@@ -411,8 +411,10 @@ jewels.128x128x16.bmp
 #elif ((LCD_WIDTH == 132) && (LCD_HEIGHT == 80)) || \
       ((LCD_WIDTH == 96) && (LCD_HEIGHT == 96))
 jewels.132x80x16.bmp
-#elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 96)
+#elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 96) && !defined(HAVE_LCD_COLOR)
 jewels.128x96x2.bmp
+#elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 96) && defined(HAVE_LCD_COLOR)
+jewels.128x96x16.bmp
 #elif (LCD_WIDTH == 138) && (LCD_HEIGHT == 110)
 jewels.138x110x2.bmp
 #elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) && !defined(HAVE_LCD_COLOR)
@@ -451,7 +453,7 @@ minesweeper_tiles.8x8x1.bmp
 
 /* PegBox */
 #ifdef HAVE_LCD_COLOR
-/* currently only LCD_WIDTH is important, e.g. Nano and e200 use the same set */
+/* for most targets only LCD_WIDTH is important, e.g. Nano and e200 use the same set */
 #if LCD_WIDTH >= 640
 pegbox_pieces.48x48x16.bmp
 pegbox_header.640x80x16.bmp
@@ -475,7 +477,11 @@ pegbox_pieces.9x9x16.bmp
 pegbox_header.22x80x16.bmp
 #elif LCD_WIDTH >= 128
 pegbox_pieces.10x10x16.bmp
+#  if LCD_HEIGHT > 96
 pegbox_header.128x42x16.bmp
+#  else
+pegbox_header.128x16x16.bmp
+#  endif
 #elif LCD_WIDTH >= 96
 pegbox_pieces.8x8x16.bmp
 pegbox_header.96x32x16.bmp
@@ -745,10 +751,14 @@ star_tiles.6x7x1.bmp
 sudoku_start.112x64x1.bmp
 sudoku_normal.112x64x1.bmp
 sudoku_inverse.112x64x1.bmp
-#elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 96) && (LCD_DEPTH >= 2)
+#elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 96) && (LCD_DEPTH == 2)
 sudoku_start.128x96x2.bmp
 sudoku_normal.128x96x2.bmp
 sudoku_inverse.128x96x2.bmp
+#elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 96) && (LCD_DEPTH == 16)
+sudoku_start.128x96x16.bmp
+sudoku_normal.128x96x16.bmp
+sudoku_inverse.128x96x16.bmp
 #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 128) && (LCD_DEPTH == 2)
 sudoku_start.128x128x2.bmp
 sudoku_normal.128x128x2.bmp
diff --git a/apps/plugins/bitmaps/native/jewels.128x96x16.bmp b/apps/plugins/bitmaps/native/jewels.128x96x16.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..6d8447740fff2836a030a8548c6fc68ff0a85541
GIT binary patch
literal 9990
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

literal 0
HcmV?d00001

diff --git a/apps/plugins/bitmaps/native/pegbox_header.128x16x16.bmp b/apps/plugins/bitmaps/native/pegbox_header.128x16x16.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..7090b80f2e5698aba26caec79d07be4bc0ade08a
GIT binary patch
literal 3126
zcmb`H2Uv|!7{`B+L?Iz7vSnq5P-KSeE3&iqmYK@lGlfFg*NT#nT`GHJ@2#xt?K<b)
zTSoWxJU!2SpZk5^d(U~#|Nno_`<~<MYHyC(?2W-zc;4c%5RVb2;w?;kEX_2J7?cxg
zGcqzFLxv1w%$N~lV`DO9%7lrD37Ioz#?;i5ELpOUHEUMP%*-%1Hz!-RY-G=#og6uG
zU}0fF&YU^1w6r8wu3Y5Kotr#)@?d3UMc%x5$(Ju5`Sa(eK!E}jELae0YikM>Dn#MJ
zg|V@*p-7P;6fIhmV#SJ4ym)a+lqf;Tk|ilssuZP5m&VrCmNI3^P_}GY%9Sfe`SRtd
zP@w{Lc6L;(SdmJVDp9#|WvW!ELe;8OsaCBT)vH&>-rk-XHEK|^W=(3<s)d7t1GQ_{
zrcRwY)U8_=M@L7ToSdjvuO9X5*T>n}nFb9S(6C`c8Z~M}<Hn6?(xeGZn>NM8#f4_g
zn$f&@b6T`$fvc-4EnBvvRjXFCZrz$TZQ9VbZCl#4Ye)O`?NKNcbm-6lH#avrcI-%}
zPMvUfcc*jb&UES0g|1z@(yd!Jx_9qRj~+ef*|R4e9v<}S)r;P}d()>+ANuy~OTT{o
z=-<CT0|pFW;J|?l8Z?N(g9kHY$Pk7O9m=p_!x%n%I3q@kVC2Y=j2bnH(W6H*X3QAI
zjvb4qrzhjajbr@y@l2R7fr%3*GHKEzCQqJ>mzNh)rcA-x+Z!JrAAEg%nL2eU)22;h
z`t<3{m@$KyGiNeu)+}bvp3R&&bC^4KF7xKiWB&a4ELgCBg$oz5Xwf1TFJ8=&B}-Vk
zbScZ0EyK^xkLAmk<L~cJKtKR1R;*y<%9X5IwTi&NK!SpTSiO2RYu2n`?b@{j2L}@p
z62iK5>sY^jJsUP`VB^M(Y}&Mm&6_u~Wy=<nN+nyjZe`oHZEWAZogF)Nuyf~5LPJB@
zwQCo<ckd=FER68*aQ5ukLqtRbd-v{T-@bk9-@l&&2M!P!8Ogze2RU@;5Qh&R=E#vF
z96frJW5<qh{P=OAqN0e7j^@OP6U4;C5E~myTwEL{PoCt|sZ*RjeVQ|8&T#hZS<an1
z$NBT;xp3hE7cXAq(xppWzI>VZ_;{{dxx&?}SGjiW8rQF1=f;g2+`M^{Teog;`}S?_
z+_}TuyLY*F?;iK>-{--D2RwZEkVlUm@%Zs$o;-QN)2B~)_UswYpFbxdA%VoiL|(jj
z!ONE~dG+cQuV26B&6_tQB_;9p?OWcxd&m3t@A>fI10O$r<kP25eE$5IFJHd!_3Kx@
zef!4u@89|H;|D)~{^ZxMU#L_n%>`h9w;`~^-lZ}jO+YKePa{`)y0}zmb5V*}l}eeM
zQYt_(kUaO_H(vBdDigs1TEHn4l0qT96t2GjlE;(^^`MNCrVmpy`_EfvXk=u(<d=a$
zghEhDPctCh6iXfx0b&QlW~pcNVy3M7<LHf*&>}6l38G=7mj=H~Tyh(jU)EHh%B`24
z2K|qA^`3~VWp^lLh*E5VP@*@dzn5x#y|G$4QG9J$y7^^`2ufKZAwtB8e|j;~%P+GM
zu;QihQmq$-Nl~YeBE)^EG8n(WmhG=;0$Btd{AzW{-Jun0sQg7;WkE$@)#qP7zot8c
zPN7gJHWdHA>86pt2-K!7kD-D1)vf=R1bG7fH*NisyF=S2>B(QWSbdjeYJP413k6~i
wwEdqx%yit<|I@3l1@-w?-_!C0$n!6503DWUv0(>vwTEFD(nizO9(q^&26wU}`Tzg`

literal 0
HcmV?d00001

diff --git a/apps/plugins/bitmaps/native/sudoku_inverse.128x96x16.bmp b/apps/plugins/bitmaps/native/sudoku_inverse.128x96x16.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..fc0333b7dd39ad68a1a3e818f7f17802d43157b2
GIT binary patch
literal 1198
zcmb_bJxc>Y5FNqlwo0%OD^m%v+eS$z*9FUKw7(|3S46~04)PCDU44b*JAnnwKRe&d
z?5(F>1i?KvdAxh`@n-jKZeNc{)&qVou)ElI*hi!<uJG42x<Q9^^7uw{{Y1}nN-tBU
zD?H~k#dG;iwBPTksw&XfEz3A8=F5`IjErE43h<<uO5hnvv!;ZG7)J$oQof0yDOlrU
zk<jNyOu(#}cRH+**p8c@eZ!LH4;qAj=5JyYFfLV(1dnbr(%za_{HDq`v3TE%xHtBm
zrYU1y!AldfuWgnEUzyvE@m@UEm^E3@kjd)#Bj<LkeMZnY)%;p(og|@F;@0;p#wnq<
z9~k`?CJA~niPjZg;C*bnFTD@3)Z#hBaXdt!sE7&^JK?DWUJVsX|FL3XFDs9sabA!3
zgEL%O8+=)}9Iz|(<+0=u4Gso*?11&$5prrQ_i3&5v8}bld!FYL4lU8oZc@)5`h3#J
znJbpr?pQBpnmfUAS9f`>X{{yS&Z5`rb1k`ti@xUM{#!7AkBgpa#G}VwVh_v^6<TNe
GPy7eSG&A7<

literal 0
HcmV?d00001

diff --git a/apps/plugins/bitmaps/native/sudoku_normal.128x96x16.bmp b/apps/plugins/bitmaps/native/sudoku_normal.128x96x16.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..57915dd410aea9812b9ae3ce0ec2ba93169c62d5
GIT binary patch
literal 1198
zcmcgqyH3ME5L_fGQzfE-j#Mb3y9QDsSCJ^)@BuFJ0a%I<qC!?aA(iuvw%`*We`aQG
z&nM$RLBl!co9xZZ&Pu+2cs~`tp76fL?qfe<pNL)D;^?2*MmetY=MRy)7kQNnd7HCb
z<GGSKo|{jR!{H!xU89WMS=ubr6+f*c!AX$diZx)IEEq??5n?cKZ}m2YCLt$iA;qG$
zS;XWldOg;?wx^5B4*n~ru|MjC2C8|;z!=+!aoRYLe9kuZvu`KN#=AVviGS_IxpqZC
zf4GPix|?<}IYs0sIF^mByQ$#{9FQz$=+^B^pG}s<UYTzAz0eK&2v_81k*}JO8RkMg
zXsubdmwgXu<fmymrZ%Y(P4SS=iPvMpK7VRh(O1_2gQJ0OoowDVX3mv!zE^@-oUTTe
zhjRt&eLM%>8p>|uGgwa3QsbNpTI*mw5m)?QmgS5mZT2(E<2}n+%d<2bSl}Z8v`~00
rGVjZV6a5X~Z5+|%U@#>1Hp`)Tvhfd?wB^7!K2N~kw4sCd{6G8!g`2V3

literal 0
HcmV?d00001

diff --git a/apps/plugins/bitmaps/native/sudoku_start.128x96x16.bmp b/apps/plugins/bitmaps/native/sudoku_start.128x96x16.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..0ff341c828e06f1380cb8b5c33e8ed28c78c25d3
GIT binary patch
literal 1198
zcmcgqyH3ME5L_f0iz*RKN>UMt&JAgin-r8T-~%k>2e2X`M1`D=ytDZP3O)hyXJ%&i
z>=*|M8t!uE$=>YjtbI4P@26tp0sAFZ7waDDMEu|ykM5Z-gzIts_#rZUl4t43%Z}j^
z^Fnr*SDzyL{a(tlL>Q|zv>J#je)=jAo&*t&7z4(W0p|!fLJS7ZJ>JB~iO31LUcq$^
zn4DRsLyqNkbk=KO)A<9(#j&?*Su0tHvz7JOIZYf$mfOVE`+7`oJj=3-_}5zOYm?{H
zx4v@SOxl>7yymFp!827i6ZgsQ0Mbz}RbhId&MHmoTB)w?+#8jSFh857HD5Iai{6-n
zc*yk%uG7HwPLi6RB*}=m5#k9Z`RsT(a%}z+$I4!o0UvZ++&z55^tp&*tHnDO>tg7B
z*jK=&V;tNygyW%k@O$gI%!%VT<a!C$sj>B56vfp1BfOnf?;n4PX+yJcZ1-VHJ{*V^
w$go^^-WC<7)^~v2IimA^e?V+9^MPy9{|}h7dEYtKW5C~XLj`EQRpTG<7YV?SrT_o{

literal 0
HcmV?d00001

diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c
index 19f3d529e6..f53c8f9519 100644
--- a/apps/plugins/pegbox.c
+++ b/apps/plugins/pegbox.c
@@ -414,8 +414,26 @@ CONFIG_KEYPAD == MROBE500_PAD
 
 #define QUIT_TEXT "POWER"
 
-#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
-      (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
+#elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD
+#define PEGBOX_SAVE     BUTTON_FFWD
+#define PEGBOX_QUIT     BUTTON_REC
+#define PEGBOX_RESTART  BUTTON_REW
+#define PEGBOX_LVL_UP   (BUTTON_PLAY|BUTTON_FFWD)
+#define PEGBOX_LVL_DOWN (BUTTON_PLAY|BUTTON_REW)
+#define PEGBOX_UP       BUTTON_UP
+#define PEGBOX_DOWN     BUTTON_DOWN
+#define PEGBOX_RIGHT    BUTTON_RIGHT
+#define PEGBOX_LEFT     BUTTON_LEFT
+#define PEGBOX_SELECT   BUTTON_PLAY
+
+#define SAVE_TEXT "FFWD"
+#define QUIT_TEXT "REC"
+#define RESTART_TEXT "REW"
+#define LVL_UP_TEXT "PLAY+FFWD"
+#define LVL_DOWN_TEXT "PLAY+REW"
+#define SELECT_TEXT "PLAY"
+
+#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
 #define PEGBOX_SAVE     (BUTTON_REC|BUTTON_FFWD)
 #define PEGBOX_QUIT     (BUTTON_REC|BUTTON_PLAY)
 #define PEGBOX_RESTART  (BUTTON_REC|BUTTON_REW)
@@ -425,7 +443,7 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define PEGBOX_DOWN     BUTTON_DOWN
 #define PEGBOX_RIGHT    BUTTON_RIGHT
 #define PEGBOX_LEFT     BUTTON_LEFT
-#define PEGBOX_SELECT     BUTTON_PLAY
+#define PEGBOX_SELECT   BUTTON_PLAY
 
 #define SAVE_TEXT "REC + FFWD"
 #define QUIT_TEXT "REC + PLAY"
diff --git a/apps/plugins/sudoku/sudoku.c b/apps/plugins/sudoku/sudoku.c
index d19b556352..12880bd97b 100644
--- a/apps/plugins/sudoku/sudoku.c
+++ b/apps/plugins/sudoku/sudoku.c
@@ -114,7 +114,7 @@ static const char default_game[9][9] =
 #define MARK_SIZE   1   /* Mark width and height */
 
 #elif ((LCD_HEIGHT==96) && (LCD_WIDTH==128))
-/* iAudio M3, 9 cells @ 9x9 with 14 border lines */
+/* iAudio M3, Samsung YH820, 9 cells @ 9x9 with 14 border lines */
 #define MARK_OFFS   1   /* Pixels between border and mark */
 #define MARK_SPACE  2   /* Pixels between two marks */
 #define MARK_SIZE   1   /* Mark width and height */