From 09aa8de52cb962f1ceebfb1fd44f2c54a924fc5c Mon Sep 17 00:00:00 2001 From: Franklin Wei Date: Mon, 22 Jul 2024 21:43:25 -0400 Subject: puzzles: resync with upstream This brings the puzzles source in sync with Simon's branch, commit fd304c5 (from March 2024), with some added Rockbox-specific compatibility changes: https://www.franklinwei.com/git/puzzles/commit/?h=rockbox-devel&id=516830d9d76bdfe64fe5ccf2a9b59c33f5c7c078 There are quite a lot of backend changes, including a new "Mosaic" puzzle. In addition, some new frontend changes were necessary: - New "Preferences" menu to access the user preferences system. - Enabled spacebar input for several games. Change-Id: I94c7df674089c92f32d5f07025f6a1059068af1e --- apps/plugins/puzzles/help/palisade.c | 145 ++++++++++++++++++----------------- 1 file changed, 73 insertions(+), 72 deletions(-) (limited to 'apps/plugins/puzzles/help/palisade.c') diff --git a/apps/plugins/puzzles/help/palisade.c b/apps/plugins/puzzles/help/palisade.c index 1094502ea7..9b95b07eae 100644 --- a/apps/plugins/puzzles/help/palisade.c +++ b/apps/plugins/puzzles/help/palisade.c @@ -1,4 +1,4 @@ -/* auto-generated on Dec 7 2020 by genhelp.sh */ +/* auto-generated on Jul 22 2024 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ @@ -6,89 +6,90 @@ struct style_text help_text_style[] = { { 0, TEXT_CENTER | C_RED }, - { 87, TEXT_CENTER | C_RED }, - { 149, TEXT_CENTER | C_RED }, - { 166, TEXT_UNDERLINE }, + { 88, TEXT_CENTER | C_RED }, + { 150, TEXT_CENTER | C_RED }, { 167, TEXT_UNDERLINE }, - { 177, TEXT_UNDERLINE }, + { 168, TEXT_UNDERLINE }, + { 178, TEXT_UNDERLINE }, LAST_STYLE_ITEM }; -/* orig 1113 comp 892 ratio 0.801438 level 3 saved 221 */ +/* orig 1135 comp 902 ratio 0.794714 level 3 saved 233 */ const char help_text[] = { -0xf0, 0x2d, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20, +0xff, 0x08, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20, 0x34, 0x31, 0x3a, 0x20, 0x50, 0x61, 0x6c, 0x69, 0x73, 0x61, -0x64, 0x65, 0x20, 0x00, 0x00, 0x00, 0x59, 0x6f, 0x75, 0x27, -0x72, 0x65, 0x00, 0x67, 0x69, 0x76, 0x65, 0x6e, 0x00, 0x61, -0x00, 0x67, 0x72, 0x69, 0x64, 0x00, 0x6f, 0x66, 0x00, 0x73, -0x71, 0x75, 0x61, 0x72, 0x65, 0x73, 0x2c, 0x00, 0x73, 0x6f, -0x6d, 0x65, 0x11, 0x00, 0xf0, 0x07, 0x77, 0x68, 0x69, 0x63, -0x68, 0x00, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x00, -0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x2e, 0x3f, 0x00, -0xf2, 0x0b, 0x72, 0x00, 0x67, 0x6f, 0x61, 0x6c, 0x00, 0x69, -0x73, 0x00, 0x74, 0x6f, 0x00, 0x73, 0x75, 0x62, 0x64, 0x69, -0x76, 0x69, 0x64, 0x65, 0x00, 0x74, 0x68, 0x65, 0x4e, 0x00, -0x41, 0x69, 0x6e, 0x74, 0x6f, 0x39, 0x00, 0xf0, 0x04, 0x69, -0x67, 0x75, 0x6f, 0x75, 0x73, 0x00, 0x72, 0x65, 0x67, 0x69, -0x6f, 0x6e, 0x73, 0x2c, 0x00, 0x61, 0x6c, 0x6c, 0x5a, 0x00, -0x00, 0x29, 0x00, 0x61, 0x73, 0x61, 0x6d, 0x65, 0x00, 0x28, -0x85, 0x00, 0xf3, 0x07, 0x29, 0x00, 0x73, 0x69, 0x7a, 0x65, -0x2c, 0x00, 0x73, 0x75, 0x63, 0x68, 0x00, 0x74, 0x68, 0x61, -0x74, 0x00, 0x65, 0x61, 0x63, 0x68, 0x91, 0x00, 0x04, 0x81, -0x00, 0x53, 0x69, 0x6e, 0x67, 0x00, 0x61, 0x86, 0x00, 0x00, -0x7a, 0x00, 0x80, 0x61, 0x64, 0x6a, 0x61, 0x63, 0x65, 0x6e, -0x74, 0x83, 0x00, 0x72, 0x65, 0x78, 0x61, 0x63, 0x74, 0x6c, -0x79, 0x3c, 0x00, 0xf0, 0x03, 0x6d, 0x61, 0x6e, 0x79, 0x00, -0x65, 0x64, 0x67, 0x65, 0x73, 0x00, 0x28, 0x69, 0x6e, 0x63, -0x6c, 0x75, 0x64, 0x3b, 0x00, 0xd1, 0x74, 0x68, 0x6f, 0x73, -0x65, 0x00, 0x62, 0x65, 0x74, 0x77, 0x65, 0x65, 0x6e, 0x81, -0x00, 0x30, 0x69, 0x6e, 0x73, 0xb5, 0x00, 0x31, 0x61, 0x6e, -0x64, 0x0f, 0x00, 0x31, 0x6f, 0x75, 0x74, 0x10, 0x00, 0x25, -0x6f, 0x66, 0xc8, 0x00, 0xf1, 0x10, 0x29, 0x2e, 0x00, 0x00, -0x00, 0x43, 0x72, 0x65, 0x64, 0x69, 0x74, 0x00, 0x66, 0x6f, -0x72, 0x00, 0x74, 0x68, 0x69, 0x73, 0x00, 0x70, 0x75, 0x7a, -0x7a, 0x6c, 0x65, 0x00, 0x67, 0x6f, 0x65, 0xfe, 0x00, 0xd0, -0x4e, 0x69, 0x6b, 0x6f, 0x6c, 0x69, 0x2c, 0x00, 0x77, 0x68, -0x6f, 0x00, 0x63, 0xdf, 0x00, 0xf0, 0x06, 0x69, 0x74, 0x00, -0x60, 0x46, 0x69, 0x76, 0x65, 0x00, 0x43, 0x65, 0x6c, 0x6c, -0x73, 0x27, 0x2e, 0x00, 0x5b, 0x32, 0x32, 0x5d, 0x49, 0x00, -0x04, 0x83, 0x01, 0x41, 0x00, 0x77, 0x61, 0x73, 0xd5, 0x00, -0x70, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x64, 0x46, 0x00, -0x01, 0x5a, 0x00, 0xf0, 0x0c, 0x63, 0x6f, 0x6c, 0x6c, 0x65, -0x63, 0x74, 0x69, 0x6f, 0x6e, 0x00, 0x62, 0x79, 0x00, 0x4a, -0x6f, 0x6e, 0x61, 0x73, 0x00, 0x4b, 0x6f, 0x65, 0x6c, 0x6b, -0x65, 0x72, 0x40, 0x00, 0x00, 0x48, 0x00, 0x91, 0x00, 0x68, -0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x6e, 0x76, 0x00, 0xa2, -0x2e, 0x63, 0x6f, 0x2e, 0x6a, 0x70, 0x2f, 0x65, 0x6e, 0x2f, -0x95, 0x00, 0x80, 0x73, 0x2f, 0x66, 0x69, 0x76, 0x65, 0x5f, -0x63, 0x79, 0x00, 0xc6, 0x2e, 0x68, 0x74, 0x6d, 0x6c, 0x00, -0x00, 0x00, 0x34, 0x31, 0x2e, 0x31, 0xfe, 0x01, 0x01, 0x77, -0x00, 0x30, 0x6f, 0x6c, 0x73, 0x07, 0x02, 0xa0, 0x4c, 0x65, -0x66, 0x74, 0x2d, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x82, 0x00, -0x40, 0x70, 0x6c, 0x61, 0x63, 0x0d, 0x01, 0x01, 0x3a, 0x01, +0x64, 0x65, 0x20, 0x00, 0x2d, 0x01, 0x00, 0x00, 0xf0, 0x18, +0x00, 0x00, 0x00, 0x59, 0x6f, 0x75, 0x27, 0x72, 0x65, 0x00, +0x67, 0x69, 0x76, 0x65, 0x6e, 0x00, 0x61, 0x00, 0x67, 0x72, +0x69, 0x64, 0x00, 0x6f, 0x66, 0x00, 0x73, 0x71, 0x75, 0x61, +0x72, 0x65, 0x73, 0x2c, 0x00, 0x73, 0x6f, 0x6d, 0x65, 0x11, +0x00, 0xf0, 0x07, 0x77, 0x68, 0x69, 0x63, 0x68, 0x00, 0x63, +0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x00, 0x6e, 0x75, 0x6d, +0x62, 0x65, 0x72, 0x73, 0x2e, 0x3f, 0x00, 0xf2, 0x0b, 0x72, +0x00, 0x67, 0x6f, 0x61, 0x6c, 0x00, 0x69, 0x73, 0x00, 0x74, +0x6f, 0x00, 0x73, 0x75, 0x62, 0x64, 0x69, 0x76, 0x69, 0x64, +0x65, 0x00, 0x74, 0x68, 0x65, 0x4e, 0x00, 0x41, 0x69, 0x6e, +0x74, 0x6f, 0x39, 0x00, 0xf0, 0x04, 0x69, 0x67, 0x75, 0x6f, +0x75, 0x73, 0x00, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x73, +0x2c, 0x00, 0x61, 0x6c, 0x6c, 0x5a, 0x00, 0x00, 0x29, 0x00, +0x61, 0x73, 0x61, 0x6d, 0x65, 0x00, 0x28, 0x85, 0x00, 0xf3, +0x07, 0x29, 0x00, 0x73, 0x69, 0x7a, 0x65, 0x2c, 0x00, 0x73, +0x75, 0x63, 0x68, 0x00, 0x74, 0x68, 0x61, 0x74, 0x00, 0x65, +0x61, 0x63, 0x68, 0x91, 0x00, 0x04, 0x81, 0x00, 0x53, 0x69, +0x6e, 0x67, 0x00, 0x61, 0x86, 0x00, 0x00, 0x7a, 0x00, 0x80, +0x61, 0x64, 0x6a, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x83, 0x00, +0x72, 0x65, 0x78, 0x61, 0x63, 0x74, 0x6c, 0x79, 0x3c, 0x00, +0xf0, 0x03, 0x6d, 0x61, 0x6e, 0x79, 0x00, 0x65, 0x64, 0x67, +0x65, 0x73, 0x00, 0x28, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, +0x3b, 0x00, 0xd1, 0x74, 0x68, 0x6f, 0x73, 0x65, 0x00, 0x62, +0x65, 0x74, 0x77, 0x65, 0x65, 0x6e, 0x81, 0x00, 0x30, 0x69, +0x6e, 0x73, 0xb5, 0x00, 0x31, 0x61, 0x6e, 0x64, 0x0f, 0x00, +0x31, 0x6f, 0x75, 0x74, 0x10, 0x00, 0x25, 0x6f, 0x66, 0xc8, +0x00, 0xf1, 0x10, 0x29, 0x2e, 0x00, 0x00, 0x00, 0x43, 0x72, +0x65, 0x64, 0x69, 0x74, 0x00, 0x66, 0x6f, 0x72, 0x00, 0x74, +0x68, 0x69, 0x73, 0x00, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, +0x00, 0x67, 0x6f, 0x65, 0xfe, 0x00, 0xd0, 0x4e, 0x69, 0x6b, +0x6f, 0x6c, 0x69, 0x2c, 0x00, 0x77, 0x68, 0x6f, 0x00, 0x63, +0xdf, 0x00, 0xf0, 0x06, 0x69, 0x74, 0x00, 0x60, 0x46, 0x69, +0x76, 0x65, 0x00, 0x43, 0x65, 0x6c, 0x6c, 0x73, 0x27, 0x2e, +0x00, 0x5b, 0x32, 0x32, 0x5d, 0x49, 0x00, 0x04, 0x98, 0x01, +0x41, 0x00, 0x77, 0x61, 0x73, 0xd5, 0x00, 0x70, 0x72, 0x69, +0x62, 0x75, 0x74, 0x65, 0x64, 0x46, 0x00, 0x01, 0x5a, 0x00, +0xf0, 0x0c, 0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69, +0x6f, 0x6e, 0x00, 0x62, 0x79, 0x00, 0x4a, 0x6f, 0x6e, 0x61, +0x73, 0x00, 0x4b, 0x6f, 0x65, 0x6c, 0x6b, 0x65, 0x72, 0x40, +0x00, 0x00, 0x48, 0x00, 0xe1, 0x00, 0x68, 0x74, 0x74, 0x70, +0x73, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x6e, 0x7b, +0x00, 0xa2, 0x2e, 0x63, 0x6f, 0x2e, 0x6a, 0x70, 0x2f, 0x65, +0x6e, 0x2f, 0x9a, 0x00, 0x80, 0x73, 0x2f, 0x66, 0x69, 0x76, +0x65, 0x5f, 0x63, 0x7e, 0x00, 0x86, 0x2f, 0x00, 0x00, 0x00, +0x34, 0x31, 0x2e, 0x31, 0x14, 0x02, 0x01, 0x78, 0x00, 0xf0, +0x02, 0x6f, 0x6c, 0x73, 0x20, 0x00, 0x00, 0x00, 0x4c, 0x65, +0x66, 0x74, 0x2d, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x83, 0x00, +0x40, 0x70, 0x6c, 0x61, 0x63, 0x0e, 0x01, 0x01, 0x3b, 0x01, 0x67, 0x2e, 0x00, 0x52, 0x69, 0x67, 0x68, 0x1e, 0x00, 0xc1, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x00, 0x60, 0x6e, 0x6f, 0x22, 0x00, 0xf1, 0x02, 0x27, 0x2e, 0x00, 0x41, 0x6c, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, -0x6c, 0x79, 0x2c, 0x35, 0x01, 0xf0, 0x07, 0x61, 0x72, 0x72, +0x6c, 0x79, 0x2c, 0x36, 0x01, 0xf0, 0x07, 0x61, 0x72, 0x72, 0x6f, 0x77, 0x00, 0x6b, 0x65, 0x79, 0x73, 0x00, 0x77, 0x69, 0x6c, 0x6c, 0x00, 0x6d, 0x6f, 0x76, 0x65, 0x00, 0x61, 0x11, 0x00, 0xf1, 0x02, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x00, 0x63, 0x75, 0x72, 0x73, 0x6f, 0x72, 0x2e, 0x00, 0x48, 0x6f, 0x6c, -0x95, 0x01, 0x12, 0x43, 0x8f, 0x00, 0x00, 0x6a, 0x02, 0x81, -0x6c, 0x65, 0x00, 0x70, 0x72, 0x65, 0x73, 0x73, 0xe7, 0x01, +0x96, 0x01, 0x12, 0x43, 0x8f, 0x00, 0x00, 0x6b, 0x02, 0x81, +0x6c, 0x65, 0x00, 0x70, 0x72, 0x65, 0x73, 0x73, 0xe8, 0x01, 0x16, 0x6e, 0x4a, 0x00, 0x02, 0x49, 0x00, 0x0b, 0x9e, 0x00, 0x10, 0x50, 0x2a, 0x00, 0x72, 0x00, 0x53, 0x68, 0x69, 0x66, -0x74, 0x2d, 0x2b, 0x00, 0x00, 0x2a, 0x00, 0x00, 0x8c, 0x02, +0x74, 0x2d, 0x2b, 0x00, 0x00, 0x2a, 0x00, 0x00, 0x8d, 0x02, 0x97, 0x77, 0x69, 0x74, 0x63, 0x68, 0x00, 0x6f, 0x66, 0x66, 0xcb, 0x00, 0x51, 0x65, 0x70, 0x65, 0x61, 0x74, 0x55, 0x00, -0x02, 0x5d, 0x01, 0x00, 0xee, 0x00, 0xf0, 0x03, 0x65, 0x72, +0x02, 0x5e, 0x01, 0x00, 0xee, 0x00, 0xf0, 0x03, 0x65, 0x72, 0x66, 0x6f, 0x72, 0x6d, 0x00, 0x69, 0x74, 0x73, 0x00, 0x69, -0x6e, 0x76, 0x65, 0x72, 0x73, 0x65, 0x63, 0x01, 0x42, 0x28, +0x6e, 0x76, 0x65, 0x72, 0x73, 0x65, 0x64, 0x01, 0x42, 0x28, 0x41, 0x6c, 0x6c, 0xc9, 0x00, 0x01, 0x2a, 0x00, 0xa0, 0x73, -0x00, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0xd3, -0x02, 0x23, 0x00, 0x73, 0x9d, 0x01, 0x40, 0x32, 0x2e, 0x31, -0x00, 0x99, 0x02, 0xf2, 0x01, 0x61, 0x6c, 0x73, 0x6f, 0x00, +0x00, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0xd4, +0x02, 0x23, 0x00, 0x73, 0x9e, 0x01, 0x40, 0x32, 0x2e, 0x31, +0x00, 0x9a, 0x02, 0xf2, 0x01, 0x61, 0x6c, 0x73, 0x6f, 0x00, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x2e, 0x29, 0x6e, 0x01, 0x16, 0x32, 0x6e, 0x01, 0x91, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x70, 0x01, 0x66, @@ -99,15 +100,15 @@ const char help_text[] = { 0x6f, 0x6e, 0x1a, 0x00, 0xa0, 0x54, 0x79, 0x70, 0x65, 0x27, 0x00, 0x6d, 0x65, 0x6e, 0x75, 0xae, 0x00, 0x90, 0x57, 0x69, 0x64, 0x74, 0x68, 0x2c, 0x00, 0x48, 0x65, 0xac, 0x01, 0x61, -0x00, 0x00, 0x00, 0x53, 0x69, 0x7a, 0xbf, 0x02, 0x03, 0x83, -0x03, 0x04, 0xd1, 0x03, 0x00, 0x2b, 0x00, 0x11, 0x52, 0x81, -0x03, 0x10, 0x20, 0x67, 0x03, 0x02, 0x8a, 0x00, 0x01, 0x72, -0x03, 0x04, 0xec, 0x02, 0x03, 0x9f, 0x03, 0x02, 0xb7, 0x03, -0x02, 0xf6, 0x03, 0x05, 0xcb, 0x03, 0x74, 0x6d, 0x75, 0x73, -0x74, 0x00, 0x62, 0x65, 0xe6, 0x03, 0x50, 0x64, 0x65, 0x64, +0x00, 0x00, 0x00, 0x53, 0x69, 0x7a, 0xc0, 0x02, 0x03, 0x84, +0x03, 0x04, 0xd2, 0x03, 0x00, 0x2b, 0x00, 0x11, 0x52, 0x82, +0x03, 0x10, 0x20, 0x68, 0x03, 0x02, 0x8a, 0x00, 0x01, 0x73, +0x03, 0x04, 0xed, 0x02, 0x03, 0xa0, 0x03, 0x02, 0xb8, 0x03, +0x02, 0xf7, 0x03, 0x05, 0xcc, 0x03, 0x74, 0x6d, 0x75, 0x73, +0x74, 0x00, 0x62, 0x65, 0xe7, 0x03, 0x50, 0x64, 0x65, 0x64, 0x2e, 0x00, }; -const unsigned short help_text_len = 1113; -const unsigned short help_text_words = 192; +const unsigned short help_text_len = 1135; +const unsigned short help_text_words = 193; const char quick_help_text[] = "Divide the grid into equal-sized areas in accordance with the clues."; -- cgit v1.2.3