ACCESS: Split mouse data per line

1 files changed, 217 insertions, 100 deletions

diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp
index 989dcf15f0..55302c0708 100644
--- a/engines/access/amazon/amazon_resources.cpp
+++ b/engines/access/amazon/amazon_resources.cpp
@@ -71,126 +71,243 @@ const char *const FILENAMES_DEMO[] = {
 	"R49.AP", "R49.AP", "R49.AP", "R49.AP", "DEAD.AP", "EST.AP",
 	"CHAPTER.AP", "MUSIC.AP", "SOUND.AP", "INV.AP"
 };
+
 const byte MOUSE0[] = {
+	// hotspot x and y, uint16 LE
 	0, 0, 0, 0,
-	0, 2, 6, 1, 0, 3, 6, 6, 1, 0, 3, 6, 6, 1,
-	0, 4, 6, 6, 6, 1, 0, 4, 6, 6, 6, 1, 0, 5, 6, 6, 6, 6,
-	1, 0, 5, 6, 6, 6, 6, 1, 0, 6, 6, 6, 6, 6, 6, 1, 0, 6,
-	6, 6, 6, 6, 6, 1, 0, 7, 6, 6, 6, 6, 6, 6, 1, 0, 6, 6,
-	6, 6, 6, 6, 1, 0, 5, 6, 6, 6, 6, 1, 2, 3, 6, 6, 1, 3,
-	3, 6, 6, 1, 3, 3, 6, 6, 1, 4, 2, 6, 1
+	// byte 1: number of skipped pixels
+	// byte 2: number of plotted pixels
+	// then, pixels
+	0, 2, 6, 1,
+	0, 3, 6, 6, 1, 
+	0, 3, 6, 6, 1, 
+	0, 4, 6, 6, 6, 1, 
+	0, 4, 6, 6, 6, 1, 
+	0, 5, 6, 6, 6, 6, 1, 
+	0, 5, 6, 6, 6, 6, 1, 
+	0, 6, 6, 6, 6, 6, 6, 1,
+	0, 6, 6, 6, 6, 6, 6, 1,
+	0, 7, 6, 6, 6, 6, 6, 6, 1,
+	0, 6, 6, 6, 6, 6, 6, 1,
+	0, 5, 6, 6, 6, 6, 1,
+	2, 3, 6, 6, 1,
+	3, 3, 6, 6, 1,
+	3, 3, 6, 6, 1,
+	4, 2, 6, 1
 };
+
 const byte MOUSE1[] = {
-	0x07, 0x00, 0x07, 0x00, 0x06, 0x01, 0x05, 0x04, 0x05, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0x03, 0x07,
-	0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x02, 0x09, 0xFF, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00,
-	0x00, 0xFF, 0x01, 0x0B, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x01,
-	0x0B, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x0D, 0x05, 0x00,
-	0x00, 0x05, 0x00, 0x05, 0x00, 0x05, 0x00, 0x05, 0x00, 0x00, 0x05, 0x01, 0x0B, 0xFF, 0x00, 0x00,
-	0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x01, 0x0B, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0xFF, 0x02, 0x09, 0xFF, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0xFF,
-	0x03, 0x07, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x04, 0x05, 0xFF, 0xFF, 0x00, 0xFF, 0xFF,
-	0x06, 0x01, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	// hotspot x and y, uint16 LE
+	0x07, 0x00, 0x07, 0x00,
+	// byte 1: number of skipped pixels
+	// byte 2: number of plotted pixels
+	// then, pixels
+	0x06, 0x01, 0x05,
+	0x04, 0x05, 0xFF, 0xFF, 0x00, 0xFF, 0xFF,
+	0x03, 0x07, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
+	0x02, 0x09, 0xFF, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0xFF,
+	0x01, 0x0B, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
+	0x01, 0x0B, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0xFF,
+	0x00, 0x0D, 0x05, 0x00, 0x00, 0x05, 0x00, 0x05, 0x00, 0x05, 0x00, 0x05, 0x00, 0x00, 0x05,
+	0x01, 0x0B, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0xFF,
+	0x01, 0x0B, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
+	0x02, 0x09, 0xFF, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0xFF,
+	0x03, 0x07, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
+	0x04, 0x05, 0xFF, 0xFF, 0x00, 0xFF, 0xFF,
+	0x06, 0x01, 0x05,
+	0x00, 0x00,
+	0x00, 0x00,
+	0x00, 0x00
 };
