puzzles: resync with Simon's upstream e00cb46 from 25 Sep 2025.

Notably, this enables "Group".

This also includes some changes to the Rockbox frontend:

- Removes extraneous underline from Extensive Help text.

- Implements a workaround for an upstream breaking change that removes
  the BLITTER_FROMSAVED flag. We depend on this for mouse mode. This
  is apparently the only place this flag was ever used. Note that I've
  hardcoded an arbitrary negative value for BLITTER_FROMSAVED instead
  of -1, for the reason Ben Harris mentioned in his commit removing it
  from the upstream source tree.

- Adds an implicit clip() to the game region when drawing a
  puzzle. This fixes a bug in Untangle where dragging a point off
  screen leads to ugly lines outside the play area.

- Implements "Quick Help" for unfinished plugins (but not "Extensive
  Help").

- Documents the need to disable unfinished plugins in resync.sh (weak
  symbols on win32).

Change-Id: Ic318a5db4b15acb437a3f951fbc9b7919c6fa652
This commit is contained in:
Franklin Wei 2025-10-01 00:36:45 -04:00
parent 306d8d4fc9
commit be5457b5eb
89 changed files with 9080 additions and 8527 deletions

View file

@ -9,54 +9,54 @@ struct style_text help_text_style[] = {
LAST_STYLE_ITEM
};
/* orig 546 comp 425 ratio 0.778388 level 3 saved 121 */
/* orig 526 comp 419 ratio 0.796578 level 3 saved 107 */
const char help_text[] = {
0xfe, 0x07, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
0xf2, 0x3c, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
0x39, 0x3a, 0x20, 0x4e, 0x65, 0x74, 0x73, 0x6c, 0x69, 0x64,
0x65, 0x20, 0x00, 0x2d, 0x01, 0x00, 0xf2, 0x28, 0x00, 0x00,
0x00, 0x54, 0x68, 0x69, 0x73, 0x00, 0x67, 0x61, 0x6d, 0x65,
0x00, 0x63, 0x6f, 0x6d, 0x62, 0x69, 0x6e, 0x65, 0x73, 0x00,
0x74, 0x68, 0x65, 0x00, 0x67, 0x72, 0x69, 0x64, 0x00, 0x67,
0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x00,
0x6f, 0x66, 0x00, 0x4e, 0x65, 0x74, 0x00, 0x28, 0x73, 0x65,
0x65, 0x00, 0x63, 0x5e, 0x00, 0x81, 0x00, 0x33, 0x29, 0x00,
0x77, 0x69, 0x74, 0x68, 0x30, 0x00, 0x80, 0x6d, 0x6f, 0x76,
0x65, 0x6d, 0x65, 0x6e, 0x74, 0x29, 0x00, 0x7a, 0x53, 0x69,
0x78, 0x74, 0x65, 0x65, 0x6e, 0x2d, 0x00, 0xe1, 0x36, 0x29,
0x3a, 0x00, 0x79, 0x6f, 0x75, 0x00, 0x68, 0x61, 0x76, 0x65,
0x00, 0x61, 0x4d, 0x00, 0x00, 0x64, 0x00, 0xd0, 0x2c, 0x00,
0x62, 0x75, 0x74, 0x00, 0x69, 0x6e, 0x73, 0x74, 0x65, 0x61,
0x64, 0x3d, 0x00, 0xf6, 0x0f, 0x72, 0x6f, 0x74, 0x61, 0x74,
0x69, 0x6e, 0x67, 0x00, 0x74, 0x69, 0x6c, 0x65, 0x73, 0x00,
0x62, 0x61, 0x63, 0x6b, 0x00, 0x69, 0x6e, 0x74, 0x6f, 0x00,
0x70, 0x6c, 0x61, 0x63, 0x65, 0x43, 0x00, 0x31, 0x74, 0x6f,
0x00, 0xd8, 0x00, 0x00, 0x7e, 0x00, 0x18, 0x6d, 0x22, 0x00,
0x20, 0x62, 0x79, 0x8d, 0x00, 0x00, 0x42, 0x00, 0xf4, 0x0f,
0x61, 0x00, 0x77, 0x68, 0x6f, 0x6c, 0x65, 0x00, 0x72, 0x6f,
0x77, 0x00, 0x61, 0x74, 0x00, 0x61, 0x00, 0x74, 0x69, 0x6d,
0x65, 0x2e, 0x00, 0x00, 0x00, 0x41, 0x73, 0x00, 0x69, 0x6e,
0xa7, 0x00, 0xc8, 0x2c, 0x00, 0x63, 0x6f, 0x6e, 0x74, 0x72,
0x6f, 0x6c, 0x00, 0x69, 0x73, 0xd0, 0x00, 0xf1, 0x0c, 0x75,
0x73, 0x65, 0x00, 0x6f, 0x72, 0x00, 0x63, 0x75, 0x72, 0x73,
0x6f, 0x72, 0x00, 0x6b, 0x65, 0x79, 0x73, 0x2e, 0x00, 0x53,
0x65, 0x65, 0x00, 0x73, 0x65, 0x63, 0x12, 0x01, 0x41, 0x36,
0x2e, 0x31, 0x2e, 0x40, 0x01, 0xb2, 0x65, 0x00, 0x61, 0x76,
0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x01, 0xa2,
0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73,
0xab, 0x00, 0xf0, 0x01, 0x73, 0x69, 0x6d, 0x69, 0x6c, 0x61,
0x72, 0x00, 0x6d, 0x65, 0x61, 0x6e, 0x69, 0x6e, 0x67, 0x73,
0xbc, 0x00, 0x50, 0x74, 0x68, 0x6f, 0x73, 0x65, 0x86, 0x00,
0x05, 0x56, 0x01, 0x04, 0x58, 0x00, 0x8a, 0x33, 0x2e, 0x32,
0x29, 0x00, 0x61, 0x6e, 0x64, 0x47, 0x01, 0x06, 0x76, 0x00,
0x20, 0x32, 0x29, 0x77, 0x00, 0x04, 0xd7, 0x01, 0x42, 0x00,
0x77, 0x61, 0x73, 0xc1, 0x00, 0x62, 0x69, 0x62, 0x75, 0x74,
0x65, 0x64, 0x5c, 0x00, 0x10, 0x69, 0x14, 0x00, 0x23, 0x6c,
0x6c, 0x34, 0x00, 0xf0, 0x05, 0x62, 0x79, 0x00, 0x52, 0x69,
0x63, 0x68, 0x61, 0x72, 0x64, 0x00, 0x42, 0x6f, 0x75, 0x6c,
0x74, 0x6f, 0x6e, 0x2e, 0x00,
0x65, 0x20, 0x00, 0x00, 0x00, 0x54, 0x68, 0x69, 0x73, 0x00,
0x67, 0x61, 0x6d, 0x65, 0x00, 0x63, 0x6f, 0x6d, 0x62, 0x69,
0x6e, 0x65, 0x73, 0x00, 0x74, 0x68, 0x65, 0x00, 0x67, 0x72,
0x69, 0x64, 0x00, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74,
0x69, 0x6f, 0x6e, 0x00, 0x6f, 0x66, 0x00, 0x4e, 0x65, 0x74,
0x00, 0x28, 0x73, 0x65, 0x65, 0x00, 0x63, 0x4a, 0x00, 0x81,
0x00, 0x33, 0x29, 0x00, 0x77, 0x69, 0x74, 0x68, 0x30, 0x00,
0x80, 0x6d, 0x6f, 0x76, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x29,
0x00, 0x7a, 0x53, 0x69, 0x78, 0x74, 0x65, 0x65, 0x6e, 0x2d,
0x00, 0xe1, 0x36, 0x29, 0x3a, 0x00, 0x79, 0x6f, 0x75, 0x00,
0x68, 0x61, 0x76, 0x65, 0x00, 0x61, 0x4d, 0x00, 0x00, 0x64,
0x00, 0xd0, 0x2c, 0x00, 0x62, 0x75, 0x74, 0x00, 0x69, 0x6e,
0x73, 0x74, 0x65, 0x61, 0x64, 0x3d, 0x00, 0xf6, 0x0f, 0x72,
0x6f, 0x74, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x00, 0x74, 0x69,
0x6c, 0x65, 0x73, 0x00, 0x62, 0x61, 0x63, 0x6b, 0x00, 0x69,
0x6e, 0x74, 0x6f, 0x00, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x43,
0x00, 0x31, 0x74, 0x6f, 0x00, 0xc4, 0x00, 0x00, 0x7e, 0x00,
0x18, 0x6d, 0x22, 0x00, 0x20, 0x62, 0x79, 0x8d, 0x00, 0x00,
0x42, 0x00, 0xf4, 0x0f, 0x61, 0x00, 0x77, 0x68, 0x6f, 0x6c,
0x65, 0x00, 0x72, 0x6f, 0x77, 0x00, 0x61, 0x74, 0x00, 0x61,
0x00, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x00, 0x00, 0x00, 0x41,
0x73, 0x00, 0x69, 0x6e, 0xa7, 0x00, 0xc8, 0x2c, 0x00, 0x63,
0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x00, 0x69, 0x73, 0xd0,
0x00, 0xf1, 0x0c, 0x75, 0x73, 0x65, 0x00, 0x6f, 0x72, 0x00,
0x63, 0x75, 0x72, 0x73, 0x6f, 0x72, 0x00, 0x6b, 0x65, 0x79,
0x73, 0x2e, 0x00, 0x53, 0x65, 0x65, 0x00, 0x73, 0x65, 0x63,
0x12, 0x01, 0x41, 0x36, 0x2e, 0x31, 0x2e, 0x40, 0x01, 0xb2,
0x65, 0x00, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c,
0x65, 0x49, 0x01, 0xa2, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65,
0x74, 0x65, 0x72, 0x73, 0xab, 0x00, 0xf0, 0x01, 0x73, 0x69,
0x6d, 0x69, 0x6c, 0x61, 0x72, 0x00, 0x6d, 0x65, 0x61, 0x6e,
0x69, 0x6e, 0x67, 0x73, 0xbc, 0x00, 0x50, 0x74, 0x68, 0x6f,
0x73, 0x65, 0x86, 0x00, 0x05, 0x56, 0x01, 0x04, 0x58, 0x00,
0x8a, 0x33, 0x2e, 0x32, 0x29, 0x00, 0x61, 0x6e, 0x64, 0x47,
0x01, 0x06, 0x76, 0x00, 0x20, 0x32, 0x29, 0x77, 0x00, 0x04,
0xc3, 0x01, 0x42, 0x00, 0x77, 0x61, 0x73, 0xc1, 0x00, 0x62,
0x69, 0x62, 0x75, 0x74, 0x65, 0x64, 0x5c, 0x00, 0x10, 0x69,
0x14, 0x00, 0x23, 0x6c, 0x6c, 0x34, 0x00, 0xf0, 0x05, 0x62,
0x79, 0x00, 0x52, 0x69, 0x63, 0x68, 0x61, 0x72, 0x64, 0x00,
0x42, 0x6f, 0x75, 0x6c, 0x74, 0x6f, 0x6e, 0x2e, 0x00,
};
const unsigned short help_text_len = 546;
const unsigned short help_text_words = 99;
const bool help_valid = true;
const unsigned short help_text_len = 526;
const unsigned short help_text_words = 98;
const bool help_text_valid = true;
const char quick_help_text[] = "Slide a row at a time to reassemble the network.";
const bool quick_help_valid = true;