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/untangle.c | 150 +++++++++++++++++++---------------- 1 file changed, 83 insertions(+), 67 deletions(-) (limited to 'apps/plugins/puzzles/help/untangle.c') diff --git a/apps/plugins/puzzles/help/untangle.c b/apps/plugins/puzzles/help/untangle.c index f7f5c05f24..64ebdfb364 100644 --- a/apps/plugins/puzzles/help/untangle.c +++ b/apps/plugins/puzzles/help/untangle.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,79 +6,95 @@ struct style_text help_text_style[] = { { 0, TEXT_CENTER | C_RED }, - { 64, TEXT_CENTER | C_RED }, - { 100, TEXT_CENTER | C_RED }, - { 119, TEXT_UNDERLINE }, + { 65, TEXT_CENTER | C_RED }, + { 136, TEXT_CENTER | C_RED }, + { 155, TEXT_UNDERLINE }, LAST_STYLE_ITEM }; -/* orig 751 comp 627 ratio 0.834887 level 4 saved 124 */ +/* orig 974 comp 787 ratio 0.808008 level 4 saved 187 */ const char help_text[] = { -0xf0, 0x2f, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20, +0xff, 0x08, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20, 0x31, 0x38, 0x3a, 0x20, 0x55, 0x6e, 0x74, 0x61, 0x6e, 0x67, -0x6c, 0x65, 0x20, 0x00, 0x00, 0x00, 0x59, 0x6f, 0x75, 0x00, -0x61, 0x72, 0x65, 0x00, 0x67, 0x69, 0x76, 0x65, 0x6e, 0x00, -0x61, 0x00, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x00, 0x6f, -0x66, 0x00, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x2c, 0x00, -0x73, 0x6f, 0x6d, 0x65, 0x10, 0x00, 0xf1, 0x15, 0x77, 0x68, -0x69, 0x63, 0x68, 0x00, 0x68, 0x61, 0x76, 0x65, 0x00, 0x6c, -0x69, 0x6e, 0x65, 0x73, 0x00, 0x64, 0x72, 0x61, 0x77, 0x6e, -0x00, 0x62, 0x65, 0x74, 0x77, 0x65, 0x65, 0x6e, 0x00, 0x74, -0x68, 0x65, 0x6d, 0x2e, 0x4f, 0x00, 0x80, 0x63, 0x61, 0x6e, -0x00, 0x6d, 0x6f, 0x76, 0x65, 0x13, 0x00, 0x03, 0x46, 0x00, -0xf8, 0x1c, 0x00, 0x61, 0x62, 0x6f, 0x75, 0x74, 0x00, 0x61, -0x72, 0x62, 0x69, 0x74, 0x72, 0x61, 0x72, 0x69, 0x6c, 0x79, -0x3b, 0x00, 0x79, 0x6f, 0x75, 0x72, 0x00, 0x61, 0x69, 0x6d, -0x00, 0x69, 0x73, 0x00, 0x74, 0x6f, 0x00, 0x70, 0x6f, 0x73, -0x69, 0x74, 0x69, 0x6f, 0x6e, 0x36, 0x00, 0xa1, 0x73, 0x6f, -0x00, 0x74, 0x68, 0x61, 0x74, 0x00, 0x6e, 0x6f, 0x73, 0x00, -0xf2, 0x1c, 0x00, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x65, 0x73, -0x00, 0x61, 0x6e, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x2e, 0x00, -0x00, 0x00, 0x49, 0x00, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, -0x61, 0x6c, 0x6c, 0x79, 0x00, 0x73, 0x61, 0x77, 0x00, 0x74, -0x68, 0x69, 0x73, 0x00, 0x69, 0x47, 0x00, 0x40, 0x66, 0x6f, -0x72, 0x6d, 0xbb, 0x00, 0xf0, 0x2b, 0x61, 0x00, 0x46, 0x6c, -0x61, 0x73, 0x68, 0x00, 0x67, 0x61, 0x6d, 0x65, 0x00, 0x63, -0x61, 0x6c, 0x6c, 0x65, 0x64, 0x00, 0x50, 0x6c, 0x61, 0x6e, -0x61, 0x72, 0x69, 0x74, 0x79, 0x00, 0x5b, 0x37, 0x5d, 0x2c, -0x00, 0x77, 0x72, 0x69, 0x74, 0x74, 0x65, 0x6e, 0x00, 0x62, -0x79, 0x00, 0x4a, 0x6f, 0x68, 0x6e, 0x00, 0x54, 0x61, 0x6e, -0x74, 0x61, 0x6c, 0x6f, 0x63, 0x00, 0xc4, 0x5b, 0x37, 0x5d, -0x00, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x70, 0x35, -0x00, 0xb6, 0x2e, 0x6e, 0x65, 0x74, 0x00, 0x00, 0x00, 0x31, -0x38, 0x2e, 0x31, 0x4f, 0x01, 0x80, 0x63, 0x6f, 0x6e, 0x74, -0x72, 0x6f, 0x6c, 0x73, 0x58, 0x01, 0x22, 0x54, 0x6f, 0x04, -0x01, 0x12, 0x61, 0xcc, 0x00, 0xf1, 0x03, 0x2c, 0x00, 0x63, -0x6c, 0x69, 0x63, 0x6b, 0x00, 0x6f, 0x6e, 0x00, 0x69, 0x74, -0x00, 0x77, 0x69, 0x74, 0x68, 0xa1, 0x00, 0xf0, 0x06, 0x6c, -0x65, 0x66, 0x74, 0x00, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x00, -0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x00, 0x61, 0x6e, 0x64, -0x59, 0x01, 0x10, 0x67, 0x27, 0x00, 0x40, 0x69, 0x6e, 0x74, -0x6f, 0x93, 0x01, 0x25, 0x65, 0x77, 0x1e, 0x01, 0x00, 0x90, -0x00, 0x41, 0x28, 0x41, 0x6c, 0x6c, 0x3e, 0x00, 0x20, 0x61, -0x63, 0x13, 0x00, 0xb0, 0x73, 0x00, 0x64, 0x65, 0x73, 0x63, -0x72, 0x69, 0x62, 0x65, 0x64, 0xf8, 0x00, 0x21, 0x73, 0x65, -0x16, 0x00, 0x41, 0x00, 0x32, 0x2e, 0x31, 0xd9, 0x01, 0xf2, -0x01, 0x61, 0x6c, 0x73, 0x6f, 0x00, 0x61, 0x76, 0x61, 0x69, -0x6c, 0x61, 0x62, 0x6c, 0x65, 0x2e, 0x29, 0xb6, 0x00, 0x16, -0x32, 0xb6, 0x00, 0x92, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, -0x74, 0x65, 0x72, 0xb8, 0x00, 0x40, 0x68, 0x65, 0x72, 0x65, -0x93, 0x01, 0x95, 0x6f, 0x6e, 0x6c, 0x79, 0x00, 0x6f, 0x6e, -0x65, 0x00, 0x20, 0x00, 0x06, 0x46, 0x00, 0x51, 0x00, 0x66, -0x72, 0x6f, 0x6d, 0x83, 0x00, 0xe1, 0x60, 0x43, 0x75, 0x73, -0x74, 0x6f, 0x6d, 0x2e, 0x2e, 0x2e, 0x27, 0x00, 0x6f, 0x70, -0x79, 0x00, 0x03, 0xc3, 0x01, 0xf1, 0x01, 0x60, 0x54, 0x79, -0x70, 0x65, 0x27, 0x00, 0x6d, 0x65, 0x6e, 0x75, 0x3a, 0x00, -0x00, 0x00, 0x4e, 0x58, 0x02, 0x43, 0x20, 0x6f, 0x66, 0x20, -0xdc, 0x01, 0x33, 0x00, 0x00, 0x43, 0x2f, 0x01, 0x01, 0x2f, -0x00, 0x31, 0x73, 0x69, 0x7a, 0x66, 0x02, 0x01, 0xfe, 0x01, -0x60, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x2c, 0x8c, 0x01, 0xa1, -0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x79, 0x69, 0x6e, 0x67, -0x1a, 0x00, 0x0c, 0x9e, 0x02, 0x04, 0xe9, 0x01, 0xf0, 0x02, +0x6c, 0x65, 0x20, 0x00, 0x2d, 0x01, 0x00, 0x00, 0xf0, 0x1a, +0x00, 0x00, 0x00, 0x59, 0x6f, 0x75, 0x00, 0x61, 0x72, 0x65, +0x00, 0x67, 0x69, 0x76, 0x65, 0x6e, 0x00, 0x61, 0x00, 0x6e, +0x75, 0x6d, 0x62, 0x65, 0x72, 0x00, 0x6f, 0x66, 0x00, 0x70, +0x6f, 0x69, 0x6e, 0x74, 0x73, 0x2c, 0x00, 0x73, 0x6f, 0x6d, +0x65, 0x10, 0x00, 0xf1, 0x15, 0x77, 0x68, 0x69, 0x63, 0x68, +0x00, 0x68, 0x61, 0x76, 0x65, 0x00, 0x6c, 0x69, 0x6e, 0x65, +0x73, 0x00, 0x64, 0x72, 0x61, 0x77, 0x6e, 0x00, 0x62, 0x65, +0x74, 0x77, 0x65, 0x65, 0x6e, 0x00, 0x74, 0x68, 0x65, 0x6d, +0x2e, 0x4f, 0x00, 0x80, 0x63, 0x61, 0x6e, 0x00, 0x6d, 0x6f, +0x76, 0x65, 0x13, 0x00, 0x03, 0x46, 0x00, 0xf8, 0x1c, 0x00, +0x61, 0x62, 0x6f, 0x75, 0x74, 0x00, 0x61, 0x72, 0x62, 0x69, +0x74, 0x72, 0x61, 0x72, 0x69, 0x6c, 0x79, 0x3b, 0x00, 0x79, +0x6f, 0x75, 0x72, 0x00, 0x61, 0x69, 0x6d, 0x00, 0x69, 0x73, +0x00, 0x74, 0x6f, 0x00, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, +0x6f, 0x6e, 0x36, 0x00, 0xa1, 0x73, 0x6f, 0x00, 0x74, 0x68, +0x61, 0x74, 0x00, 0x6e, 0x6f, 0x73, 0x00, 0xf2, 0x1c, 0x00, +0x63, 0x72, 0x6f, 0x73, 0x73, 0x65, 0x73, 0x00, 0x61, 0x6e, +0x6f, 0x74, 0x68, 0x65, 0x72, 0x2e, 0x00, 0x00, 0x00, 0x49, +0x00, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x6c, 0x6c, +0x79, 0x00, 0x73, 0x61, 0x77, 0x00, 0x74, 0x68, 0x69, 0x73, +0x00, 0x69, 0x47, 0x00, 0x40, 0x66, 0x6f, 0x72, 0x6d, 0xbb, +0x00, 0xf0, 0x2b, 0x61, 0x00, 0x46, 0x6c, 0x61, 0x73, 0x68, +0x00, 0x67, 0x61, 0x6d, 0x65, 0x00, 0x63, 0x61, 0x6c, 0x6c, +0x65, 0x64, 0x00, 0x50, 0x6c, 0x61, 0x6e, 0x61, 0x72, 0x69, +0x74, 0x79, 0x00, 0x5b, 0x37, 0x5d, 0x2c, 0x00, 0x77, 0x72, +0x69, 0x74, 0x74, 0x65, 0x6e, 0x00, 0x62, 0x79, 0x00, 0x4a, +0x6f, 0x68, 0x6e, 0x00, 0x54, 0x61, 0x6e, 0x74, 0x61, 0x6c, +0x6f, 0x63, 0x00, 0xc4, 0x5b, 0x37, 0x5d, 0x00, 0x68, 0x74, +0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x70, 0x35, 0x00, 0xb6, 0x2e, +0x6e, 0x65, 0x74, 0x00, 0x00, 0x00, 0x31, 0x38, 0x2e, 0x31, +0x64, 0x01, 0xe2, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, +0x73, 0x20, 0x00, 0x00, 0x00, 0x54, 0x6f, 0x04, 0x01, 0x12, +0x61, 0xcc, 0x00, 0xf1, 0x03, 0x2c, 0x00, 0x63, 0x6c, 0x69, +0x63, 0x6b, 0x00, 0x6f, 0x6e, 0x00, 0x69, 0x74, 0x00, 0x77, +0x69, 0x74, 0x68, 0xa1, 0x00, 0xf0, 0x06, 0x6c, 0x65, 0x66, +0x74, 0x00, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x00, 0x62, 0x75, +0x74, 0x74, 0x6f, 0x6e, 0x00, 0x61, 0x6e, 0x64, 0x59, 0x01, +0x10, 0x67, 0x27, 0x00, 0x40, 0x69, 0x6e, 0x74, 0x6f, 0x93, +0x01, 0x25, 0x65, 0x77, 0x1e, 0x01, 0x00, 0x90, 0x00, 0xf0, +0x11, 0x54, 0x68, 0x65, 0x00, 0x63, 0x75, 0x72, 0x73, 0x6f, +0x72, 0x00, 0x6b, 0x65, 0x79, 0x73, 0x00, 0x6d, 0x61, 0x79, +0x00, 0x61, 0x6c, 0x73, 0x6f, 0x00, 0x62, 0x65, 0x00, 0x75, +0x73, 0x65, 0x64, 0x4e, 0x01, 0xf7, 0x01, 0x6e, 0x61, 0x76, +0x69, 0x67, 0x61, 0x74, 0x65, 0x00, 0x61, 0x6d, 0x6f, 0x6e, +0x67, 0x73, 0x74, 0x56, 0x01, 0xa1, 0x2e, 0x00, 0x50, 0x72, +0x65, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x15, 0x00, 0x41, 0x45, +0x6e, 0x74, 0x65, 0x49, 0x00, 0xc1, 0x00, 0x77, 0x69, 0x6c, +0x6c, 0x00, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x83, 0x00, +0x14, 0x67, 0x23, 0x00, 0xf2, 0x07, 0x63, 0x75, 0x72, 0x72, +0x65, 0x6e, 0x74, 0x6c, 0x79, 0x2d, 0x00, 0x68, 0x69, 0x67, +0x68, 0x6c, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x4f, 0x00, +0x07, 0x4e, 0x00, 0xc2, 0x54, 0x61, 0x62, 0x00, 0x6f, 0x72, +0x00, 0x53, 0x70, 0x61, 0x63, 0x65, 0x4d, 0x00, 0x40, 0x63, +0x79, 0x63, 0x6c, 0x07, 0x02, 0x99, 0x72, 0x6f, 0x75, 0x67, +0x68, 0x00, 0x61, 0x6c, 0x6c, 0x87, 0x00, 0x43, 0x00, 0x00, +0x28, 0x41, 0x13, 0x00, 0x20, 0x61, 0x63, 0xdd, 0x00, 0xb0, +0x73, 0x00, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, +0x64, 0xc2, 0x01, 0x21, 0x73, 0x65, 0x16, 0x00, 0x41, 0x00, +0x32, 0x2e, 0x31, 0xa3, 0x02, 0x01, 0xe4, 0x00, 0xb2, 0x61, +0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x2e, 0x29, +0x80, 0x01, 0x16, 0x32, 0x80, 0x01, 0x92, 0x70, 0x61, 0x72, +0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x82, 0x01, 0x40, 0x68, +0x65, 0x72, 0x65, 0x5d, 0x02, 0x95, 0x6f, 0x6e, 0x6c, 0x79, +0x00, 0x6f, 0x6e, 0x65, 0x00, 0x20, 0x00, 0x06, 0x46, 0x00, +0x51, 0x00, 0x66, 0x72, 0x6f, 0x6d, 0x83, 0x00, 0xe1, 0x60, +0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x2e, 0x2e, 0x2e, 0x27, +0x00, 0x6f, 0x70, 0x79, 0x00, 0x03, 0x8d, 0x02, 0xf1, 0x01, +0x60, 0x54, 0x79, 0x70, 0x65, 0x27, 0x00, 0x6d, 0x65, 0x6e, +0x75, 0x3a, 0x00, 0x00, 0x00, 0x4e, 0x22, 0x03, 0x43, 0x20, +0x6f, 0x66, 0x20, 0xa6, 0x02, 0x33, 0x00, 0x00, 0x43, 0xf9, +0x01, 0x01, 0x2f, 0x00, 0x31, 0x73, 0x69, 0x7a, 0x30, 0x03, +0x01, 0xeb, 0x00, 0x60, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x2c, +0x56, 0x02, 0x74, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x79, +0x54, 0x01, 0x0c, 0x68, 0x03, 0x04, 0xb3, 0x02, 0xf0, 0x02, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x64, 0x00, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2e, 0x00, }; -const unsigned short help_text_len = 751; -const unsigned short help_text_words = 138; +const unsigned short help_text_len = 974; +const unsigned short help_text_words = 174; const char quick_help_text[] = "Reposition the points so that the lines do not cross."; -- cgit v1.2.3