+
 const byte MOUSE2[] = {
-	0x08, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x02, 0x04, 0x05, 0x07, 0x02, 0x04, 0x05,
-	0x07, 0x02, 0x04, 0x05, 0x07, 0x02, 0x04, 0x05, 0x07, 0x02, 0x04, 0x05, 0x02, 0x0C, 0x04, 0x04,
-	0x04, 0x04, 0x04, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05, 0x07, 0x02, 0x04, 0x05, 0x07, 0x02,
-	0x04, 0x05, 0x07, 0x02, 0x04, 0x05, 0x07, 0x02, 0x04, 0x05, 0x07, 0x02, 0x04, 0x05, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00
+	// hotspot x and y, uint16 LE
+	0x08, 0x00, 0x08, 0x00,
+	// byte 1: number of skipped pixels
+	// byte 2: number of plotted pixels
+	// then, pixels
+	0x00, 0x00,
+	0x00, 0x00,
+	0x07, 0x02, 0x04, 0x05,
+	0x07, 0x02, 0x04, 0x05,
+	0x07, 0x02, 0x04, 0x05,
+	0x07, 0x02, 0x04, 0x05,
+	0x07, 0x02, 0x04, 0x05,
+	0x02, 0x0C, 0x04, 0x04, 0x04, 0x04, 0x04, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05,
+	0x07, 0x02, 0x04, 0x05,
+	0x07, 0x02, 0x04, 0x05,
+	0x07, 0x02, 0x04, 0x05,
+	0x07, 0x02, 0x04, 0x05,
+	0x07, 0x02, 0x04, 0x05,
+	0x00, 0x00,
+	0x00, 0x00,
+	0x00, 0x00
 };
+
 const byte MOUSE3[] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-	0x06, 0x00, 0x0C, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x06, 0x06, 0x05, 0x00,
