Updated with lastest changes

svn-id: r12738

1 files changed, 856 insertions, 573 deletions

diff --git a/backends/PalmOS/Src/builder/scumm/imuse_digi/bl_dimuse_tables.c b/backends/PalmOS/Src/builder/scumm/imuse_digi/bl_dimuse_tables.c
index 96d4e0509d..b7055e1c40 100644
--- a/backends/PalmOS/Src/builder/scumm/imuse_digi/bl_dimuse_tables.c
+++ b/backends/PalmOS/Src/builder/scumm/imuse_digi/bl_dimuse_tables.c
@@ -4,556 +4,576 @@
 ///////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////
 typedef Int16 int16;
+typedef Int8 int8;
+typedef unsigned char byte;
 
-typedef struct {
-	int room;
-	int table_index;
-	int unk1;
-	int unk2;
-	int unk3;
-	int unk4;
-} imuse_music_map;
+typedef struct  {
+	int8 roomId;
+	byte musicTableIndex;
+	byte unk1;
+	byte unk2;
+	byte unk3;
+	byte unk4;
+} imuseRoomMap;
 
 
-typedef struct  {
-	int room;
-	int id;
-	int unk1;
-	int unk2;
-	int unk3;
-	int unk4;
-	char name[30];
-	char title[30];
+typedef struct {
+	byte opcode;
+	int16 soundId;
+	char name[20];
+	byte param;
 	char filename[13];
-} imuse_music_table;
+} imuseDigTable;
+
+typedef struct {
+	byte opcode;
+	int16 soundId;
+	char name[20];
+	byte param;
+	byte hookId;
+	int16 fadeDelay;
+	char filename[13];
+} imuseComiTable;
+
+
+
+typedef struct {
+	char audioName[9];
+	byte opcode;
+	byte volume;
+	char name[21];
+} imuseFtStateTable;
+
+typedef struct {
+	char audioName[9];
+	byte opcode;
+	byte volume;
+} imuseFtSeqTable;
+
+typedef struct {
+	char name[20];
+} imuseFtNames;
 ///////////////////////////////////////////////////////////////////
 
 static void addDimuseTables_digStateMusicMap() {
-	imuse_music_map _digStateMusicMap[] = {
-	{0,		0,	0,	0,	0,	0	},
-	{1,		0,	0,	0,	0,	0	},
-	{2,		2,	0,	0,	0,	0	},
-	{4,		3,	0,	0,	0,	0	},
-	{5,		3,	0,	0,	0,	0	},
-	{6,		3,	0,	0,	0,	0	},
-	{7,		3,	0,	0,	0,	0	},
-	{8,		4,	0,	0,	0,	0	},
-	{9,		5,	0,	0,	0,	0	},
-	{10,	4,	0,	0,	0,	0	},
-	{12,	5,	0,	0,	0,	0	},
-	{14,	5,	0,	0,	0,	0	},
-	{15,	6,	29,	7,	0,	0	},
-	{16,	8,	0,	0,	0,	0	},
-	{17,	1,	0,	0,	0,	0	},
-	{18,	9,	0,	0,	0,	0	},
-	{19,	9,	0,	0,	0,	0	},
-	{20,	6,	0,	0,	0,	0	},
-	{21,	6,	0,	0,	0,	0	},
-	{22,	44,	0,	0,	0,	0	},
-	{23,	10,	7,	0,	0,	0	},
-	{24,	26,	0,	0,	0,	0	},
-	{25,	17,	0,	0,	0,	0	},
-	{26,	17,	0,	0,	0,	0	},
-	{27,	18,	0,	0,	0,	0	},
-	{28,	1,	0,	0,	0,	0	},
-	{29,	20,	0,	0,	0,	0	},
-	{30,	22,	0,	0,	0,	0	},
-	{31,	23,	0,	0,	0,	0	},
-	{32,	22,	0,	0,	0,	0	},
-	{33,	26,	0,	0,	0,	0	},
-	{34,	24,	0,	0,	0,	0	},
-	{35,	1,	0,	0,	0,	0	},
-	{36,	1,	0,	0,	0,	0	},
-	{37,	42,	0,	0,	0,	0	},
-	{38,	43,	0,	0,	0,	0	},
-	{39,	44,	0,	0,	0,	0	},
-	{40,	1,	0,	0,	0,	0	},
-	{41,	43,	0,	0,	0,	0	},
-	{42,	44,	0,	0,	0,	0	},
-	{43,	43,	0,	0,	0,	0	},
-	{44,	45,	117,45,	114,46},
-	{47,	1,	0,	0,	0,	0	},
-	{48,	43,	0,	0,	0,	0	},
-	{49,	44,	0,	0,	0,	0	},
-	{51,	1,	0,	0,	0,	0	},
-	{53,	28,	0,	0,	0,	0	},
-	{54,	28,	0,	0,	0,	0	},
-	{55,	29,	0,	0,	0,	0	},
-	{56,	29,	0,	0,	0,	0	},
-	{57,	29,	0,	0,	0,	0	},
-	{58,	31,	0,	0,	0,	0	},
-	{59,	1,	0,	0,	0,	0	},
-	{60,	37,	0,	0,	0,	0	},
-	{61,	39,	0,	0,	0,	0	},
-	{62,	38,	0,	0,	0,	0	},
-	{63,	39,	0,	0,	0,	0	},
-	{64,	39,	0,	0,	0,	0	},
-	{65,	40,	0,	0,	0,	0	},
-	{67,	40,	0,	0,	0,	0	},
-	{68,	39,	0,	0,	0,	0	},
-	{69,	1,	0,	0,	0,	0	},
-	{70,	49,	0,	0,	0,	0	},
-	{73,	50,	0,	0,	0,	0	},
-	{75,	51,	0,	0,	0,	0	},
-	{76,	1,	0,	0,	0,	0	},
-	{77,	52,	7,	0,	0,	0	},
-	{78,	63,	0,	0,	0,	0	},
-	{79,	1,	0,	0,	0,	0	},
-	{82,	21,	0,	0,	0,	0	},
-	{85,	1,	0,	0,	0,	0	},
-	{86,	0,	0,	0,	0,	0	},
-	{89,	33,	6,	35,	5,	34},
-	{90,	16,	0,	0,	0,	0	},
-	{91,	57,	0,	0,	0,	0	},
-	{88,	32,	0,	0,	0,	0	},
-	{92,	25,	0,	0,	0,	0	},
-	{93,	0,	0,	0,	0,	0	},
-	{95,	19,	0,	0,	0,	0	},
-	{80,	41,	0,	0,	0,	0	},
-	{81,	48,	0,	0,	0,	0	},
-	{83,	27,	0,	0,	0,	0	},
-	{94,	36,	0,	0,	0,	0	},
-	{40,	1,	0,	0,	0,	0	},
-	{96,	13,	0,	0,	0,	0	},
-	{97,	14,	0,	0,	0,	0	},
-	{98,	11,	0,	0,	0,	0	},
-	{99,	15,	0,	0,	0,	0	},
-	{100,	17,	0,	0,	0,	0	},
-	{101,	38,	0,	0,	0,	0	},
-	{103,	0,	0,	0,	0,	0	},
-	{104,	0,	0,	0,	0,	0	},
-	{11,	44,	0,	0,	0,	0	},
-	{3,		47,	0,	0,	0,	0	},
-	{105,	30, 128,29,	0,	0	},
-	{106,	0,	0,	0,	0,	0	},
-	{107,	1,	0,	0,	0,	0	},
-	{108,	1,	0,	0,	0,	0	},
-	{47,	1,	0,	0,	0,	0	},
-	{50,	1,	0,	0,	0,	0	},
-	{52,	0,	0,	0,	0,	0	},
-	{71,	1,	0,	0,	0,	0	},
-	{13,	1,	0,	0,	0,	0	},
-	{72,	1,	0,	0,	0,	0	},
-	{46,	33,	6,	35,	5,	34},
-	{74,	1,	0,	0,	0,	0	},
-	{84,	1,	0,	0,	0,	0	},
-	{66,	1,	0,	0,	0,	0	},
-	{102,	1,	0,	0,	0,	0	},
-	{109,	1,	0,	0,	0,	0	},
-	{110,	2,	0,	0,	0,	0	},
-	{45,	1,	0,	0,	0,	0	},
-	{87,	1,	0,	0,	0,	0	},
-	{111,	1,	0,	0,	0,	0	},
-	{-1,	1,	0,	0,	0,	0	}
+	imuseRoomMap _digStateMusicMap[] = {
+	{0,   0,  0,  0,  0,  0 },
+	{1,   0,  0,  0,  0,  0 },
+	{2,   2,  0,  0,  0,  0 },
+	{4,   3,  0,  0,  0,  0 },
+	{5,   3,  0,  0,  0,  0 },
+	{6,   3,  0,  0,  0,  0 },
+	{7,   3,  0,  0,  0,  0 },
+	{8,   4,  0,  0,  0,  0 },
+	{9,   5,  0,  0,  0,  0 },
+	{10,  4,  0,  0,  0,  0 },
+	{12,  5,  0,  0,  0,  0 },
+	{14,  5,  0,  0,  0,  0 },
+	{15,  6,  29, 7,  0,  0 },
+	{16,  8,  0,  0,  0,  0 },
+	{17,  1,  0,  0,  0,  0 },
+	{18,  9,  0,  0,  0,  0 },
+	{19,  9,  0,  0,  0,  0 },
+	{20,  6,  0,  0,  0,  0 },
+	{21,  6,  0,  0,  0,  0 },
+	{22,  44, 0,  0,  0,  0 },
+	{23,  10, 7,  0,  0,  0 },
+	{24,  26, 0,  0,  0,  0 },
+	{25,  17, 0,  0,  0,  0 },
+	{26,  17, 0,  0,  0,  0 },
+	{27,  18, 0,  0,  0,  0 },
+	{28,  1,  0,  0,  0,  0 },
+	{29,  20, 0,  0,  0,  0 },
+	{30,  22, 0,  0,  0,  0 },
+	{31,  23, 0,  0,  0,  0 },
+	{32,  22, 0,  0,  0,  0 },
+	{33,  26, 0,  0,  0,  0 },
+	{34,  24, 0,  0,  0,  0 },
+	{35,  1,  0,  0,  0,  0 },
+	{36,  1,  0,  0,  0,  0 },
+	{37,  42, 0,  0,  0,  0 },
+	{38,  43, 0,  0,  0,  0 },
+	{39,  44, 0,  0,  0,  0 },
+	{40,  1,  0,  0,  0,  0 },
+	{41,  43, 0,  0,  0,  0 },
+	{42,  44, 0,  0,  0,  0 },
+	{43,  43, 0,  0,  0,  0 },
+	{44,  45, 117,45, 114,46},
+	{47,  1,  0,  0,  0,  0 },
+	{48,  43, 0,  0,  0,  0 },
+	{49,  44, 0,  0,  0,  0 },
+	{51,  1,  0,  0,  0,  0 },
+	{53,  28, 0,  0,  0,  0 },
+	{54,  28, 0,  0,  0,  0 },
+	{55,  29, 0,  0,  0,  0 },
+	{56,  29, 0,  0,  0,  0 },
+	{57,  29, 0,  0,  0,  0 },
+	{58,  31, 0,  0,  0,  0 },
+	{59,  1,  0,  0,  0,  0 },
+	{60,  37, 0,  0,  0,  0 },
+	{61,  39, 0,  0,  0,  0 },
+	{62,  38, 0,  0,  0,  0 },
+	{63,  39, 0,  0,  0,  0 },
+	{64,  39, 0,  0,  0,  0 },
+	{65,  40, 0,  0,  0,  0 },
+	{67,  40, 0,  0,  0,  0 },
+	{68,  39, 0,  0,  0,  0 },
+	{69,  1,  0,  0,  0,  0 },
+	{70,  49, 0,  0,  0,  0 },
+	{73,  50, 0,  0,  0,  0 },
+	{75,  51, 0,  0,  0,  0 },
+	{76,  1,  0,  0,  0,  0 },
+	{77,  52, 7,  0,  0,  0 },
+	{78,  63, 0,  0,  0,  0 },
+	{79,  1,  0,  0,  0,  0 },
+	{82,  21, 0,  0,  0,  0 },
+	{85,  1,  0,  0,  0,  0 },
+	{86,  0,  0,  0,  0,  0 },
+	{89,  33, 6,  35, 5,  34},
+	{90,  16, 0,  0,  0,  0 },
+	{91,  57, 0,  0,  0,  0 },
+	{88,  32, 0,  0,  0,  0 },
+	{92,  25, 0,  0,  0,  0 },
+	{93,  0,  0,  0,  0,  0 },
+	{95,  19, 0,  0,  0,  0 },
+	{80,  41, 0,  0,  0,  0 },
+	{81,  48, 0,  0,  0,  0 },
+	{83,  27, 0,  0,  0,  0 },
+	{94,  36, 0,  0,  0,  0 },
+	{40,  1,  0,  0,  0,  0 },
+	{96,  13, 0,  0,  0,  0 },
+	{97,  14, 0,  0,  0,  0 },
+	{98,  11, 0,  0,  0,  0 },
+	{99,  15, 0,  0,  0,  0 },
+	{100, 17, 0,  0,  0,  0 },
+	{101, 38, 0,  0,  0,  0 },
+	{103, 0,  0,  0,  0,  0 },
+	{104, 0,  0,  0,  0,  0 },
+	{11,  44, 0,  0,  0,  0 },
+	{3,   47, 0,  0,  0,  0 },
+	{105, 30, 128,29, 0,  0 },
+	{106, 0,  0,  0,  0,  0 },
+	{107, 1,  0,  0,  0,  0 },
+	{108, 1,  0,  0,  0,  0 },
+	{47,  1,  0,  0,  0,  0 },
+	{50,  1,  0,  0,  0,  0 },
+	{52,  0,  0,  0,  0,  0 },
+	{71,  1,  0,  0,  0,  0 },
+	{13,  1,  0,  0,  0,  0 },
+	{72,  1,  0,  0,  0,  0 },
+	{46,  33, 6,  35, 5,  34},
+	{74,  1,  0,  0,  0,  0 },
+	{84,  1,  0,  0,  0,  0 },
+	{66,  1,  0,  0,  0,  0 },
+	{102, 1,  0,  0,  0,  0 },
+	{109, 1,  0,  0,  0,  0 },
+	{110, 2,  0,  0,  0,  0 },
+	{45,  1,  0,  0,  0,  0 },
+	{87,  1,  0,  0,  0,  0 },
+	{111, 1,  0,  0,  0,  0 },
+	{-1,  1,  0,  0,  0,  0 }
 };
 	writeRecord(_digStateMusicMap, sizeof(_digStateMusicMap), GBVARS_DIGSTATEMUSICMAP_INDEX , GBVARS_SCUMM);
 }
 ///////////////////////////////////////////////////////////////////
 static void addDimuseTables_digStateMusicTable() {
-	imuse_music_table _digStateMusicTable[] = {
-	{0,		1000,	0, 0, 0, 0, "STATE_NULL",						"",										  ""},
-	{1,		1001,	0, 0, 0, 0, "stateNoChange",				"",											""},
-	{2,		1100,	0, 3, 2, 0, "stateAstShip",					"Asteroid (amb-ship)",	"ASTERO~1.IMU"},
-	{3,		1120,	0, 3, 2, 0, "stateAstClose",				"Asteroid (amb-close)",	"ASTERO~2.IMU"},
-	{4,		1140,	0, 3, 0, 0, "stateAstInside",				"Asteroid (inside)",		"ASTERO~3.IMU"},
-	{5,		1150,	0, 3, 0, 0, "stateAstCore",					"Asteroid (core)",			"ASTERO~4.IMU"},
-	{6,		1200,	0, 3, 0, 0, "stateCanyonClose",			"Canyon (close)",				"CANYON~1.IMU"},
-	{7,		1205,	0, 3, 0, 0, "stateCanyonClose_m",		"Canyon (close-m)",			"CANYON~2.IMU"},
-	{8,		1210,	0, 3, 0, 0, "stateCanyonOver",			"Canyon (over)",				"CANYON~3.IMU"},
-	{9,		1220,	0, 3, 0, 0, "stateCanyonWreck",			"Canyon (wreck)",				"CANYON~4.IMU"},
-	{10,	1300,	0, 3,10, 0, "stateNexusCanyon",			"Nexus (plan)",					"NEXUS(~1.IMU"},
-	{11,	1310,	0, 3,10, 0, "stateNexusPlan",				"Nexus (plan)",					"NEXUS(~1.IMU"},
-	{12,	1320,	0, 3,10, 0, "stateNexusRamp",				"Nexus (ramp)",					"NEXUS(~2.IMU"},
-	{13,	1330,	0, 3,10, 0, "stateNexusMuseum",			"Nexus (museum)",				"NEXUS(~3.IMU"},
-	{14,	1340,	0, 3,10, 0, "stateNexusMap",				"Nexus (map)",					"NEXUS(~4.IMU"},
-	{15,	1350,	0, 3,10, 0, "stateNexusTomb",				"Nexus (tomb)",					"NE3706~5.IMU"},
-	{16,	1360,	0, 3,10, 0, "stateNexusCath",				"Nexus (cath)",					"NE3305~5.IMU"},
-	{17,	1370,	0, 3, 0, 0, "stateNexusAirlock",		"Nexus (airlock)",			"NE2D3A~5.IMU"},
-	{18,	1380,	0, 3, 0, 0, "stateNexusPowerOff",		"Nexus (power)",				"NE8522~5.IMU"},
-	{19,	1400,	0, 3, 0, 0, "stateMuseumTramNear",	"Tram (mu-near)",				"TRAM(M~1.IMU"},
-	{20,	1410,	0, 3, 0, 0, "stateMuseumTramFar",		"Tram (mu-far)",				"TRAM(M~2.IMU"},
-	{21,	1420,	0, 3, 0, 0, "stateMuseumLockup",		"Museum (lockup)",			"MUSEUM~1.IMU"},
-	{22,	1433,	0, 3,22, 0, "stateMuseumPool",			"Museum (amb-pool)",		"MUSEUM~2.IMU"},
-	{23,	1436,	0, 3,22, 0, "stateMuseumSpire",			"Museum (amb-spire)",		"MUSEUM~3.IMU"},
-	{24,	1440,	0, 3,22, 0, "stateMuseumMuseum",		"Museum (amb-mu)",			"MUSEUM~4.IMU"},
-	{25,	1450,	0, 3, 0, 0, "stateMuseumLibrary",		"Museum (library)",			"MUB575~5.IMU"},
-	{26,	1460,	0, 3, 0, 0, "stateMuseumCavern",		"Museum (cavern)",			"MUF9BE~5.IMU"},
-	{27,	1500,	0, 3, 0, 0, "stateTombTramNear",		"Tram (tomb-near)",			"TRAM(T~1.IMU"},
-	{28,	1510,	0, 3,28, 0, "stateTombBase",				"Tomb (amb-base)",			"TOMB(A~1.IMU"},
-	{29,	1520,	0, 3,28, 0, "stateTombSpire",				"Tomb (amb-spire)",			"TOMB(A~2.IMU"},
-	{30,	1530,	0, 3,28, 0, "stateTombCave",				"Tomb (amb-cave)",			"TOMB(A~3.IMU"},
-	{31,	1540,	0, 3,31, 0, "stateTombCrypt",				"Tomb (crypt)",					"TOMB(C~1.IMU"},
-	{32,	1550,	0, 3,31, 0, "stateTombGuards",			"Tomb (crypt-guards)",	"TOMB(C~2.IMU"},
-	{33,	1560,	0, 3, 0, 0, "stateTombInner",				"Tomb (inner)",					"TOMB(I~1.IMU"},
-	{34,	1570,	0, 3, 0, 0, "stateTombCreator1",		"Tomb (creator 1)",			"TOMB(C~3.IMU"},
-	{35,	1580,	0, 3, 0, 0, "stateTombCreator2",		"Tomb (creator 2)",			"TOMB(C~4.IMU"},
-	{36,	1600,	0, 3, 0, 0, "statePlanTramNear",		"Tram (plan-near)",			"TRAM(P~1.IMU"},
-	{37,	1610,	0, 3, 0, 0, "statePlanTramFar",			"Tram (plan-far)",			"TRAM(P~2.IMU"},
-	{38,	1620,	0, 3,38, 0, "statePlanBase",				"Plan (amb-base)",			"PLAN(A~1.IMU"},
-	{39,	1630,	0, 3,38, 0, "statePlanSpire",				"Plan (amb-spire)",			"PLAN(A~2.IMU"},
-	{40,	1650,	0, 3, 0, 0, "statePlanDome",				"Plan (dome)",					"PLAN(D~1.IMU"},
-	{41,	1700,	0, 3, 0, 0, "stateMapTramNear",			"Tram (map-near)",			"TRAM(M~3.IMU"},
-	{42,	1710,	0, 3, 0, 0, "stateMapTramFar",			"Tram (map-far)",				"TRAM(M~4.IMU"},
-	{43,	1720,	0, 3,43, 0, "stateMapCanyon",				"Map (amb-canyon)",			"MAP(AM~1.IMU"},
-	{44,	1730,	0, 3,43, 0, "stateMapExposed",			"Map (amb-exposed)",		"MAP(AM~2.IMU"},
-	{45,	1750,	0, 3,43, 0, "stateMapNestEmpty",		"Map (amb-nest)",				"MAP(AM~4.IMU"},
-	{46,	1760,	0, 3, 0, 0, "stateMapNestMonster",	"Map (monster)",				"MAP(MO~1.IMU"},
-	{47,	1770,	0, 3, 0, 0, "stateMapKlein",				"Map (klein)",					"MAP(KL~1.IMU"},
-	{48,	1800,	0, 3, 0, 0, "stateCathTramNear",		"Tram (cath-near)",			"TRAM(C~1.IMU"},
-	{49,	1810,	0, 3, 0, 0, "stateCathTramFar",			"Tram (cath-far)",			"TRAM(C~2.IMU"},
-	{50,	1820,	0, 3,50, 0, "stateCathLab",					"Cath (amb-inside)",		"CATH(A~1.IMU"},
-	{51,	1830,	0, 3,50, 0, "stateCathOutside",			"Cath (amb-outside)",		"CATH(A~2.IMU"},
-	{52,	1900,	0, 3,52, 0, "stateWorldMuseum",			"World (museum)",				"WORLD(~1.IMU"},
-	{53,	1901,	0, 3,52, 0, "stateWorldPlan",				"World (plan)",					"WORLD(~2.IMU"},
-	{54,	1902,	0, 3,52, 0, "stateWorldTomb",				"World (tomb)",					"WORLD(~3.IMU"},
-	{55,	1903,	0, 3,52, 0, "stateWorldMap",				"World (map)",					"WORLD(~4.IMU"},
-	{56,	1904,	0, 3,52, 0, "stateWorldCath",				"World (cath)",					"WO3227~5.IMU"},
-	{57,	1910,	0, 3, 0, 0, "stateEye1",						"Eye 1",								"EYE1~1.IMU"},
-	{58,	1911,	0, 3, 0, 0, "stateEye2",						"Eye 2",								"EYE2~1.IMU"},
-	{59,	1912,	0, 3, 0, 0, "stateEye3",						"Eye 3",								"EYE3~1.IMU"},
-	{60,	1913,	0, 3, 0, 0, "stateEye4",						"Eye 4",								"EYE4~1.IMU"},
-	{61,	1914,	0, 3, 0, 0, "stateEye5",						"Eye 5",								"EYE5~1.IMU"},
-	{62,	1915,	0, 3, 0, 0, "stateEye6",						"Eye 6",								"EYE6~1.IMU"},
-	{63,	1916,	0, 3, 0, 0, "stateEye7",						"Eye 7",								"EYE7~1.IMU"},
-	{-1,	-1,		0, 0, 0, 0, "",											"",											""}
+	imuseDigTable _digStateMusicTable[] = {
+	{0, 1000, "STATE_NULL",          0, ""},
+	{0, 1001, "stateNoChange",       0, ""},
+	{3, 1100, "stateAstShip",        2, "ASTERO~1.IMU"},
+	{3, 1120, "stateAstClose",       2, "ASTERO~2.IMU"},
+	{3, 1140, "stateAstInside",      0, "ASTERO~3.IMU"},
+	{3, 1150, "stateAstCore",        0, "ASTERO~4.IMU"},
+	{3, 1200, "stateCanyonClose",    0, "CANYON~1.IMU"},
+	{3, 1205, "stateCanyonClose_m",  0, "CANYON~2.IMU"},
+	{3, 1210, "stateCanyonOver",     0, "CANYON~3.IMU"},
+	{3, 1220, "stateCanyonWreck",    0, "CANYON~4.IMU"},
+	{3, 1300, "stateNexusCanyon",   10, "NEXUS(~1.IMU"},
+	{3, 1310, "stateNexusPlan",     10, "NEXUS(~1.IMU"},
+	{3, 1320, "stateNexusRamp",     10, "NEXUS(~2.IMU"},
+	{3, 1330, "stateNexusMuseum",   10, "NEXUS(~3.IMU"},
+	{3, 1340, "stateNexusMap",      10, "NEXUS(~4.IMU"},
+	{3, 1350, "stateNexusTomb",     10, "NE3706~5.IMU"},
+	{3, 1360, "stateNexusCath",     10, "NE3305~5.IMU"},
+	{3, 1370, "stateNexusAirlock",   0, "NE2D3A~5.IMU"},
+	{3, 1380, "stateNexusPowerOff",  0, "NE8522~5.IMU"},
+	{3, 1400, "stateMuseumTramNear", 0, "TRAM(M~1.IMU"},
+	{3, 1410, "stateMuseumTramFar",  0, "TRAM(M~2.IMU"},
+	{3, 1420, "stateMuseumLockup",   0, "MUSEUM~1.IMU"},
+	{3, 1433, "stateMuseumPool",    22, "MUSEUM~2.IMU"},
+	{3, 1436, "stateMuseumSpire",   22, "MUSEUM~3.IMU"},
+	{3, 1440, "stateMuseumMuseum",  22, "MUSEUM~4.IMU"},
+	{3, 1450, "stateMuseumLibrary",  0, "MUB575~5.IMU"},
+	{3, 1460, "stateMuseumCavern",   0, "MUF9BE~5.IMU"},
+	{3, 1500, "stateTombTramNear",   0, "TRAM(T~1.IMU"},
+	{3, 1510, "stateTombBase",      28, "TOMB(A~1.IMU"},
+	{3, 1520, "stateTombSpire",     28, "TOMB(A~2.IMU"},
+	{3, 1530, "stateTombCave",      28, "TOMB(A~3.IMU"},
+	{3, 1540, "stateTombCrypt",     31, "TOMB(C~1.IMU"},
+	{3, 1550, "stateTombGuards",    31, "TOMB(C~2.IMU"},
+	{3, 1560, "stateTombInner",      0, "TOMB(I~1.IMU"},
+	{3, 1570, "stateTombCreator1",   0, "TOMB(C~3.IMU"},
+	{3, 1580, "stateTombCreator2",   0, "TOMB(C~4.IMU"},
+	{3, 1600, "statePlanTramNear",   0, "TRAM(P~1.IMU"},
+	{3, 1610, "statePlanTramFar",    0, "TRAM(P~2.IMU"},
+	{3, 1620, "statePlanBase",      38, "PLAN(A~1.IMU"},
+	{3, 1630, "statePlanSpire",     38, "PLAN(A~2.IMU"},
+	{3, 1650, "statePlanDome",       0, "PLAN(D~1.IMU"},
+	{3, 1700, "stateMapTramNear",    0, "TRAM(M~3.IMU"},
+	{3, 1710, "stateMapTramFar",     0, "TRAM(M~4.IMU"},
+	{3, 1720, "stateMapCanyon",     43, "MAP(AM~1.IMU"},
+	{3, 1730, "stateMapExposed",    43, "MAP(AM~2.IMU"},
+	{3, 1750, "stateMapNestEmpty",  43, "MAP(AM~4.IMU"},
+	{3, 1760, "stateMapNestMonster", 0, "MAP(MO~1.IMU"},
+	{3, 1770, "stateMapKlein",       0, "MAP(KL~1.IMU"},
+	{3, 1800, "stateCathTramNear",   0, "TRAM(C~1.IMU"},
+	{3, 1810, "stateCathTramFar",    0, "TRAM(C~2.IMU"},
+	{3, 1820, "stateCathLab",       50, "CATH(A~1.IMU"},
+	{3, 1830, "stateCathOutside",   50, "CATH(A~2.IMU"},
+	{3, 1900, "stateWorldMuseum",   52, "WORLD(~1.IMU"},
+	{3, 1901, "stateWorldPlan",     52, "WORLD(~2.IMU"},
+	{3, 1902, "stateWorldTomb",     52, "WORLD(~3.IMU"},
+	{3, 1903, "stateWorldMap",      52, "WORLD(~4.IMU"},
+	{3, 1904, "stateWorldCath",     52, "WO3227~5.IMU"},
+	{3, 1910, "stateEye1",           0, "EYE1~1.IMU"},
+	{3, 1911, "stateEye2",           0, "EYE2~1.IMU"},
+	{3, 1912, "stateEye3",           0, "EYE3~1.IMU"},
+	{3, 1913, "stateEye4",           0, "EYE4~1.IMU"},
+	{3, 1914, "stateEye5",           0, "EYE5~1.IMU"},
+	{3, 1915, "stateEye6",           0, "EYE6~1.IMU"},
+	{3, 1916, "stateEye7",           0, "EYE7~1.IMU"},
+	{0,   -1,  "",                   0, ""}
 };
+
 	writeRecord(_digStateMusicTable, sizeof(_digStateMusicTable), GBVARS_DIGSTATEMUSICTABLE_INDEX , GBVARS_SCUMM);
 }
 ///////////////////////////////////////////////////////////////////
 static void addDimuseTables_comiStateMusicTable() {
-	imuse_music_table _comiStateMusicTable[] = {
-	{0,	1000,	0, 0, 0, 0,  "STATE_NULL",				 "",											""},
-	{0,	1001,	0, 0, 0, 0,  "stateNoChange",			 "",											""},
-	{0,	1098,	0, 3, 0, 0,  "stateCredits1",			 "1098-Credits1",					"1098-C~1.IMX"},
-	{0,	1099,	0, 3, 0, 0,  "stateMenu",					 "1099-Menu",							"1099-M~1.IMX"},
-	{0,	1100,	0, 3, 0, 0,  "stateHold1",				 "1100-Hold1",						"1100-H~1.IMX"},
-	{0,	1101,	0, 3, 1, 0,  "stateWaterline1",		 "1101-Waterline1",				"1101-W~1.IMX"},
-	{0, 1102,	0, 3, 0, 0,  "stateHold2",				 "1102-Hold2",						"1102-H~1.IMX"},
-	{0, 1103,	0, 3, 0, 0,  "stateWaterline2",		 "1103-Waterline2",				"1103-W~1.IMX"},
-	{0, 1104,	0, 3, 0, 0,  "stateCannon",				 "1104-Cannon",						"1104-C~1.IMX"},
-	{0, 1105,	0, 3, 0, 0,  "stateTreasure",			 "1105-Treasure",					"1105-T~1.IMX"},
-	{0, 1200,	0, 3, 1, 0,  "stateFortBase",			 "1200-Fort Base",				"1200-F~1.IMX"},
-	{0, 1201,	0, 3, 1, 0,  "statePreFort",			 "1201-Pre-Fort",					"1201-P~1.IMX"},
-	{0, 1202,	0, 3, 0, 0,  "statePreVooOut",		 "1202-PreVoo Out",				"1202-P~1.IMX"},
-	{0, 1203,	0, 3, 0, 0,  "statePreVooIn",			 "1203-PreVoo In",				"1203-P~1.IMX"},
-	{0, 1204,	0, 3, 0, 0,  "statePreVooLad",		 "1204-PreVoo Lady",			"1204-P~1.IMX"},
-	{0, 1205,	0, 3, 0, 0,  "stateVoodooOut",		 "1205-Voodoo Out",				"1205-V~1.IMX"},
-	{0, 1210,	0, 3, 0, 0,  "stateVoodooIn",			 "1210-Voodoo In",				"1210-V~1.IMX"},
-	{0, 1212,	0,12, 1, 0,  "stateVoodooInAlt",	 "1210-Voodoo In",				"1210-V~1.IMX"},
-	{0, 1215,	0, 3, 0, 0,  "stateVoodooLady",		 "1215-Voodoo Lady",			"1215-V~1.IMX"},
-	{0, 1219,	0, 3, 0, 0,  "statePrePlundermap", "1219-Pre-Map",					"1219-P~1.IMX"},
-	{0, 1220,	0, 3, 0, 0,  "statePlundermap",		 "1220-Plunder Map",			"1220-P~1.IMX"},
-	{0, 1222,	0, 3, 0, 0,  "statePreCabana",		 "1222-Pre-Cabana",				"1222-P~1.IMX"},
-	{0, 1223,	0, 3, 0, 0,  "stateCabana",				 "1223-Cabana",						"1223-C~1.IMX"},
-	{0, 1224,	0, 3, 0, 0,  "statePostCabana",		 "1224-Post-Cabana",			"1224-P~1.IMX"},
-	{0, 1225,	0, 3, 0, 0,  "stateBeachClub",		 "1225-Beach Club",				"1225-B~1.IMX"},
-	{0, 1230,	0, 3, 0, 0,  "stateCliff",				 "1230-Cliff",						"1230-C~1.IMX"},
-	{0, 1232,	0, 3, 0,800, "stateBelly",				 "1232-Belly",						"1232-B~1.IMX"},
-	{0, 1235,	0, 3, 0, 0,  "stateQuicksand",		 "1235-Quicksand",				"1235-Q~1.IMX"},
-	{0, 1240,	0, 3, 0,800, "stateDangerBeach",   "1240-Danger Beach",			"1240-D~1.IMX"},
-	{0, 1241,	0,12, 2,800, "stateDangerBeachAlt","1240-Danger Beach",			"1240-D~1.IMX"},
-	{0, 1245,	0, 3, 0, 0,  "stateRowBoat",			 "1245-Row Boat",					"1245-R~1.IMX"},
-	{0, 1247,	0, 3, 0,800, "stateAlongside",		 "1247-Alongside",				"1247-A~1.IMX"},
-	{0, 1248,	0,12, 1,800, "stateAlongsideAlt",	 "1247-Alongside",				"1247-A~1.IMX"},
-	{0, 1250,	0, 3, 0,500, "stateChimpBoat",		 "1250-Chimp Boat",				"1250-C~1.IMX"},
-	{0, 1255,	0, 3, 0,800, "stateMrFossey",			 "1255-Mr Fossey",				"1255-M~1.IMX"},
-	{0, 1259,	0, 3, 0, 0,  "statePreTown",			 "1259-Pre-Town",					"1259-P~1.IMX"},
-	{0, 1260,	0, 3, 0, 0,  "stateTown",					 "1260-Town",							"1260-T~1.IMX"},
-	{0, 1264,	0, 3, 0, 0,  "statePreMeadow",		 "1264-Pre-Meadow",				"1264-P~1.IMX"},
-	{0, 1265,	0, 3, 0, 0,  "stateMeadow",				 "1265-Meadow",						"1265-M~1.IMX"},
-	{0, 1266,	0, 3, 0, 0,  "stateMeadowAmb",		 "1266-Meadow Amb",				"1266-M~1.IMX"},
-	{0, 1270,	0, 3, 0, 0,  "stateWardrobePre",	 "1270-Wardrobe-Pre",			"1270-W~1.IMX"},
-	{0, 1272,	0, 3, 0, 0,  "statePreShow",			 "1272-Pre-Show",					"1272-P~1.IMX"},
-	{0, 1274,	0, 3, 0, 0,  "stateWardrobeShow",	 "1274-Wardrobe-Show",		"1274-W~1.IMX"},
-	{0, 1276,	0, 3, 0, 0,  "stateShow",					 "1276-Show",							"1276-S~1.IMX"},
-	{0, 1277,	0, 3, 0, 0,  "stateWardrobeJug",	 "1277-Wardrobe-Jug",			"1277-W~1.IMX"},
-	{0, 1278,	0, 3, 0, 0,  "stateJuggling",			 "1278-Juggling",					"1278-J~1.IMX"},
-	{0, 1279,	0, 3, 0, 0,  "statePostShow",			 "1279-Post-Show",				"1279-P~1.IMX"},
-	{0, 1280,	0, 3, 0, 0,  "stateChickenShop",	 "1280-Chicken Shop",			"1280-C~1.IMX"},
-	{0, 1285,	0, 3, 0, 0,  "stateBarberShop",		 "1285-Barber Shop",			"1285-B~1.IMX"},
-	{0, 1286,	0, 3, 0, 0,  "stateVanHelgen",		 "1286-Van Helgen",				"1286-V~1.IMX"},
-	{0, 1287,	0, 3, 0, 0,  "stateBill",					 "1287-Bill",							"1287-B~1.IMX"},
-	{0, 1288,	0, 3, 0, 0,  "stateHaggis",				 "1288-Haggis",						"1288-H~1.IMX"},
-	{0, 1289,	0, 3, 0, 0,  "stateRottingham",		 "1289-Rottingham",				"1289-R~1.IMX"},
-	{0, 1305,	0, 3, 0, 0,  "stateDeck",					 "1305-Deck",							"1305-D~1.IMX"},
-	{0, 1310,	0, 3, 0, 0,  "stateCombatMap",		 "1310-Combat Map",				"1310-C~1.IMX"},
-	{0, 1320,	0, 3, 0, 0,  "stateShipCombat",		 "1320-Ship Combat",			"1320-S~1.IMX"},
-	{0, 1325,	0, 3, 0, 0,  "stateSwordfight",		 "1325-Swordfight",				"1325-S~1.IMX"},
-	{0, 1327,	0, 3, 0, 0,  "stateSwordRott",		 "1327-Sword Rott",				"1327-S~1.IMX"},
-	{0, 1330,	0, 3, 0, 0,  "stateTownEdge",			 "1330-Town Edge",				"1330-T~1.IMX"},
-	{0, 1335,	0, 3, 0, 0,  "stateSwordLose",		 "1335-Sword Lose",				"1335-S~1.IMX"},
-	{0, 1340,	0, 3, 0, 0,  "stateSwordWin",			 "1340-Sword Win",				"1340-S~1.IMX"},
-	{0, 1345,	0, 3, 0, 0,  "stateGetMap",				 "1345-Get Map",					"1345-G~1.IMX"},
-	{0, 1400,	0, 3, 0, 0,  "stateWreckBeach",		 "1400-Wreck Beach",			"1400-W~1.IMX"},
-	{0, 1405,	0, 3, 0, 0,  "stateBloodMap",			 "1405-Blood Map",				"1405-B~1.IMX"},
-	{0, 1410,	0, 3, 0, 0,  "stateClearing",			 "1410-Clearing",					"1410-C~1.IMX"},
-	{0, 1415,	0, 3, 0, 0,  "stateLighthouse",		 "1415-Lighthouse",				"1415-L~1.IMX"},
-	{0, 1420,	0, 3, 0, 0,  "stateVillage",			 "1420-Village",					"1420-V~1.IMX"},
-	{0, 1423,	0, 3, 0, 0,  "stateVolcano",			 "1423-Volcano",					"1423-V~1.IMX"},
-	{0, 1425,	0, 3, 0, 0,  "stateAltar",				 "1425-Altar",						"1425-A~1.IMX"},
-	{0, 1430,	0, 3, 0, 0,  "stateHotelOut",			 "1430-Hotel Out",				"1430-H~1.IMX"},
-	{0, 1435,	0, 3, 0, 0,  "stateHotelBar",			 "1435-Hotel Bar",				"1435-H~1.IMX"},
-	{0, 1440,	0, 3, 0, 0,  "stateHotelIn",			 "1440-Hotel In",					"1440-H~1.IMX"},
-	{0, 1445,	0, 3, 0, 0,  "stateTarotLady",		 "1445-Tarot Lady",				"1445-T~1.IMX"},
-	{0, 1447,	0, 3, 0, 0,  "stateGoodsoup",			 "1447-Goodsoup",					"1447-G~1.IMX"},
-	{0, 1448,	0, 3, 0, 0,  "stateGuestRoom",		 "1448-Guest Room",				"1448-G~1.IMX"},
-	{0, 1450,	0, 3, 0, 0,  "stateWindmill",			 "1450-Windmill",					"1450-W~1.IMX"},
-	{0, 1455,	0, 3, 0, 0,  "stateCemetary",			 "1455-Cemetary",					"1455-C~1.IMX"},
-	{0, 1460,	0, 3, 0, 0,  "stateCrypt",				 "1460-Crypt",						"1460-C~1.IMX"},
-	{0, 1463,	0, 3, 0, 0,  "stateGraveDigger",	 "1463-Gravedigger",			"1463-G~1.IMX"},
-	{0, 1465,	0, 3, 0, 0,  "stateMonkey1",			 "1465-Monkey1",					"1465-M~1.IMX"},
-	{0, 1475,	0, 3, 0, 0,  "stateStanDark",			 "1475-Stan Dark",				"1475-S~1.IMX"},
-	{0, 1477,	0, 3, 0, 0,  "stateStanLight",		 "1477-Stan",							"1477-S~1.IMX"},
-	{0, 1480,	0, 3, 0, 0,  "stateEggBeach",			 "1480-Egg Beach",				"1480-E~1.IMX"},
-	{0, 1485,	0, 3, 0, 0,  "stateSkullIsland",	 "1485-Skull Island",			"1485-S~1.IMX"},
-	{0, 1490,	0, 3, 0, 0,  "stateSmugglersCave", "1490-Smugglers",				"1490-S~1.IMX"},
-	{0, 1500,	0, 3, 0, 0,  "stateLeChuckTalk",	 "1500-Le Talk",					"1500-L~1.IMX"},
-	{0, 1505,	0, 3, 0, 0,  "stateCarnival",			 "1505-Carnival",					"1505-C~1.IMX"},
-	{0, 1511,	0, 3, 0, 0,  "stateHang",					 "1511-Hang",							"1511-H~1.IMX"},
-	{0, 1512,	0, 3, 0, 0,  "stateRum",					 "1512-Rum",							"1512-RUM.IMX"},
-	{0, 1513,	0, 3, 0, 0,  "stateTorture",			 "1513-Torture",					"1513-T~1.IMX"},
-	{0, 1514,	0, 3, 0, 0,  "stateSnow",					 "1514-Snow",							"1514-S~1.IMX"},
-	{0, 1515,	0, 3, 0, 0,  "stateCredits",			 "1515-Credits (end)",		"1515-C~1.IMX"},
-	{0, 1520,	0, 3, 0, 0,  "stateCarnAmb",			 "1520-Carn Amb",					"1520-C~1.IMX"},
-	{-1,  -1,	0, 0, 0, 0,  "",									 "",											""}
+	imuseComiTable _comiStateMusicTable[] = {
+	{0, 1000, "STATE_NULL",         0, 0,    0, ""},
+	{0, 1001, "stateNoChange",      0, 0,    0, ""},
+	{3, 1098, "stateCredits1",      0, 0, 1000, "1098-C~1.IMX"},
+	{3, 1099, "stateMenu",          0, 0, 1000, "1099-M~1.IMX"},
+	{3, 1100, "stateHold1",         4, 0, 1000, "1100-H~1.IMX"},
+	{3, 1101, "stateWaterline1",    4, 0, 1000, "1101-W~1.IMX"},
+	{3, 1102, "stateHold2",         6, 1, 1000, "1102-H~1.IMX"},
+	{3, 1103, "stateWaterline2",    6, 0, 1000, "1103-W~1.IMX"},
+	{3, 1104, "stateCannon",        0, 0, 1000, "1104-C~1.IMX"},
+	{3, 1105, "stateTreasure",      0, 0, 1000, "1105-T~1.IMX"},
+	{3, 1200, "stateFortBase",     10, 1, 1000, "1200-F~1.IMX"},
+	{3, 1201, "statePreFort",      10, 1, 1000, "1201-P~1.IMX"},
+	{3, 1202, "statePreVooOut",    12, 0, 1000, "1202-P~1.IMX"},
+	{3, 1203, "statePreVooIn",     12, 0, 1000, "1203-P~1.IMX"},
+	{3, 1204, "statePreVooLady",   12, 0, 1000, "1204-P~1.IMX"},
+	{3, 1205, "stateVoodooOut",     0, 0, 1000, "1205-V~1.IMX"},
+	{3, 1210, "stateVoodooIn",      0, 0, 1000, "1210-V~1.IMX"},
+	{12,1212, "stateVoodooInAlt",   0, 1,  700, "1210-V~1.IMX"},
+	{3, 1215, "stateVoodooLady",    0, 0, 1000, "1215-V~1.IMX"},
+	{3, 1219, "statePrePlundermap", 0, 0, 1000, "1219-P~1.IMX"},
+	{3, 1220, "statePlundermap",    0, 0, 1000, "1220-P~1.IMX"},
+	{3, 1222, "statePreCabana",     0, 0, 1000, "1222-P~1.IMX"},
+	{3, 1223, "stateCabana",        0, 0, 1000, "1223-C~1.IMX"},
+	{3, 1224, "statePostCabana",   23, 0, 1000, "1224-P~1.IMX"},
+	{3, 1225, "stateBeachClub",    23, 0, 1000, "1225-B~1.IMX"},
+	{3, 1230, "stateCliff",         0, 0, 1000, "1230-C~1.IMX"},
+	{3, 1232, "stateBelly",         0, 0,  800, "1232-B~1.IMX"},
+	{3, 1235, "stateQuicksand",     0, 0, 1000, "1235-Q~1.IMX"},
+	{3, 1240, "stateDangerBeach",   0, 0,  800, "1240-D~1.IMX"},
+	{12,1241, "stateDangerBeachAlt",0, 2,  800, "1240-D~1.IMX"},
+	{3, 1245, "stateRowBoat",       0, 0, 1000, "1245-R~1.IMX"},
+	{3, 1247, "stateAlongside",     0, 0,  800, "1247-A~1.IMX"},
+	{12,1248, "stateAlongsideAlt",  0, 1,  800, "1247-A~1.IMX"},
+	{3, 1250, "stateChimpBoat",     0, 0,  500, "1250-C~1.IMX"},
+	{3, 1255, "stateMrFossey",      0, 0,  800, "1255-M~1.IMX"},
+	{3, 1259, "statePreTown",       0, 0, 1000, "1259-P~1.IMX"},
+	{3, 1260, "stateTown",          0, 0, 1000, "1260-T~1.IMX"},
+	{3, 1264, "statePreMeadow",     0, 0, 1000, "1264-P~1.IMX"},
+	{3, 1265, "stateMeadow",        0, 0, 1000, "1265-M~1.IMX"},
+	{3, 1266, "stateMeadowAmb",     0, 0, 1000, "1266-M~1.IMX"},
+	{3, 1270, "stateWardrobePre",  40, 0, 1000, "1270-W~1.IMX"},
+	{3, 1272, "statePreShow",      40, 0, 1000, "1272-P~1.IMX"},
+	{3, 1274, "stateWardrobeShow", 42, 0, 1000, "1274-W~1.IMX"},
+	{3, 1276, "stateShow",         42, 0, 1000, "1276-S~1.IMX"},
+	{3, 1277, "stateWardrobeJug",  44, 0, 1000, "1277-W~1.IMX"},
+	{3, 1278, "stateJuggling",     44, 0, 1000, "1278-J~1.IMX"},
+	{3, 1279, "statePostShow",      0, 0, 1000, "1279-P~1.IMX"},
+	{3, 1280, "stateChickenShop",   0, 0, 1000, "1280-C~1.IMX"},
+	{3, 1285, "stateBarberShop",   48, 0, 1000, "1285-B~1.IMX"},
+	{3, 1286, "stateVanHelgen",    48, 0, 1000, "1286-V~1.IMX"},
+	{3, 1287, "stateBill",         48, 0, 1000, "1287-B~1.IMX"},
+	{3, 1288, "stateHaggis",       48, 0, 1000, "1288-H~1.IMX"},
+	{3, 1289, "stateRottingham",   48, 0, 1000, "1289-R~1.IMX"},
+	{3, 1305, "stateDeck",          0, 0, 1000, "1305-D~1.IMX"},
+	{3, 1310, "stateCombatMap",     0, 0, 1000, "1310-C~1.IMX"},
+	{3, 1320, "stateShipCombat",    0, 0, 1000, "1320-S~1.IMX"},
+	{3, 1325, "stateSwordfight",    0, 0, 1000, "1325-S~1.IMX"},
+	{3, 1327, "stateSwordRott",     0, 0, 1000, "1327-S~1.IMX"},
+	{3, 1330, "stateTownEdge",      0, 0, 1000, "1330-T~1.IMX"},
+	{3, 1335, "stateSwordLose",     0, 0, 1000, "1335-S~1.IMX"},
+	{3, 1340, "stateSwordWin",      0, 0, 1000, "1340-S~1.IMX"},
+	{3, 1345, "stateGetMap",        0, 0, 1000, "1345-G~1.IMX"},
+	{3, 1400, "stateWreckBeach",    0, 0, 1000, "1400-W~1.IMX"},
+	{3, 1405, "stateBloodMap",     63, 0, 1000, "1405-B~1.IMX"},
+	{3, 1410, "stateClearing",      0, 0, 1000, "1410-C~1.IMX"},
+	{3, 1415, "stateLighthouse",   63, 0, 1000, "1415-L~1.IMX"},
+	{3, 1420, "stateVillage",      66, 0, 1000, "1420-V~1.IMX"},
+	{3, 1423, "stateVolcano",      66, 0, 1000, "1423-V~1.IMX"},
+	{3, 1425, "stateAltar",        66, 0, 1000, "1425-A~1.IMX"},
+	{3, 1430, "stateHotelOut",      0, 0, 1000, "1430-H~1.IMX"},
+	{3, 1435, "stateHotelBar",     70, 0, 1000, "1435-H~1.IMX"},
+	{3, 1440, "stateHotelIn",      70, 0, 1000, "1440-H~1.IMX"},
+	{3, 1445, "stateTarotLady",    70, 0, 1000, "1445-T~1.IMX"},
+	{3, 1447, "stateGoodsoup",     70, 0, 1000, "1447-G~1.IMX"},
+	{3, 1448, "stateGuestRoom",     0, 0, 1000, "1448-G~1.IMX"},
+	{3, 1450, "stateWindmill",     63, 0, 1000, "1450-W~1.IMX"},
+	{3, 1455, "stateCemetary",      0, 0, 1000, "1455-C~1.IMX"},
+	{3, 1460, "stateCrypt",        77, 0, 1000, "1460-C~1.IMX"},
+	{3, 1463, "stateGraveDigger",  77, 0, 1000, "1463-G~1.IMX"},
+	{3, 1465, "stateMonkey1",       0, 0, 1000, "1465-M~1.IMX"},
+	{3, 1475, "stateStanDark",      0, 0, 1000, "1475-S~1.IMX"},
+	{3, 1477, "stateStanLight",     0, 0, 1000, "1477-S~1.IMX"},
+	{3, 1480, "stateEggBeach",     63, 0, 1000, "1480-E~1.IMX"},
+	{3, 1485, "stateSkullIsland",   0, 0, 1000, "1485-S~1.IMX"},
+	{3, 1490, "stateSmugglersCave", 0, 0, 1000, "1490-S~1.IMX"},
+	{3, 1500, "stateLeChuckTalk",   0, 0, 1000, "1500-L~1.IMX"},
+	{3, 1505, "stateCarnival",      0, 0, 1000, "1505-C~1.IMX"},
+	{3, 1511, "stateHang",         87, 0, 1000, "1511-H~1.IMX"},
+	{3, 1512, "stateRum",          87, 0, 1000, "1512-RUM.IMX"},
+	{3, 1513, "stateTorture",      87, 0, 1000, "1513-T~1.IMX"},
+	{3, 1514, "stateSnow",         87, 0, 1000, "1514-S~1.IMX"},
+	{3, 1515, "stateCredits",       0, 0, 1000, "1515-C~1.IMX"},
+	{3, 1520, "stateCarnAmb",       0, 0, 1000, "1520-C~1.IMX"},
+	{0,   -1, "",                   0, 0,    0, ""}
 };
+
 	writeRecord(_comiStateMusicTable, sizeof(_comiStateMusicTable), GBVARS_COMISTATEMUSICTABLE_INDEX , GBVARS_SCUMM);
 }
 ///////////////////////////////////////////////////////////////////
 static void addDimuseTables_comiSeqMusicTable() {
-	imuse_music_table _comiSeqMusicTable[] = {
-	{0, 2000,	0, 0, 0, 0,  "SEQ_NULL",					"",												""},
-	{0, 2100,	0, 0, 0, 0,  "seqINTRO",					"",												""},
-	{0, 2105,	0, 3, 0, 0,  "seqInterlude1",			"2105-Interlude1",				"2105-I~1.IMX"},
-	{0, 2110,	0, 8, 1, 0,  "seqLastBoat",				"",												""},
-	{0, 2115,	0, 0, 0, 0,  "seqSINK_SHIP",			"",												""},
-	{0, 2120,	0, 0, 0, 0,  "seqCURSED_RING",		"",												""},
-	{0, 2200,	0, 3, 0, 0,  "seqInterlude2",			"2200-Interlude2",				"2200-I~1.IMX"},
-	{0, 2210,	0, 3, 0, 0,  "seqKidnapped",			"2210-Kidnapped",					"2210-K~1.IMX"},
-	{0, 2220,	0, 8, 1, 0,  "seqSnakeVomits",		"",												""},
-	{0, 2222,	0, 8, 1, 0,  "seqPopBalloon",			"",												""},
-	{0, 2225,	0, 3, 0, 0,  "seqDropBalls",			"2225-Drop Balls",				"2225-D~1.IMX"},
-	{0, 2232,	0, 4, 0, 0,  "seqArriveBarber",		"2232-Arrive Barber",			"2232-A~1.IMX"},
-	{0, 2233,	0, 3, 0, 0,  "seqAtonal",					"2233-Atonal",						"2233-A~1.IMX"},
-	{0, 2235,	0, 3, 0, 0,  "seqShaveHead1",			"2235-Shave Head",				"2235-S~1.IMX"},
-	{0, 2236,	0, 2, 2, 0,  "seqShaveHead2",			"2235-Shave Head",				"2235-S~1.IMX"},
-	{0, 2245,	0, 3, 0, 0,  "seqCaberLose",			"2245-Caber Lose",				"2245-C~1.IMX"},
-	{0, 2250,	0, 3, 0, 0,  "seqCaberWin",				"2250-Caber Win",					"2250-C~1.IMX"},
-	{0, 2255,	0, 3, 0, 0,  "seqDuel1",					"2255-Duel",							"2255-D~1.IMX"},
-	{0, 2256,	0, 2, 2, 0,  "seqDuel2",					"2255-Duel",							"2255-D~1.IMX"},
-	{0, 2257,	0, 2, 3, 0,  "seqDuel3",					"2255-Duel",							"2255-D~1.IMX"},
-	{0, 2260,	0, 3, 0, 0,  "seqBlowUpTree1",		"2260-Blow Up Tree",			"2260-B~1.IMX"},
-	{0, 2261,	0, 2, 2, 0,  "seqBlowUpTree2",		"2260-Blow Up Tree",			"2260-B~1.IMX"},
-	{0, 2275,	0, 3, 0, 0,  "seqMonkeys",				"2275-Monkeys",						"2275-M~1.IMX"},
-	{0, 2277,	0, 9, 1, 0,  "seqAttack",					"",												""},
-	{0, 2285,	0, 3, 0, 0,  "seqSharks",					"2285-Sharks",						"2285-S~1.IMX"},
-	{0, 2287,	0, 3, 0, 0,  "seqTowelWalk",			"2287-Towel Walk",				"2287-T~1.IMX"},
-	{0, 2293,	0, 0, 0, 0,  "seqNICE_BOOTS",			"",												""},
-	{0, 2295,	0, 0, 0, 0,  "seqBIG_BONED",			"",												""},
-	{0, 2300,	0, 3, 0, 0,  "seqToBlood",				"2300-To Blood",					"2300-T~1.IMX"},
-	{0, 2301,	0, 3, 0, 0,  "seqInterlude3",			"2301-Interlude3",				"2301-I~1.IMX"},
-	{0, 2302,	0, 3, 0, 0,  "seqRott1",					"2302-Rott Attack",				"2302-R~1.IMX"},
-	{0, 2304,	0, 2, 2, 0,  "seqRott2",					"2302-Rott Attack",				"2302-R~1.IMX"},
-	{0, 2305,	0, 2,21, 0,  "seqRott2b",					"2302-Rott Attack",				"2302-R~1.IMX"},
-	{0, 2306,	0, 2, 3, 0,  "seqRott3",					"2302-Rott Attack",				"2302-R~1.IMX"},
-	{0, 2308,	0, 2, 4, 0,  "seqRott4",					"2302-Rott Attack",				"2302-R~1.IMX"},
-	{0, 2309,	0, 2, 5, 0,  "seqRott5",					"2302-Rott Attack",				"2302-R~1.IMX"},
-	{0, 2311,	0, 3, 0, 0,  "seqVerse1",					"2311-Song",							"2311-S~1.IMX"},
-	{0, 2312,	0, 2, 2, 0,  "seqVerse2",					"2311-Song",							"2311-S~1.IMX"},
-	{0, 2313,	0, 2, 3, 0,  "seqVerse3",					"2311-Song",							"2311-S~1.IMX"},
-	{0, 2314,	0, 2, 4, 0,  "seqVerse4",					"2311-Song",							"2311-S~1.IMX"},
-	{0, 2315,	0, 2, 5, 0,  "seqVerse5",					"2311-Song",							"2311-S~1.IMX"},
-	{0, 2316,	0, 2, 6, 0,  "seqVerse6",					"2311-Song",							"2311-S~1.IMX"},
-	{0, 2317,	0, 2, 7, 0,  "seqVerse7",					"2311-Song",							"2311-S~1.IMX"},
-	{0, 2318,	0, 2, 8, 0,  "seqVerse8",					"2311-Song",							"2311-S~1.IMX"},
-	{0, 2319,	0, 2, 9, 0,  "seqSongEnd",				"2311-Song",							"2311-S~1.IMX"},
-	{0, 2336,	0, 2, 0, 0,  "seqRiposteLose",		"2336-Riposte Lose",			"2336-R~1.IMX"},
-	{0, 2337,	0, 2, 0, 0,  "seqRiposteWin",			"2337-Riposte Win",				"2337-R~1.IMX"},
-	{0, 2338,	0, 2, 0, 0,  "seqInsultLose",			"2338-Insult Lose",				"2338-I~1.IMX"},
-	{0, 2339,	0, 2, 0, 0,  "seqInsultWin",			"2339-Insult Win",				"2339-I~1.IMX"},
-	{0, 2340,	0, 3, 0, 0,  "seqSwordLose",			"1335-Sword Lose",				"1335-S~1.IMX"},
-	{0, 2345,	0, 3, 0, 0,  "seqSwordWin",				"1340-Sword Win",					"1340-S~1.IMX"},
-	{0, 2347,	0, 3, 0, 0,  "seqGetMap",					"1345-Get Map",						"1345-G~1.IMX"},
-	{0, 2400,	0, 3, 0, 0,  "seqInterlude4",			"2400-Interlude4",				"2400-I~1.IMX"},
-	{0, 2405,	0, 0, 0, 0,  "seqSHIPWRECK",			"",												""},
-	{0, 2408,	0, 3, 0, 0,  "seqFakeCredits",		"2408-Fake Credits",			"2408-F~1.IMX"},
-	{0, 2410,	0, 3, 0, 0,  "seqPassOut",				"2410-Pass Out",					"2410-P~1.IMX"},
-	{0, 2414,	0, 3, 0, 0,  "seqGhostTalk",			"2414-Ghost Talk",				"2414-G~1.IMX"},
-	{0, 2415,	0, 2, 1, 0,  "seqGhostWedding",		"2414-Ghost Talk",				"2414-G~1.IMX"},
-	{0, 2420,	0, 3, 0, 0,  "seqEruption",				"2420-Eruption",					"2420-E~1.IMX"},
-	{0, 2425,	0, 3, 0, 0,  "seqSacrifice",			"2425-Sacrifice",					"2425-S~1.IMX"},
-	{0, 2426,	0, 2, 1, 0,  "seqSacrificeEnd",		"2425-Sacrifice",					"2425-S~1.IMX"},
-	{0, 2430,	0, 3, 0, 0,  "seqScareDigger",		"2430-Scare Digger",			"2430-S~1.IMX"},
-	{0, 2445,	0, 3, 0, 0,  "seqSkullArrive",		"2445-Skull Arrive",			"2445-S~1.IMX"},
-	{0, 2450,	0, 3, 0, 0,  "seqFloat",					"2450-Cliff Fall",				"2450-C~1.IMX"},
-	{0, 2451,	0, 2, 1, 0,  "seqFall",						"2450-Cliff Fall",				"2450-C~1.IMX"},
-	{0, 2452,	0, 2, 2, 0,  "seqUmbrella",				"2450-Cliff Fall",				"2450-C~1.IMX"},
-	{0, 2460,	0, 3, 0, 0,  "seqFight",					"2460-Fight",							"2460-F~1.IMX"},
-	{0, 2465,	0, 0, 0, 0,  "seqLAVE_RIDE",			"",												""},
-	{0, 2470,	0, 0, 0, 0,  "seqMORE_SLAW",			"",												""},
-	{0, 2475,	0, 0, 0, 0,  "seqLIFT_CURSE",			"",												""},
-	{0, 2500,	0, 3, 0, 0,  "seqInterlude5",			"2500-Interlude5",				"2500-I~1.IMX"},
-	{0, 2502,	0, 3, 0, 0,  "seqExitSkycar",			"2502-Exit Skycar",				"2502-E~1.IMX"},
-	{0, 2504,	0, 3, 0, 0,  "seqGrow1",					"2504-Grow",							"2504-G~1.IMX"},
-	{0, 2505,	0, 2, 1, 0,  "seqGrow2",					"2504-Grow",							"2504-G~1.IMX"},
-	{0, 2508,	0, 3, 0, 0,  "seqInterlude6",			"2508-Interlude6",				"2508-I~1.IMX"},
-	{0, 2515,	0, 0, 0, 0,  "seqFINALE",					"",												""},
-	{0, 2520,	0, 3, 0, 0,  "seqOut",						"2520-Out",								"2520-OUT.IMX"},
-	{0, 2530,	0, 3, 0, 0,  "seqZap1a",					"2530-Zap1",							"2530-Z~1.IMX"},
-	{0, 2531,	0, 2, 1, 0,  "seqZap1b",					"2530-Zap1",							"2530-Z~1.IMX"},
-	{0, 2532,	0, 2, 2, 0,  "seqZap1c",					"2530-Zap1",							"2530-Z~1.IMX"},
-	{0, 2540,	0, 3, 0, 0,  "seqZap2a",					"2540-Zap2",							"2540-Z~1.IMX"},
-	{0, 2541,	0, 2, 1, 0,  "seqZap2b",					"2540-Zap2",							"2540-Z~1.IMX"},
-	{0, 2542,	0, 2, 2, 0,  "seqZap2c",					"2540-Zap2",							"2540-Z~1.IMX"},
-	{0, 2550,	0, 3, 0, 0,  "seqZap3a",					"2550-Zap3",							"2550-Z~1.IMX"},
-	{0, 2551,	0, 2, 1, 0,  "seqZap3b",					"2550-Zap3",							"2550-Z~1.IMX"},
-	{0, 2552,	0, 2, 2, 0,  "seqZap3c",					"2550-Zap3",							"2550-Z~1.IMX"},
-	{0, 2560,	0, 3, 0, 0,  "seqZap4a",					"2560-Zap4",							"2560-Z~1.IMX"},
-	{0, 2561,	0, 2, 1, 0,  "seqZap4b",					"2560-Zap4",							"2560-Z~1.IMX"},
-	{0, 2562,	0, 2, 2, 0,  "seqZap4c",					"2560-Zap4",							"2560-Z~1.IMX"},
-	{-1, -1,  0, 0, 0, 0,  "",									"",												""}
+	imuseComiTable _comiSeqMusicTable[] = {
+	{0, 2000, "SEQ_NULL",        0, 0,    0, ""},
+	{0, 2100, "seqINTRO",        0, 0,    0, ""},
+	{3, 2105, "seqInterlude1",   0, 0, 1000, "2105-I~1.IMX"},
+	{8, 2110, "seqLastBoat",     0, 1,    0, ""},
+	{0, 2115, "seqSINK_SHIP",    0, 0,    0, ""},
+	{0, 2120, "seqCURSED_RING",  0, 0, 1000, ""},
+	{3, 2200, "seqInterlude2",   0, 0, 1000, "2200-I~1.IMX"},
+	{3, 2210, "seqKidnapped",    0, 0, 1000, "2210-K~1.IMX"},
+	{8, 2220, "seqSnakeVomits",  0, 1,    0, ""},
+	{8, 2222, "seqPopBalloon",   0, 1,    0, ""},
+	{3, 2225, "seqDropBalls",    0, 0, 1000, "2225-D~1.IMX"},
+	{4, 2232, "seqArriveBarber", 0, 0, 1000, "2232-A~1.IMX"},
+	{3, 2233, "seqAtonal",       0, 0, 1000, "2233-A~1.IMX"},
+	{3, 2235, "seqShaveHead1",   0, 0, 1000, "2235-S~1.IMX"},
+	{2, 2236, "seqShaveHead2",   0, 2, 1000, "2235-S~1.IMX"},
+	{3, 2245, "seqCaberLose",    0, 0, 1000, "2245-C~1.IMX"},
+	{3, 2250, "seqCaberWin",     0, 0, 1000, "2250-C~1.IMX"},
+	{3, 2255, "seqDuel1",        0, 0, 1000, "2255-D~1.IMX"},
+	{2, 2256, "seqDuel2",        0, 2, 1000, "2255-D~1.IMX"},
+	{2, 2257, "seqDuel3",        0, 3, 1000, "2255-D~1.IMX"},
+	{3, 2260, "seqBlowUpTree1",  0, 0, 1000, "2260-B~1.IMX"},
+	{2, 2261, "seqBlowUpTree2",  0, 2, 1000, "2260-B~1.IMX"},
+	{3, 2275, "seqMonkeys",      0, 0, 1000, "2275-M~1.IMX"},
+	{9, 2277, "seqAttack",       0, 1,    0, ""},
+	{3, 2285, "seqSharks",       0, 0, 1000, "2285-S~1.IMX"},
+	{3, 2287, "seqTowelWalk",    0, 0, 1000, "2287-T~1.IMX"},
+	{0, 2293, "seqNICE_BOOTS",   0, 0,    0, ""},
+	{0, 2295, "seqBIG_BONED",    0, 0,    0, ""},
+	{3, 2300, "seqToBlood",      0, 0, 1000, "2300-T~1.IMX"},
+	{3, 2301, "seqInterlude3",   0, 0, 1000, "2301-I~1.IMX"},
+	{3, 2302, "seqRott1",        0, 0, 1000, "2302-R~1.IMX"},
+	{2, 2304, "seqRott2",        0, 2, 1000, "2302-R~1.IMX"},
+	{2, 2305, "seqRott2b",       0,21, 1000, "2302-R~1.IMX"},
+	{2, 2306, "seqRott3",        0, 3, 1000, "2302-R~1.IMX"},
+	{2, 2308, "seqRott4",        0, 4, 1000, "2302-R~1.IMX"},
+	{2, 2309, "seqRott5",        0, 5, 1000, "2302-R~1.IMX"},
+	{3, 2311, "seqVerse1",       0, 0, 1000, "2311-S~1.IMX"},
+	{2, 2312, "seqVerse2",       0, 2, 1000, "2311-S~1.IMX"},
+	{2, 2313, "seqVerse3",       0, 3, 1000, "2311-S~1.IMX"},
+	{2, 2314, "seqVerse4",       0, 4, 1000, "2311-S~1.IMX"},
+	{2, 2315, "seqVerse5",       0, 5, 1000, "2311-S~1.IMX"},
+	{2, 2316, "seqVerse6",       0, 6, 1000, "2311-S~1.IMX"},
+	{2, 2317, "seqVerse7",       0, 7, 1000, "2311-S~1.IMX"},
+	{2, 2318, "seqVerse8",       0, 8, 1000, "2311-S~1.IMX"},
+	{2, 2319, "seqSongEnd",      0, 9, 1000, "2311-S~1.IMX"},
+	{2, 2336, "seqRiposteLose",  0, 0, 1000, "2336-R~1.IMX"},
+	{2, 2337, "seqRiposteWin",   0, 0, 1000, "2337-R~1.IMX"},
+	{2, 2338, "seqInsultLose",   0, 0, 1000, "2338-I~1.IMX"},
+	{2, 2339, "seqInsultWin",    0, 0, 1000, "2339-I~1.IMX"},
+	{3, 2340, "seqSwordLose",    0, 0, 1000, "1335-S~1.IMX"},
+	{3, 2345, "seqSwordWin",     0, 0, 1000, "1340-S~1.IMX"},
+	{3, 2347, "seqGetMap",       0, 0, 1000, "1345-G~1.IMX"},
+	{3, 2400, "seqInterlude4",   0, 0, 1000, "2400-I~1.IMX"},
+	{0, 2405, "seqSHIPWRECK",    0, 0,    0, ""},
+	{3, 2408, "seqFakeCredits",  0, 0, 1000, "2408-F~1.IMX"},
+	{3, 2410, "seqPassOut",      0, 0, 1000, "2410-P~1.IMX"},
+	{3, 2414, "seqGhostTalk",    0, 0, 1000, "2414-G~1.IMX"},
+	{2, 2415, "seqGhostWedding", 0, 1, 1000, "2414-G~1.IMX"},
+	{3, 2420, "seqEruption",     0, 0, 1000, "2420-E~1.IMX"},
+	{3, 2425, "seqSacrifice",    0, 0, 1000, "2425-S~1.IMX"},
+	{2, 2426, "seqSacrificeEnd", 0, 1, 1000, "2425-S~1.IMX"},
+	{3, 2430, "seqScareDigger",  0, 0, 1000, "2430-S~1.IMX"},
+	{3, 2445, "seqSkullArrive",  0, 0, 1000, "2445-S~1.IMX"},
+	{3, 2450, "seqFloat",        0, 0, 1000, "2450-C~1.IMX"},
+	{2, 2451, "seqFall",         0, 1, 1000, "2450-C~1.IMX"},
+	{2, 2452, "seqUmbrella",     0, 0, 1000, "2450-C~1.IMX"},
+	{3, 2460, "seqFight",        0, 0, 1000, "2460-F~1.IMX"},
+	{0, 2465, "seqLAVE_RIDE",    0, 0,    0, ""},
+	{0, 2470, "seqMORE_SLAW",    0, 0,    0, ""},
+	{0, 2475, "seqLIFT_CURSE",   0, 0,    0, ""},
+	{3, 2500, "seqInterlude5",   0, 0, 1000, "2500-I~1.IMX"},
+	{3, 2502, "seqExitSkycar",   0, 0, 1000, "2502-E~1.IMX"},
+	{3, 2504, "seqGrow1",        0, 0, 1000, "2504-G~1.IMX"},
+	{2, 2505, "seqGrow2",        0, 1, 1000, "2504-G~1.IMX"},
+	{3, 2508, "seqInterlude6",   0, 0, 1000, "2508-I~1.IMX"},
+	{0, 2515, "seqFINALE",       0, 0,    0, ""},
+	{3, 2520, "seqOut",          0, 0, 1000, "2520-OUT.IMX"},
+	{3, 2530, "seqZap1a",        0, 0, 1000, "2530-Z~1.IMX"},
+	{2, 2531, "seqZap1b",        0, 1, 1000, "2530-Z~1.IMX"},
+	{2, 2532, "seqZap1c",        0, 2, 1000, "2530-Z~1.IMX"},
+	{2, 2540, "seqZap2a",        0, 0, 1000, "2540-Z~1.IMX"},
+	{2, 2541, "seqZap2b",        0, 1, 1000, "2540-Z~1.IMX"},
+	{2, 2542, "seqZap2c",        0, 2, 1000, "2540-Z~1.IMX"},
+	{3, 2550, "seqZap3a",        0, 0, 1000, "2550-Z~1.IMX"},
+	{2, 2551, "seqZap3b",        0, 1, 1000, "2550-Z~1.IMX"},
+	{2, 2552, "seqZap3c",        0, 2, 1000, "2550-Z~1.IMX"},
+	{3, 2560, "seqZap4a",        0, 0, 1000, "2560-Z~1.IMX"},
+	{2, 2561, "seqZap4b",        0, 1, 1000, "2560-Z~1.IMX"},
+	{2, 2562, "seqZap4c",        0, 2, 1000, "2560-Z~1.IMX"},
+	{0,   -1, "",                0, 0,    0, ""}
 };
+
 	writeRecord(_comiSeqMusicTable, sizeof(_comiSeqMusicTable), GBVARS_COMISEQMUSICTABLE_INDEX ,GBVARS_SCUMM);
 }
 ///////////////////////////////////////////////////////////////////
 static void addDimuseTables_digSeqMusicTable() {
 
-	imuse_music_table _digSeqMusicTable[] = {
-	{0, 2000,	0, 0, 0, 0,	"SEQ_NULL",							"",												""						},
-	{0, 2005,	0, 0, 0, 0, "seqLogo",							"",												""						},
-	{0, 2010,	0, 0, 0, 0, "seqIntro",							"",												""						},
-	{0, 2020,	0, 6, 0, 0, "seqExplosion1b",				"",												""						},
-	{0, 2030,	0, 3, 0, 0, "seqAstTunnel1a",				"Seq (ast tunnel 1a)",		"SEQ(AS~1.IMU"},
-	{0, 2031,	0, 6, 0, 0, "seqAstTunnel2b",				"",												""						},
-	{0, 2032,	0, 4, 0, 0, "seqAstTunnel3a",				"Seq (ast tunnel 3a)",		"SEQ(AS~2.IMU"},
-	{0, 2040,	0, 5, 0, 0, "seqToPlanet1b",				"",												""						},
-	{0, 2045,	0, 4, 0, 0, "seqArgBegin",					"Seq (arg begin)",				"SEQ(AR~1.IMU"},
-	{0, 2046,	0, 4, 0, 0, "seqArgEnd",						"Seq (arg end)",					"SEQ(AR~2.IMU"},
-	{0, 2050,	0, 4, 0, 0, "seqWreckGhost",				"Seq (ghost-wreck)",			"SEQ(GH~1.IMU"},
-	{0, 2060,	0, 4, 0, 0, "seqCanyonGhost",				"Seq (ghost-canyon)",			"SEQ(GH~2.IMU"},
-	{0, 2070,	0, 0, 0, 0, "seqBrinkFall",					"",												""						},
-	{0, 2080,	0, 4, 0, 0, "seqPanUpCanyon",				"Seq (pan up canyon)",		"SEQ(PA~1.IMU"},
-	{0, 2091,	0, 6, 0, 0, "seqAirlockTunnel1b",		"",												""						},
-	{0, 2100,	0, 6, 0, 0, "seqTramToMu",					"",												""						},
-	{0, 2101,	0, 6, 0, 0, "seqTramFromMu",				"",												""						},
-	{0, 2102,	0, 6, 0, 0, "seqTramToTomb",				"",												""						},
-	{0, 2103,	0, 6, 0, 0, "seqTramFromTomb",			"",												""						},
-	{0, 2104,	0, 6, 0, 0, "seqTramToPlan",				"",												""						},
-	{0, 2105,	0, 6, 0, 0, "seqTramFromPlan",			"",												""						},
-	{0, 2106,	0, 6, 0, 0, "seqTramToMap",					"",												""						},
-	{0, 2107,	0, 6, 0, 0, "seqTramFromMap",				"",												""						},
-	{0, 2108,	0, 6, 0, 0, "seqTramToCath",				"",												""						},
-	{0, 2109,	0, 6, 0, 0, "seqTramFromCath",			"",												""						},
-	{0, 2110,	0, 0, 0, 0, "seqMuseumGhost",				"",												""						},
-	{0, 2120,	0, 0, 0, 0, "seqSerpentAppears",		"",												""						},
-	{0, 2130,	0, 0, 0, 0, "seqSerpentEats",				"",												""						},
-	{0, 2140,	0, 6, 0, 0, "seqBrinkRes1b",				"",												""						},
-	{0, 2141,	0, 4, 0, 0, "seqBrinkRes2a",				"Seq (brink's madness)",  "SEQ(BR~1.IMU"},
-	{0, 2150,	0, 3, 0, 0, "seqLockupEntry",				"Seq (brink's madness)",  "SEQ(BR~1.IMU"},
-	{0, 2160,	0, 0, 0, 0, "seqSerpentExplodes",		"",												""						},
-	{0, 2170,	0, 4, 0, 0, "seqSwimUnderwater",		"Seq (descent)",					"SEQ(DE~1.IMU"},
-	{0, 2175,	0, 4, 0, 0, "seqWavesPlunge",				"Seq (plunge)",						"SEQ(PL~1.IMU"},
-	{0, 2180,	0, 0, 0, 0, "seqCryptOpens",				"",												""						},
-	{0, 2190,	0, 0, 0, 0, "seqGuardsFight",				"",												""						},
-	{0, 2200,	0, 3, 0, 0, "seqCreatorRes1.1a",		"Seq (creator res 1.1a)", "SEQ(CR~1.IMU"},
-	{0, 2201,	0, 6, 0, 0, "seqCreatorRes1.2b",		"",												""						},
-	{0, 2210,	0, 6, 0, 0, "seqMaggieCapture1b",		"",												""						},
-	{0, 2220,	0, 3, 0, 0, "seqStealCrystals",			"Seq (brink's madness)",  "SEQ(BR~1.IMU"},
-	{0, 2230,	0, 0, 0, 0, "seqGetByMonster",			"",												""						},
-	{0, 2240,	0, 6, 0, 0, "seqKillMonster1b",			"",												""						},
-	{0, 2250,	0, 3, 0, 0, "seqCreatorRes2.1a",		"Seq (creator res 2.1a)", "SEQ(CR~2.IMU"},
-	{0, 2251,	0, 6, 0, 0, "seqCreatorRes2.2b",		"",												""						},
-	{0, 2252,	0, 4, 0, 0, "seqCreatorRes2.3a",		"Seq (creator res 2.3a)", "SEQ(CR~3.IMU"},
-	{0, 2260,	0, 0, 0, 0, "seqMaggieInsists",			"",												""						},
-	{0, 2270,	0, 0, 0, 0, "seqBrinkHelpCall",			"",												""						},
-	{0, 2280,	0, 3, 0, 0, "seqBrinkCrevice1a",		"Seq (brink crevice 1a)", "SEQ(BR~2.IMU"},
-	{0, 2281,	0, 3, 0, 0, "seqBrinkCrevice2a",		"Seq (brink crevice 2a)", "SEQ(BR~3.IMU"},
-	{0, 2290,	0, 6, 0, 0, "seqCathAccess1b",			"",												""						},
-	{0, 2291,	0, 4, 0, 0, "seqCathAccess2a",			"Seq (cath access 2a)",		"SEQ(CA~1.IMU"},
-	{0, 2300,	0, 3, 0, 0, "seqBrinkAtGenerator",  "Seq (brink's madness)",  "SEQ(BR~1.IMU"},
-	{0, 2320,	0, 6, 0, 0, "seqFightBrink1b",			"",												""						},
-	{0, 2340,	0, 6, 0, 0, "seqMaggieDies1b",			"",												""						},
-	{0, 2346,	0, 6, 0, 0, "seqMaggieRes1b",				"",												""						},
-	{0, 2347,	0, 4, 0, 0, "seqMaggieRes2a",				"Seq (maggie res 2a)",		"SEQ(MA~1.IMU"},
-	{0, 2350,	0, 0, 0, 0, "seqCreatureFalls",			"",												""						},
-	{0, 2360,	0, 5, 0, 0, "seqFinale1b",					"",												""						},
-	{0, 2370,	0, 3, 0, 0, "seqFinale2a",					"Seq (finale 2a)",				"SEQ(FI~1.IMU"},
-	{0, 2380,	0, 6, 0, 0, "seqFinale3b1",					"",												""						},
-	{0, 2390,	0, 6, 0, 0, "seqFinale3b2",					"",												""						},
-	{0, 2400,	0, 3, 0, 0, "seqFinale4a",					"Seq (finale 4a)",				"SEQ(FI~2.IMU"},
-	{0, 2410,	0, 3, 0, 0, "seqFinale5a",					"Seq (finale 5a)",				"SEQ(FI~3.IMU"},
-	{0, 2420,	0, 3, 0, 0, "seqFinale6a",					"Seq (finale 6a)",				"SEQ(FI~4.IMU"},
-	{0, 2430,	0, 3, 0, 0, "seqFinale7a",					"Seq (finale 7a)",				"SE3D2B~5.IMU"},
-	{0, 2440,	0, 6, 0, 0, "seqFinale8b",					"",												""						},
-	{0, 2450,	0, 4, 0, 0, "seqFinale9a",					"Seq (finale 9a)",				"SE313B~5.IMU"},
-	{-1,  -1,	0, 0, 0, 0,	"",											"",												""						}
+	imuseDigTable _digSeqMusicTable[] = {
+	{0, 2000, "SEQ_NULL",            0, ""},
+	{0, 2005, "seqLogo",             0, ""},
+	{0, 2010, "seqIntro",            0, ""},
+	{6, 2020, "seqExplosion1b",      0, ""},
+	{3, 2030, "seqAstTunnel1a",      0, "SEQ(AS~1.IMU"},
+	{6, 2031, "seqAstTunnel2b",      0, ""},
+	{4, 2032, "seqAstTunnel3a",      0, "SEQ(AS~2.IMU"},
+	{5, 2040, "seqToPlanet1b",       0, ""},
+	{4, 2045, "seqArgBegin",         0, "SEQ(AR~1.IMU"},
+	{4, 2046, "seqArgEnd",           0, "SEQ(AR~2.IMU"},
+	{4, 2050, "seqWreckGhost",       0, "SEQ(GH~1.IMU"},
+	{4, 2060, "seqCanyonGhost",      0, "SEQ(GH~2.IMU"},
+	{0, 2070, "seqBrinkFall",        0, ""},
+	{4, 2080, "seqPanUpCanyon",      0, "SEQ(PA~1.IMU"},
+	{6, 2091, "seqAirlockTunnel1b",  0, ""},
+	{6, 2100, "seqTramToMu",         0, ""},
+	{6, 2101, "seqTramFromMu",       0, ""},
+	{6, 2102, "seqTramToTomb",       0, ""},
+	{6, 2103, "seqTramFromTomb",     0, ""},
+	{6, 2104, "seqTramToPlan",       0, ""},
+	{6, 2105, "seqTramFromPlan",     0, ""},
+	{6, 2106, "seqTramToMap",        0, ""},
+	{6, 2107, "seqTramFromMap",      0, ""},
+	{6, 2108, "seqTramToCath",       0, ""},
+	{6, 2109, "seqTramFromCath",     0, ""},
+	{0, 2110, "seqMuseumGhost",      0, ""},
+	{0, 2120, "seqSerpentAppears",   0, ""},
+	{0, 2130, "seqSerpentEats",      0, ""},
+	{6, 2140, "seqBrinkRes1b",       0, ""},
+	{4, 2141, "seqBrinkRes2a",       0, "SEQ(BR~1.IMU"},
+	{3, 2150, "seqLockupEntry",      0, "SEQ(BR~1.IMU"},
+	{0, 2160, "seqSerpentExplodes",  0, ""},
+	{4, 2170, "seqSwimUnderwater",   0, "SEQ(DE~1.IMU"},
+	{4, 2175, "seqWavesPlunge",      0, "SEQ(PL~1.IMU"},
+	{0, 2180, "seqCryptOpens",       0, ""},
+	{0, 2190, "seqGuardsFight",      0, ""},
+	{3, 2200, "seqCreatorRes1.1a",   0, "SEQ(CR~1.IMU"},
+	{6, 2201, "seqCreatorRes1.2b",   0, ""},
+	{6, 2210, "seqMaggieCapture1b",  0, ""},
+	{3, 2220, "seqStealCrystals",    0, "SEQ(BR~1.IMU"},
+	{0, 2230, "seqGetByMonster",     0, ""},
+	{6, 2240, "seqKillMonster1b",    0, ""},
+	{3, 2250, "seqCreatorRes2.1a",   0, "SEQ(CR~2.IMU"},
+	{6, 2251, "seqCreatorRes2.2b",   0, ""},
+	{4, 2252, "seqCreatorRes2.3a",   0, "SEQ(CR~3.IMU"},
+	{0, 2260, "seqMaggieInsists",    0, ""},
+	{0, 2270, "seqBrinkHelpCall",    0, ""},
+	{3, 2280, "seqBrinkCrevice1a",   0, "SEQ(BR~2.IMU"},
+	{3, 2281, "seqBrinkCrevice2a",   0, "SEQ(BR~3.IMU"},
+	{6, 2290, "seqCathAccess1b",     0, ""},
+	{4, 2291, "seqCathAccess2a",     0, "SEQ(CA~1.IMU"},
+	{3, 2300, "seqBrinkAtGenerator", 0, "SEQ(BR~1.IMU"},
+	{6, 2320, "seqFightBrink1b",     0, ""},
+	{6, 2340, "seqMaggieDies1b",     0, ""},
+	{6, 2346, "seqMaggieRes1b",      0, ""},
+	{4, 2347, "seqMaggieRes2a",      0, "SEQ(MA~1.IMU"},
+	{0, 2350, "seqCreatureFalls",    0, ""},
+	{5, 2360, "seqFinale1b",         0, ""},
+	{3, 2370, "seqFinale2a",         0, "SEQ(FI~1.IMU"},
+	{6, 2380, "seqFinale3b1",        0, ""},
+	{6, 2390, "seqFinale3b2",        0, ""},
+	{3, 2400, "seqFinale4a",         0, "SEQ(FI~2.IMU"},
+	{3, 2410, "seqFinale5a",         0, "SEQ(FI~3.IMU"},
+	{3, 2420, "seqFinale6a",         0, "SEQ(FI~4.IMU"},
+	{3, 2430, "seqFinale7a",         0, "SE3D2B~5.IMU"},
+	{6, 2440, "seqFinale8b",         0, ""},
+	{4, 2450, "seqFinale9a",         0, "SE313B~5.IMU"},
+	{0,   -1, "",                    0, ""}
 };
+
 	writeRecord(_digSeqMusicTable, sizeof(_digSeqMusicTable), GBVARS_DIGSEQMUSICTABLE_INDEX ,GBVARS_SCUMM);
 }
 ///////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////
-typedef Int8 int8;
-typedef struct {
-	int index;
-	char audioname[15];
-	int unk1;
-	int volume;
-	char name[30];
-} imuse_ft_music_table;
-///////////////////////////////////////////////////////////////////
 static void addDimuseTables_ftStateMusicTable() {
 
-	imuse_ft_music_table _ftStateMusicTable[] = {
-	{0,		"",					0,	0,		"STATE_NULL"					},
-	{1,		"",					4,	127,	"stateKstandOutside"	},
-	{2,		"kinside",	2,	127,	"stateKstandInside"		},
-	{3,		"moshop",		3,	64,		"stateMoesInside"			},
-	{4,		"melcut",		2,	127,	"stateMoesOutside"		},
-	{5,		"mellover",	2,	127,	"stateMellonAbove"		},
-	{6,		"radloop",	3,	28,		"stateTrailerOutside"	},
-	{7,		"radloop",	3,	58,		"stateTrailerInside"	},
-	{8,		"radloop",	3,	127,	"stateTodShop"				},
-	{9,		"junkgate",	2,	127,	"stateJunkGate"				},
-	{10,	"junkover",	3,	127,	"stateJunkAbove"			},
-	{11,	"gastower",	2,	127,	"stateGasTower"				},
-	{12,	"",					4,	0,		"stateTowerAlarm"			},
-	{13,	"melcut",		2,	127,	"stateCopsOnGround"		},
-	{14,	"melcut",		2,	127,	"stateCopsAround"			},
-	{15,	"melcut",		2,	127,	"stateMoesRuins"			},
-	{16,	"melcut",		2,	127,	"stateKstandNight"		},
-	{17,	"trukblu2",	2,	127,	"stateTruckerTalk"		},
-	{18,	"stretch",	2,	127,	"stateMumblyPeg"			},
-	{19,	"kstand",		2,	100, 	"stateRanchOutside"		},
-	{20,	"kinside",	2,	127,	"stateRanchInside"		},
-	{21,	"desert",		2,	127,	"stateWreckedTruck"		},
-	{22,	"opening",	2,	100, 	"stateGorgeVista"			},
-	{23,	"caveopen",	2,	127,	"stateCaveOpen"				},
-	{24,	"cavecut1",	2,	127,	"stateCaveOuter"			},
-	{25,	"cavecut1",	1,	127,	"stateCaveMiddle"			},
-	{26,	"cave",			2,	127,	"stateCaveInner"			},
-	{27,	"corville",	2,	127,	"stateCorvilleFront"	},
-	{28,	"mines",		2,	127,	"stateMineField"			},
-	{29,	"bunyman3",	2,	127,	"stateBunnyStore"			},
-	{30,	"stretch",	2,	127,	"stateStretchBen"			},
-	{31,	"saveme",		2,	127,	"stateBenPleas"				},
-	{32,	"",					4,	0,		"stateBenConvinces"		},
-	{33,	"derby",		3,	127,	"stateDemoDerby"			},
-	{34,	"fire",			3,	127,	"stateLightMyFire"		},
-	{35,	"derby",		3,	127,	"stateDerbyChase"			},
-	{36,	"carparts",	2,	127,	"stateVultureCarParts"},
-	{37,	"cavecut1",	2,	127,	"stateVulturesInside"	},
-	{38,	"mines",		2,	127,	"stateFactoryRear"		},
-	{39,	"croffice",	2,	127,	"stateCorleyOffice"		},
-	{40,	"melcut",		2,	127,	"stateCorleyHall"			},
-	{41,	"",					4,	0,		"stateProjRoom"				},
-	{42,	"",					4,	0,		"stateMMRoom"					},
-	{43,	"bumper",		2,	127,	"stateBenOnBumper"		},
-	{44,	"benump",		2,	127,	"stateBenOnBack"			},
-	{45,	"plane",		2,	127,	"stateInCargoPlane"		},
-	{46,	"saveme",		2,	127,	"statePlaneControls"	},
-	{47,	"",					4,	0,		"stateCliffHanger1"		},
-	{48,	"",					4,	0,		"stateCliffHanger2"		},
-	{-1,	"",					0,	0,		""										}
+	imuseFtStateTable _ftStateMusicTable[] = {
+	{"",         0,  0,    "STATE_NULL"          },
+	{"",         4,  127,  "stateKstandOutside"  },
+	{"kinside",  2,  127,  "stateKstandInside"   },
+	{"moshop",   3,  64,   "stateMoesInside"     },
+	{"melcut",   2,  127,  "stateMoesOutside"    },
+	{"mellover", 2,  127,  "stateMellonAbove"    },
+	{"radloop",  3,  28,   "stateTrailerOutside" },
+	{"radloop",  3,  58,   "stateTrailerInside"  },
+	{"radloop",  3,  127,  "stateTodShop"        },
+	{"junkgate", 2,  127,  "stateJunkGate"       },
+	{"junkover", 3,  127,  "stateJunkAbove"      },
+	{"gastower", 2,  127,  "stateGasTower"       },
+	{"",         4,  0,    "stateTowerAlarm"     },
+	{"melcut",   2,  127,  "stateCopsOnGround"   },
+	{"melcut",   2,  127,  "stateCopsAround"     },
+	{"melcut",   2,  127,  "stateMoesRuins"      },
+	{"melcut",   2,  127,  "stateKstandNight"    },
+	{"trukblu2", 2,  127,  "stateTruckerTalk"    },
+	{"stretch",  2,  127,  "stateMumblyPeg"      },
+	{"kstand",   2,  100,  "stateRanchOutside"   },
+	{"kinside",  2,  127,  "stateRanchInside"    },
+	{"desert",   2,  127,  "stateWreckedTruck"   },
+	{"opening",  2,  100,  "stateGorgeVista"     },
+	{"caveopen", 2,  127,  "stateCaveOpen"       },
+	{"cavecut1", 2,  127,  "stateCaveOuter"      },
+	{"cavecut1", 1,  127,  "stateCaveMiddle"     },
+	{"cave",     2,  127,  "stateCaveInner"      },
+	{"corville", 2,  127,  "stateCorvilleFront"  },
+	{"mines",    2,  127,  "stateMineField"      },
+	{"bunyman3", 2,  127,  "stateBunnyStore"     },
+	{"stretch",  2,  127,  "stateStretchBen"     },
+	{"saveme",   2,  127,  "stateBenPleas"       },
+	{"",         4,  0,    "stateBenConvinces"   },
+	{"derby",    3,  127,  "stateDemoDerby"      },
+	{"fire",     3,  127,  "stateLightMyFire"    },
+	{"derby",    3,  127,  "stateDerbyChase"     },
+	{"carparts", 2,  127,  "stateVultureCarParts"},
+	{"cavecut1", 2,  127,  "stateVulturesInside" },
+	{"mines",    2,  127,  "stateFactoryRear"    },
+	{"croffice", 2,  127,  "stateCorleyOffice"   },
+	{"melcut",   2,  127,  "stateCorleyHall"     },
+	{"",         4,  0,    "stateProjRoom"       },
+	{"",         4,  0,    "stateMMRoom"         },
+	{"bumper",   2,  127,  "stateBenOnBumper"    },
+	{"benump",   2,  127,  "stateBenOnBack"      },
+	{"plane",    2,  127,  "stateInCargoPlane"   },
+	{"saveme",   2,  127,  "statePlaneControls"  },
+	{"",         4,  0,    "stateCliffHanger1"   },
+	{"",         4,  0,    "stateCliffHanger2"   },
 };
 
 	writeRecord(_ftStateMusicTable, sizeof(_ftStateMusicTable), GBVARS_FTSTATEMUSICTABLE_INDEX , GBVARS_SCUMM);
@@ -561,65 +581,328 @@ static void addDimuseTables_ftStateMusicTable() {
 ///////////////////////////////////////////////////////////////////
 static void addDimuseTables_ftSeqMusicTable() {
 
-	imuse_ft_music_table _ftSeqMusicTable[] = {
-	{0,		"",					2,	127,  "SEQ_NULL"						},
-	{1,		"opening",	2,	127,	"seqLogo"							},
-	{2,		"barbeat",	2,	127,	"seqOpenFlick"				},
-	{3,		"barwarn",	2,	127,	"seqBartender"				},
-	{4,		"benwakes", 2,	127,  "seqBenWakes"					},
-	{5,		"barwarn",	2,	127,	"seqPhotoScram"				},
-	{6,		"swatben",	2,	127,	"seqClimbChain"				},
-	{7,		"dogattak",	2,	127,	"seqDogChase"					},
-	{8,		"",					0,	0,   	"seqDogSquish"				},
-	{9,		"",					0,	0,   	"seqDogHoist"					},
-	{10,	"cops2",		2,	127,	"seqCopsArrive"				},
-	{11,	"cops2",		2,	127,	"seqCopsLand"					},
-	{12,	"cops2",		2,	127,	"seqCopsLeave"				},
-	{13,	"",					0,	0,		"seqCopterFlyby"			},
-	{14,	"bunymrch",	2,	127,	"seqCopterCrash"			},
-	{15,	"",					0,	0,		"seqMoGetsParts"			},
-	{16,	"",					0,	0,		"seqMoFixesBike"			},
-	{17,	"",					0,	0,		"seqFirstGoodbye"			},
-	{18,	"trucker",	2,	127,	"seqCopRoadblock"			},
-	{19,	"cops2",		2,	127,	"seqDivertCops"				},
-	{20,	"barwarn",	2,	127,	"seqMurder"						},
-	{21,	"corldie",	2,	127,	"seqCorleyDies"				},
-	{22,	"barwarn",	2,	127,	"seqTooLateAtMoes"		},
-	{23,	"picture",	2,	127,	"seqPicture"					},
-	{24,	"ripintro",	2,	127,	"seqNewsReel"					},
-	{25,	"trucker",	2,	127,	"seqCopsInspect"			},
-	{26,	"ripdead",	2,	127,	"seqHijack"						},
-	{27,	"nesranch",	2,	127,	"seqNestolusAtRanch"	},
-	{28,	"scolding", 2,	127,	"seqRipLimo"					},
-	{29,	"desert",		2,	127,	"seqGorgeTurn"				},
-	{30,	"cavecut1",	2,	127,	"seqStealRamp"				},
-	{31,	"vaceamb",	2,	80,		"seqCavefishTalk"			},
-	{32,	"castle",		2,	127,	"seqArriveCorville"		},
-	{33,	"bunymrch",	2,	105,	"seqSingleBunny"			},
-	{34,	"valkyrs",	2,	127,	"seqBunnyArmy"				},
-	{35,	"melcut",		2,	127,	"seqArriveAtMines"		},
-	{36,	"veltures",	2,	127,	"seqArriveAtVultures"	},
-	{37,	"sorry",		2,	127,	"seqMakePlan"					},
-	{38,	"makeplan",	2,	127,	"seqShowPlan"					},
-	{39,	"castle",		2,	127,	"seqDerbyStart"				},
-	{40,	"fire",			3,	127,	"seqLightBales"				},
-	{41,	"saveme",		3,	127,	"seqNestolusBBQ"			},
-	{42,	"cops2",		2,	127,	"seqCallSecurity"			},
-	{43,	"sorry",		2,	127,	"seqFilmFail"					},
-	{44,	"sorry",		2,	127,	"seqFilmBurn"					},
-	{45,	"caveamb",	2,	127,	"seqRipSpeech"				},
-	{46,	"expose",		2,	127,	"seqExposeRip"				},
-	{47,	"ripscram",	2,	127,	"seqRipEscape"				},
-	{48,	"",					0,	0,		"seqRareMoment"				},
-	{49,	"valkyrs",	2,	127,	"seqFanBunnies"				},
-	{50,	"ripdead",	2,	127,	"seqRipDead"					},
-	{51,	"funeral",	2,	127,	"seqFuneral"					},
-	{52,	"bornbad",	2,	127,	"seqCredits"					},
-	{-1,	"",					0,	0,		""										}
+	imuseFtSeqTable _ftSeqMusicTable[] = {
+	{"",         2,  127},
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"opening",  2,  127},
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"barbeat",  2,  127},
+	{"barwarn",  2,  127},
+	{"",         0,  0  },
+	{"",         0,  0, },
+
+	{"benwakes", 2,  127},
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"barwarn",  2,  127},
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"swatben",  2,  127},
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"dogattak", 2,  127},
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"",         4,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"",         4,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"cops2",    2,  127},
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"cops2",    2,  127},
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"cops2",    2,  127},
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"bunymrch", 2,  127},
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"",         4,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"",         0,  0  },
+	{"melcut",   2,  127},
+	{"tada",     2,  127},
+	{"",         0,  0  },
+
+	{"",         4,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"trucker",  2,  127},
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"cops2",    2,  127},
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"barwarn",  2,  127},
+	{"murder",   2,  127},
+	{"murder2",  2,  127},
+	{"",         0,  0  },
+
+	{"corldie",  2,  127},
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"barwarn",  2,  127},
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"picture",  2,  127},
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"ripintro", 2,  127},
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"trucker",  2,  127},
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"hosed",    2,  127},
+
+	{"ripdead",  2,  127},
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"nesranch", 2,  127},
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"scolding", 2,  127},
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"desert",   2,  127},
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"cavecut1", 2,  127},
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"caveamb",  2,  80 },
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"castle",   2,  127},
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"bunymrch", 2,  105},
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"valkyrs",  2,  127},
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"melcut",   2,  127},
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"veltures", 2,  127},
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"sorry",    2,  127},
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"makeplan", 2,  127},
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"castle",   2,  127},
+	{"derby",    2,  127},
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"fire",     3,  127},
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"saveme",   3,  127},
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"scolding", 2,  127},
+
+	{"cops2",    2,  127},
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"sorry",    2,  127},
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"sorry",    2,  127},
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"caveamb",  2,  85 },
+	{"tada",     2,  127},
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"expose",   2,  127},
+	{"",         4,  0  },
+	{"",         0,  0  },
+	{"mocoup",   2,  127},
+
+	{"ripscram", 2,  127},
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"",         2,  127},
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"valkyrs",  2,  127},
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"ripdead",  2,  127},
+	{"",         0,  0  },
+	{"",         0,  0  },
+	{"",         0,  0  },
+
+	{"funeral",  2,  127},
+	{"",         2,  127},
+	{"moshop",   3,  64 },
+	{"",         0,  0  },
+
+	{"bornbad",  2,  127},
+	{"hammvox",  2,  127},
+	{"legavox",  2,  127},
+	{"chances",  2,  90 },
 };
 	writeRecord(_ftSeqMusicTable, sizeof(_ftSeqMusicTable), GBVARS_FTSEQMUSICTABLE_INDEX , GBVARS_SCUMM);
 }
 