-	0x0C, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x06, 0x05, 0x05, 0x00, 0x0C, 0x06,
-	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x00, 0x0C, 0x06, 0x06, 0x06,
-	0x06, 0x06, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x05,
-	0x00, 0x00, 0x06, 0x06, 0x06, 0x06, 0x05, 0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x00, 0x06,
-	0x06, 0x06, 0x06, 0x06, 0x05, 0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-	0x06, 0x06, 0x05, 0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-	0x05, 0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x00,
-	0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x00, 0x0C, 0x06,
-	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x01, 0x0B, 0x05, 0x05, 0x05,
-	0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	// hotspot x and y, uint16 LE
+	0x00, 0x00, 0x00, 0x00,
+	// byte 1: number of skipped pixels
+	// byte 2: number of plotted pixels
+	// then, pixels
+	0x00, 0x0B, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x00, 0x0C, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x06, 0x06, 0x05,
+	0x00, 0x0C, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x06, 0x05, 0x05,
+	0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05,
+	0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05,
+	0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x05, 0x00, 0x00, 0x06, 0x06, 0x06, 0x06, 0x05,
+	0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05,
+	0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05,
+	0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05,
+	0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05,
+	0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05,
+	0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05,
+	0x01, 0x0B, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
+	0x00, 0x00,
+	0x00, 0x00,
+	0x00, 0x00
 };
 const byte CURSEYE[] = {
-	0x01, 0x00, 0x08, 0x00, 0x04, 0x06, 0x0E, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x03, 0x09, 0x0E, 0x01,
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x0D, 0x0D, 0x02, 0x0B, 0x0E, 0x01, 0x33, 0x33, 0x01, 0x01, 0x33,
-	0x34, 0x01, 0x01, 0x0D, 0x01, 0x0D, 0x0E, 0x01, 0x04, 0x34, 0x01, 0x01, 0x01, 0x07, 0x33, 0x04,
-	0x04, 0x01, 0x0D, 0x00, 0x0F, 0x0E, 0x0E, 0x01, 0x07, 0x33, 0x33, 0x01, 0x01, 0x33, 0x34, 0x07,
-	0x07, 0x06, 0x01, 0x0E, 0x01, 0x0D, 0x0F, 0x0F, 0x06, 0x07, 0x34, 0x33, 0x33, 0x34, 0x07, 0x07,
-	0x06, 0x0F, 0x0E, 0x03, 0x09, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0E, 0x01, 0x01,
-	0x07, 0x00, 0x03, 0x07, 0x01, 0x07, 0x01, 0x01, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00
+	// hotspot x and y, uint16 LE
+	0x01, 0x00, 0x08, 0x00,
+	// byte 1: number of skipped pixels
+	// byte 2: number of plotted pixels
+	// then, pixels
+	0x04, 0x06, 0x0E, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D,
+	0x03, 0x09, 0x0E, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x0D, 0x0D,
+	0x02, 0x0B, 0x0E, 0x01, 0x33, 0x33, 0x01, 0x01, 0x33, 0x34, 0x01, 0x01, 0x0D,
+	0x01, 0x0D, 0x0E, 0x01, 0x04, 0x34, 0x01, 0x01, 0x01, 0x07, 0x33, 0x04, 0x04, 0x01, 0x0D,
+	0x00, 0x0F, 0x0E, 0x0E, 0x01, 0x07, 0x33, 0x33, 0x01, 0x01, 0x33, 0x34, 0x07, 0x07, 0x06, 0x01, 0x0E,
+	0x01, 0x0D, 0x0F, 0x0F, 0x06, 0x07, 0x34, 0x33, 0x33, 0x34, 0x07, 0x07, 0x06, 0x0F, 0x0E,
+	0x03, 0x09, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0E,
+	0x01, 0x01, 0x07,
+	0x00, 0x03, 0x07, 0x01, 0x07,
+	0x01, 0x01, 0x07,
+	0x00, 0x00,
+	0x00, 0x00,
+	0x00, 0x00,
+	0x00, 0x00,
+	0x00, 0x00,
+	0x00, 0x00
 };
+
 const byte CURSHAND[] = {
-	0x02, 0x00, 0x03, 0x00, 0x07, 0x02, 0x17, 0x0E, 0x05, 0x07, 0x0E, 0x12, 0x17, 0x0E, 0x13, 0x17,
-	0x0E, 0x02, 0x0C, 0x07, 0x00, 0x17, 0x0E, 0x11, 0x0F, 0x0E, 0x11, 0x17, 0x0E, 0x00, 0x17, 0x01,
-	0x0E, 0x07, 0x01, 0x07, 0x0F, 0x0E, 0x11, 0x17, 0x0E, 0x11, 0x0F, 0x0E, 0x12, 0x17, 0x0E, 0x02,
-	0x0D, 0x07, 0x00, 0x17, 0x0F, 0x12, 0x0F, 0x0F, 0x11, 0x17, 0x0E, 0x12, 0x0F, 0x0E, 0x04, 0x0B,
-	0x0F, 0x0E, 0x11, 0x17, 0x0E, 0x12, 0x0F, 0x0F, 0x11, 0x17, 0x0E, 0x04, 0x0B, 0x17, 0x0E, 0x12,
-	0x17, 0x0E, 0x12, 0x17, 0x0E, 0x11, 0x0F, 0x0E, 0x00, 0x0F, 0x0E, 0x0D, 0x12, 0x00, 0x17, 0x0F,
-	0x0F, 0x0F, 0x0F, 0x12, 0x0F, 0x0E, 0x12, 0x17, 0x0F, 0x00, 0x0F, 0x0F, 0x17, 0x0D, 0x11, 0x0F,
-	0x0E, 0x0D, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0E, 0x0D, 0x01, 0x0E, 0x0F, 0x17, 0x0F, 0x0E,
-	0x0F, 0x0D, 0x0D, 0x0D, 0x0D, 0x0E, 0x0F, 0x0F, 0x0E, 0x0D, 0x02, 0x0D, 0x0F, 0x17, 0x0F, 0x0E,
-	0x0D, 0x0D, 0x0F, 0x0F, 0x0E, 0x0F, 0x0E, 0x0E, 0x12, 0x03, 0x0C, 0x0F, 0x17, 0x0F, 0x0F, 0x0F,
-	0x0E, 0x0F, 0x0F, 0x0F, 0x0E, 0x0D, 0x12, 0x04, 0x0A, 0x0F, 0x17, 0x0F, 0x0F, 0x0F, 0x0E, 0x0F,
-	0x0F, 0x0E, 0x0D, 0x05, 0x09, 0x0F, 0x17, 0x0F, 0x0F, 0x0F, 0x0F, 0x0E, 0x0D, 0x12, 0x06, 0x08,
-	0x17, 0x0F, 0x0F, 0x0F, 0x0F, 0x0E, 0x0D, 0x12, 0x06, 0x07, 0x17, 0x0F, 0x0F, 0x0F, 0x3D, 0x0E,
-	0x0D
+	// hotspot x and y, uint16 LE
+	0x02, 0x00, 0x03, 0x00,
+	// byte 1: number of skipped pixels
+	// byte 2: number of plotted pixels
+	// then, pixels
+	0x07, 0x02, 0x17, 0x0E,
+	0x05, 0x07, 0x0E, 0x12, 0x17, 0x0E, 0x13, 0x17, 0x0E,
+	0x02, 0x0C, 0x07, 0x00, 0x17, 0x0E, 0x11, 0x0F, 0x0E, 0x11, 0x17, 0x0E, 0x00, 0x17,
+	0x01, 0x0E, 0x07, 0x01, 0x07, 0x0F, 0x0E, 0x11, 0x17, 0x0E, 0x11, 0x0F, 0x0E, 0x12, 0x17, 0x0E,
+	0x02, 0x0D, 0x07, 0x00, 0x17, 0x0F, 0x12, 0x0F, 0x0F, 0x11, 0x17, 0x0E, 0x12, 0x0F, 0x0E,
+	0x04, 0x0B, 0x0F, 0x0E, 0x11, 0x17, 0x0E, 0x12, 0x0F, 0x0F, 0x11, 0x17, 0x0E,
+	0x04, 0x0B, 0x17, 0x0E, 0x12, 0x17, 0x0E, 0x12, 0x17, 0x0E, 0x11, 0x0F, 0x0E,
+	0x00, 0x0F, 0x0E, 0x0D, 0x12, 0x00, 0x17, 0x0F, 0x0F, 0x0F, 0x0F, 0x12, 0x0F, 0x0E, 0x12, 0x17, 0x0F,
+	0x00, 0x0F, 0x0F, 0x17, 0x0D, 0x11, 0x0F, 0x0E, 0x0D, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0E, 0x0D,
+	0x01, 0x0E, 0x0F, 0x17, 0x0F, 0x0E, 0x0F, 0x0D, 0x0D, 0x0D, 0x0D, 0x0E, 0x0F, 0x0F, 0x0E, 0x0D,
+	0x02, 0x0D, 0x0F, 0x17, 0x0F, 0x0E, 0x0D, 0x0D, 0x0F, 0x0F, 0x0E, 0x0F, 0x0E, 0x0E, 0x12,
+	0x03, 0x0C, 0x0F, 0x17, 0x0F, 0x0F, 0x0F, 0x0E, 0x0F, 0x0F, 0x0F, 0x0E, 0x0D, 0x12,
+	0x04, 0x0A, 0x0F, 0x17, 0x0F, 0x0F, 0x0F, 0x0E, 0x0F, 0x0F, 0x0E, 0x0D,
+	0x05, 0x09, 0x0F, 0x17, 0x0F, 0x0F, 0x0F, 0x0F, 0x0E, 0x0D, 0x12,
+	0x06, 0x08, 0x17, 0x0F, 0x0F, 0x0F, 0x0F, 0x0E, 0x0D, 0x12,
+	0x06, 0x07, 0x17, 0x0F, 0x0F, 0x0F, 0x3D, 0x0E, 0x0D
 };