+static void addDimuseTables_ftSeqNames() {
+ 	imuseFtNames _ftSeqNames[] = {
+	{"SEQ_NULL"           },
+	{"seqLogo"            },
+	{"seqOpenFlick"       },
+	{"seqBartender"       },
+	{"seqBenWakes"        },
+	{"seqPhotoScram"      },
+	{"seqClimbChain"      },
+	{"seqDogChase"        },
+	{"seqDogSquish"       },
+	{"seqDogHoist"        },
+	{"seqCopsArrive"      },
+	{"seqCopsLand"        },
+	{"seqCopsLeave"       },
+	{"seqCopterFlyby"     },
+	{"seqCopterCrash"     },
+	{"seqMoGetsParts"     },
+	{"seqMoFixesBike"     },
+	{"seqFirstGoodbye"    },
+	{"seqCopRoadblock"    },
+	{"seqDivertCops"      },
+	{"seqMurder"          },
+	{"seqCorleyDies"      },
+	{"seqTooLateAtMoes"   },
+	{"seqPicture"         },
+	{"seqNewsReel"        },
+	{"seqCopsInspect"     },
+	{"seqHijack"          },
+	{"seqNestolusAtRanch" },
+	{"seqRipLimo"         },
+	{"seqGorgeTurn"       },
+	{"seqCavefishTalk"    },
+	{"seqArriveCorville"  },
+	{"seqSingleBunny"     },
+	{"seqBunnyArmy"       },
+	{"seqArriveAtMines"   },
+	{"seqArriveAtVultures"},
+	{"seqMakePlan"        },
+	{"seqShowPlan"        },
+	{"seqDerbyStart"      },
+	{"seqLightBales"      },
+	{"seqNestolusBBQ"     },
+	{"seqCallSecurity"    },
+	{"seqFilmFail"        },
+	{"seqFilmBurn"        },
+	{"seqRipSpeech"       },
+	{"seqExposeRip"       },
+	{"seqRipEscape"       },
+	{"seqRareMoment"      },
+	{"seqFanBunnies"      },
+	{"seqRipDead"         },
+	{"seqFuneral"         },
+	{"seqCredits"         }
+};
+	writeRecord(_ftSeqNames, sizeof(_ftSeqNames), GBVARS_FTSEQNAMES_INDEX , GBVARS_SCUMM);
+}
+
 ///////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////
@@ -628,10 +911,10 @@ static void addDimuseTables_ftSeqMusicTable() {
 void addDimuseTables() {
 	addDimuseTables_digStateMusicMap();
 	addDimuseTables_digStateMusicTable();
+	addDimuseTables_digSeqMusicTable();
 	addDimuseTables_comiStateMusicTable();
 	addDimuseTables_comiSeqMusicTable();
-	addDimuseTables_digSeqMusicTable();
 	addDimuseTables_ftStateMusicTable();
 	addDimuseTables_ftSeqMusicTable();
-
+	addDimuseTables_ftSeqNames();
 }
\ No newline at end of file