+
 const byte CURSGET[] = {
-	0x07, 0x00, 0x0E, 0x00, 0x0A, 0x05, 0x1C, 0x07, 0x0F, 0x0F, 0x0F, 0x08, 0x08, 0x1C, 0x07, 0x0F,
-	0x0F, 0x0F, 0x0F, 0x0F, 0x0C, 0x06, 0x0A, 0x1C, 0x07, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F,
-	0x0C, 0x05, 0x0A, 0x07, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C, 0x03, 0x0C, 0x07,
-	0x1C, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C, 0x02, 0x0D, 0x1C, 0x0F, 0x0E,
-	0x0E, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C, 0x01, 0x0E, 0x07, 0x0F, 0x0E, 0x0D,
-	0x0F, 0x0E, 0x0D, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C, 0x00, 0x0F, 0x1C, 0x0F, 0x0E, 0x0D,
-	0x0F, 0x0E, 0x0D, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C, 0x00, 0x0F, 0x1C, 0x0E, 0x0D,
-	0x0F, 0x0E, 0x0D, 0x0F, 0x0F, 0x0C, 0x0C, 0x0E, 0x0F, 0x0F, 0x0F, 0x0C, 0x00, 0x0E, 0x1C, 0x0D,
-	0x0F, 0x0E, 0x0D, 0x0F, 0x0F, 0x0C, 0x00, 0x00, 0x0E, 0x0F, 0x0F, 0x0C, 0x00, 0x0E, 0x1C, 0x0E,
-	0x0F, 0x0D, 0x0F, 0x0F, 0x0C, 0x00, 0x00, 0x0E, 0x1C, 0x0F, 0x0F, 0x0C, 0x00, 0x0D, 0x1C, 0x0D,
-	0x0F, 0x0D, 0x0F, 0x0C, 0x00, 0x00, 0x00, 0x0E, 0x1C, 0x0F, 0x0C, 0x01, 0x0B, 0x0E, 0x0F, 0x0E,
-	0x0F, 0x0C, 0x00, 0x00, 0x0E, 0x07, 0x0F, 0x0C, 0x02, 0x09, 0x0E, 0x0D, 0x0F, 0x0C, 0x00, 0x07,
-	0x0E, 0x0F, 0x0C, 0x03, 0x06, 0x0E, 0x0F, 0x0E, 0x07, 0x01, 0x07, 0x07, 0x01, 0x07
+	// hotspot x and y, uint16 LE
+	0x07, 0x00, 0x0E, 0x00,
+	// byte 1: number of skipped pixels
+	// byte 2: number of plotted pixels
+	// then, pixels
+	0x0A, 0x05, 0x1C, 0x07, 0x0F, 0x0F, 0x0F,
+	0x08, 0x08, 0x1C, 0x07, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C,
+	0x06, 0x0A, 0x1C, 0x07, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C,
+	0x05, 0x0A, 0x07, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C,
+	0x03, 0x0C, 0x07, 0x1C, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C,
+	0x02, 0x0D, 0x1C, 0x0F, 0x0E, 0x0E, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C,
+	0x01, 0x0E, 0x07, 0x0F, 0x0E, 0x0D, 0x0F, 0x0E, 0x0D, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C,
+	0x00, 0x0F, 0x1C, 0x0F, 0x0E, 0x0D, 0x0F, 0x0E, 0x0D, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C,
+	0x00, 0x0F, 0x1C, 0x0E, 0x0D, 0x0F, 0x0E, 0x0D, 0x0F, 0x0F, 0x0C, 0x0C, 0x0E, 0x0F, 0x0F, 0x0F, 0x0C,
+	0x00, 0x0E, 0x1C, 0x0D, 0x0F, 0x0E, 0x0D, 0x0F, 0x0F, 0x0C, 0x00, 0x00, 0x0E, 0x0F, 0x0F, 0x0C,
+	0x00, 0x0E, 0x1C, 0x0E, 0x0F, 0x0D, 0x0F, 0x0F, 0x0C, 0x00, 0x00, 0x0E, 0x1C, 0x0F, 0x0F, 0x0C,
+	0x00, 0x0D, 0x1C, 0x0D, 0x0F, 0x0D, 0x0F, 0x0C, 0x00, 0x00, 0x00, 0x0E, 0x1C, 0x0F, 0x0C,
+	0x01, 0x0B, 0x0E, 0x0F, 0x0E, 0x0F, 0x0C, 0x00, 0x00, 0x0E, 0x07, 0x0F, 0x0C,
+	0x02, 0x09, 0x0E, 0x0D, 0x0F, 0x0C, 0x00, 0x07, 0x0E, 0x0F, 0x0C,
+	0x03, 0x06, 0x0E, 0x0F, 0x0E, 0x07, 0x01, 0x07,
+	0x07, 0x01, 0x07
 };
+
 const byte CURSCLIMB[] = {
-	0x03, 0x00, 0x0E, 0x00, 0x06, 0x04, 0x01, 0x01, 0x01, 0x01, 0x06, 0x04, 0x0F, 0x0E, 0x01, 0x01,
-	0x06, 0x04, 0x0F, 0x0E, 0x0D, 0x01, 0x07, 0x02, 0x0F, 0x0D, 0x00, 0x0C, 0x0F, 0x00, 0x00, 0x00,
-	0x00, 0x13, 0x12, 0x12, 0x12, 0x12, 0x11, 0x11, 0x00, 0x0D, 0x0D, 0x0E, 0x00, 0x00, 0x13, 0x14,
-	0x13, 0x12, 0x12, 0x12, 0x11, 0x11, 0x0E, 0x01, 0x0C, 0x0D, 0x0D, 0x0D, 0x0E, 0x11, 0x13, 0x13,
-	0x12, 0x11, 0x11, 0x0E, 0x0D, 0x02, 0x0C, 0x0E, 0x0E, 0x00, 0x00, 0x00, 0x13, 0x12, 0x11, 0x00,
-	0x00, 0x0E, 0x0D, 0x03, 0x0B, 0x04, 0x04, 0x04, 0x22, 0x21, 0x21, 0x20, 0x00, 0x00, 0x00, 0x0D,
-	0x02, 0x0D, 0x22, 0x04, 0x20, 0x22, 0x04, 0x21, 0x04, 0x20, 0x00, 0x00, 0x00, 0x0E, 0x0E, 0x03,
-	0x07, 0x22, 0x21, 0x20, 0x20, 0x22, 0x04, 0x20, 0x04, 0x06, 0x01, 0x01, 0x00, 0x04, 0x22, 0x20,
-	0x02, 0x09, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x04, 0x20, 0x03, 0x09, 0x07, 0x01, 0x01,
-	0x00, 0x00, 0x00, 0x22, 0x04, 0x20, 0x02, 0x0B, 0x07, 0x01, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x01, 0x01, 0x20, 0x03, 0x0A, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01
+	// hotspot x and y, uint16 LE
+	0x03, 0x00, 0x0E, 0x00,
+	// byte 1: number of skipped pixels
+	// byte 2: number of plotted pixels
+	// then, pixels
+	0x06, 0x04, 0x01, 0x01, 0x01, 0x01,
+	0x06, 0x04, 0x0F, 0x0E, 0x01, 0x01,
+	0x06, 0x04, 0x0F, 0x0E, 0x0D, 0x01,
+	0x07, 0x02, 0x0F, 0x0D,
+	0x00, 0x0C, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x13, 0x12, 0x12, 0x12, 0x12, 0x11, 0x11,
+	0x00, 0x0D, 0x0D, 0x0E, 0x00, 0x00, 0x13, 0x14, 0x13, 0x12, 0x12, 0x12, 0x11, 0x11, 0x0E,
+	0x01, 0x0C, 0x0D, 0x0D, 0x0D, 0x0E, 0x11, 0x13, 0x13, 0x12, 0x11, 0x11, 0x0E, 0x0D,
+	0x02, 0x0C, 0x0E, 0x0E, 0x00, 0x00, 0x00, 0x13, 0x12, 0x11, 0x00, 0x00, 0x0E, 0x0D,
+	0x03, 0x0B, 0x04, 0x04, 0x04, 0x22, 0x21, 0x21, 0x20, 0x00, 0x00, 0x00, 0x0D,
+	0x02, 0x0D, 0x22, 0x04, 0x20, 0x22, 0x04, 0x21, 0x04, 0x20, 0x00, 0x00, 0x00, 0x0E, 0x0E,
+	0x03, 0x07, 0x22, 0x21, 0x20, 0x20, 0x22, 0x04, 0x20,
+	0x04, 0x06, 0x01, 0x01, 0x00, 0x04, 0x22, 0x20,
+	0x02, 0x09, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x04, 0x20,
+	0x03, 0x09, 0x07, 0x01, 0x01, 0x00, 0x00, 0x00, 0x22, 0x04, 0x20,
+	0x02, 0x0B, 0x07, 0x01, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x20,
+	0x03, 0x0A, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01
 };
+
 const byte CURSTALK[] = {
-	0x02, 0x00, 0x0B, 0x00, 0x03, 0x08, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x01, 0x0C,
-	0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x06, 0x06, 0x00, 0x0E, 0x06, 0x06,
-	0x06, 0x06, 0x07, 0x06, 0x07, 0x07, 0x06, 0x07, 0x07, 0x06, 0x07, 0x06, 0x00, 0x0F, 0x06, 0x08,
-	0x08, 0x08, 0x06, 0x08, 0x06, 0x06, 0x08, 0x06, 0x06, 0x08, 0x06, 0x08, 0x06, 0x00, 0x0F, 0x06,
-	0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x06, 0x08, 0x08, 0x06, 0x06, 0x00, 0x0F,
-	0x06, 0x06, 0x08, 0x06, 0x08, 0x08, 0x08, 0x06, 0x08, 0x06, 0x06, 0x08, 0x06, 0x08, 0x06, 0x01,
-	0x0E, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x02,
-	0x0C, 0x06, 0x06, 0x06, 0x07, 0x06, 0x07, 0x06, 0x06, 0x07, 0x06, 0x07, 0x06, 0x04, 0x09, 0x06,
-	0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 0x06, 0x06, 0x07, 0x04, 0x06, 0x07, 0x07, 0x06, 0x02, 0x08,
-	0x07, 0x00, 0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 0x01, 0x06, 0x07, 0x01, 0x07, 0x06, 0x06, 0x06,
-	0x02, 0x01, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	// hotspot x and y, uint16 LE
+	0x02, 0x00, 0x0B, 0x00,
+	// byte 1: number of skipped pixels
+	// byte 2: number of plotted pixels
+	// then, pixels
+	0x03, 0x08, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x01, 0x0C, 0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x06, 0x06,
+	0x00, 0x0E, 0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 0x07, 0x07, 0x06, 0x07, 0x07, 0x06, 0x07, 0x06,
+	0x00, 0x0F, 0x06, 0x08, 0x08, 0x08, 0x06, 0x08, 0x06, 0x06, 0x08, 0x06, 0x06, 0x08, 0x06, 0x08, 0x06,
+	0x00, 0x0F, 0x06, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x06, 0x08, 0x08, 0x06, 0x06,
+	0x00, 0x0F, 0x06, 0x06, 0x08, 0x06, 0x08, 0x08, 0x08, 0x06, 0x08, 0x06, 0x06, 0x08, 0x06, 0x08, 0x06,
+	0x01, 0x0E, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06,
+	0x02, 0x0C, 0x06, 0x06, 0x06, 0x07, 0x06, 0x07, 0x06, 0x06, 0x07, 0x06, 0x07, 0x06,
+	0x04, 0x09, 0x06, 0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 0x06, 0x06,
+	0x07, 0x04, 0x06, 0x07, 0x07, 0x06,
+	0x02, 0x08, 0x07, 0x00, 0x00, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x01, 0x06, 0x07, 0x01, 0x07, 0x06, 0x06, 0x06,
+	0x02, 0x01, 0x07,
+	0x00, 0x00,
+	0x00, 0x00,
+	0x00, 0x00
 };
 const byte CURSHELP[] = {
-	0x02, 0x00, 0x0B, 0x00, 0x04, 0x06, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x02, 0x0A, 0x24, 0x24,
-	0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x20, 0x20, 0x01, 0x0C, 0x24, 0x22, 0x22, 0x22, 0x20, 0x20,
-	0x20, 0x22, 0x22, 0x22, 0x22, 0x20, 0x00, 0x0E, 0x24, 0x22, 0x22, 0x22, 0x20, 0x00, 0x00, 0x00,
-	0x24, 0x22, 0x22, 0x22, 0x22, 0x20, 0x00, 0x0E, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20, 0x00, 0x00,
-	0x00, 0x24, 0x22, 0x22, 0x22, 0x20, 0x00, 0x0E, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20, 0x00, 0x00,
-	0x00, 0x24, 0x22, 0x22, 0x22, 0x20, 0x01, 0x0D, 0x24, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x24,
-	0x22, 0x22, 0x22, 0x22, 0x20, 0x07, 0x06, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20, 0x05, 0x07, 0x24,
-	0x22, 0x22, 0x22, 0x22, 0x20, 0x20, 0x04, 0x05, 0x24, 0x22, 0x22, 0x22, 0x20, 0x02, 0x07, 0x07,
-	0x00, 0x24, 0x20, 0x20, 0x20, 0x20, 0x01, 0x03, 0x07, 0x01, 0x07, 0x02, 0x07, 0x07, 0x00, 0x00,
-	0x24, 0x24, 0x24, 0x24, 0x04, 0x06, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20, 0x04, 0x06, 0x24, 0x22,
-	0x22, 0x22, 0x22, 0x20, 0x05, 0x04, 0x20, 0x20, 0x20, 0x20
+	// hotspot x and y, uint16 LE
+	0x02, 0x00, 0x0B, 0x00,
+	// byte 1: number of skipped pixels
+	// byte 2: number of plotted pixels
+	// then, pixels
+	0x04, 0x06, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24,
+	0x02, 0x0A, 0x24, 0x24, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x20, 0x20,
+	0x01, 0x0C, 0x24, 0x22, 0x22, 0x22, 0x20, 0x20, 0x20, 0x22, 0x22, 0x22, 0x22, 0x20,
+	0x00, 0x0E, 0x24, 0x22, 0x22, 0x22, 0x20, 0x00, 0x00, 0x00, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20,
+	0x00, 0x0E, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20, 0x00, 0x00, 0x00, 0x24, 0x22, 0x22, 0x22, 0x20,
+	0x00, 0x0E, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20, 0x00, 0x00, 0x00, 0x24, 0x22, 0x22, 0x22, 0x20,
+	0x01, 0x0D, 0x24, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20,
+	0x07, 0x06, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20,
+	0x05, 0x07, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20, 0x20,
+	0x04, 0x05, 0x24, 0x22, 0x22, 0x22, 0x20,
+	0x02, 0x07, 0x07, 0x00, 0x24, 0x20, 0x20, 0x20, 0x20,
+	0x01, 0x03, 0x07, 0x01, 0x07,
+	0x02, 0x07, 0x07, 0x00, 0x00, 0x24, 0x24, 0x24, 0x24,
+	0x04, 0x06, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20,
+	0x04, 0x06, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20,
+	0x05, 0x04, 0x20, 0x20, 0x20, 0x20
 };
 const byte *CURSORS[10] = {
 	MOUSE0, MOUSE1, MOUSE2, MOUSE3, CURSEYE, CURSHAND, CURSGET, CURSCLIMB, CURSTALK, CURSHELP