optimized tables a little

svn-id: r12487

3 files changed, 324 insertions, 326 deletions

diff --git a/scumm/imuse_digi/dimuse.h b/scumm/imuse_digi/dimuse.h
index 58169f02ad..d5965aae29 100644
--- a/scumm/imuse_digi/dimuse.h
+++ b/scumm/imuse_digi/dimuse.h
@@ -155,19 +155,17 @@ struct imuseRoomMap {
 };
 
 struct imuseDigTable {
-	char title[30];
 	int opcode;
 	int soundId;
-	char name[30];
+	char name[20];
 	int param;
 	char filename[13];
 };
 
 struct imuseComiTable {
-	char title[30];
 	int opcode;
 	int soundId;
-	char name[24];
+	char name[20];
 	int param;
 	int hookId;
 	int fadeDelay;
diff --git a/scumm/imuse_digi/dimuse_music.cpp b/scumm/imuse_digi/dimuse_music.cpp
index 6b885dc235..13e9bf9ea9 100644
--- a/scumm/imuse_digi/dimuse_music.cpp
+++ b/scumm/imuse_digi/dimuse_music.cpp
@@ -30,7 +30,7 @@ void IMuseDigital::setDigMusicState(int stateId) {
 
 	for (l = 0; _digStateMusicTable[l].soundId != -1; l++) {
 		if ((_digStateMusicTable[l].soundId == stateId)) {
-			debug(5, "Set music state: %s, %s, %s", _digStateMusicTable[l].name, _digStateMusicTable[l].title, _digStateMusicTable[l].filename);
+			debug(5, "Set music state: %s, %s, %s", _digStateMusicTable[l].name, _digStateMusicTable[l].filename);
 			num = l;
 			break;
 		}
@@ -61,7 +61,7 @@ void IMuseDigital::setDigMusicState(int stateId) {
 		}
 	}
 
-	debug(5, "Set music state: %s, %s, %s", _digStateMusicTable[num].name, _digStateMusicTable[num].title, _digStateMusicTable[num].filename);
+	debug(5, "Set music state: %s, %s, %s", _digStateMusicTable[num].name, _digStateMusicTable[num].filename);
 
 	if (_curMusicState == num)
 		return;
@@ -84,7 +84,7 @@ void IMuseDigital::setDigMusicSequence(int seqId) {
 
 	for (l = 0; _digSeqMusicTable[l].soundId != -1; l++) {
 		if ((_digSeqMusicTable[l].soundId == seqId)) {
-			debug(5, "Set music sequence: %s, %s, %s", _digSeqMusicTable[l].name, _digSeqMusicTable[l].title, _digSeqMusicTable[l].filename);
+			debug(5, "Set music sequence: %s, %s, %s", _digSeqMusicTable[l].name, _digSeqMusicTable[l].filename);
 			num = l;
 			break;
 		}
@@ -187,7 +187,7 @@ void IMuseDigital::setComiMusicState(int stateId) {
 
 	for (l = 0; _comiStateMusicTable[l].soundId != -1; l++) {
 		if ((_comiStateMusicTable[l].soundId == stateId)) {
-			debug(5, "Set music state: %s, %s, %s", _comiStateMusicTable[l].name, _comiStateMusicTable[l].title, _comiStateMusicTable[l].filename);
+			debug(5, "Set music state: %s, %s, %s", _comiStateMusicTable[l].name, _comiStateMusicTable[l].filename);
 			num = l;
 			break;
 		}
@@ -215,7 +215,7 @@ void IMuseDigital::setComiMusicSequence(int seqId) {
 
 	for (l = 0; _comiSeqMusicTable[l].soundId != -1; l++) {
 		if ((_comiSeqMusicTable[l].soundId == seqId)) {
-			debug(5, "Set music sequence: %s, %s, %s", _comiSeqMusicTable[l].name, _comiSeqMusicTable[l].title, _comiSeqMusicTable[l].filename);
+			debug(5, "Set music sequence: %s, %s, %s", _comiSeqMusicTable[l].name, _comiSeqMusicTable[l].filename);
 			num = l;
 			break;
 		}
diff --git a/scumm/imuse_digi/dimuse_tables.cpp b/scumm/imuse_digi/dimuse_tables.cpp
index 53bd400c2b..c1b6703dca 100644
--- a/scumm/imuse_digi/dimuse_tables.cpp
+++ b/scumm/imuse_digi/dimuse_tables.cpp
@@ -152,332 +152,332 @@ const imuseRoomMap _digStateMusicMap[] = {
 };
 
 const imuseDigTable _digStateMusicTable[] = {
-	{"",                     0, 1000, "STATE_NULL",          0, ""},
-	{"",                     0, 1001, "stateNoChange",       0, ""},
-	{"Asteroid (amb-ship)",  3, 1100, "stateAstShip",        2, "ASTERO~1.IMU"},
-	{"Asteroid (amb-close)", 3, 1120, "stateAstClose",       2, "ASTERO~2.IMU"},
-	{"Asteroid (inside)",    3, 1140, "stateAstInside",      0, "ASTERO~3.IMU"},
-	{"Asteroid (core)",      3, 1150, "stateAstCore",        0, "ASTERO~4.IMU"},
-	{"Canyon (close)",       3, 1200, "stateCanyonClose",    0, "CANYON~1.IMU"},
-	{"Canyon (close-m)",     3, 1205, "stateCanyonClose_m",  0, "CANYON~2.IMU"},
-	{"Canyon (over)",        3, 1210, "stateCanyonOver",     0, "CANYON~3.IMU"},
-	{"Canyon (wreck)",       3, 1220, "stateCanyonWreck",    0, "CANYON~4.IMU"},
-	{"Nexus (plan)",         3, 1300, "stateNexusCanyon",   10, "NEXUS(~1.IMU"},
-	{"Nexus (plan)",         3, 1310, "stateNexusPlan",     10, "NEXUS(~1.IMU"},
-	{"Nexus (ramp)",         3, 1320, "stateNexusRamp",     10, "NEXUS(~2.IMU"},
-	{"Nexus (museum)",       3, 1330, "stateNexusMuseum",   10, "NEXUS(~3.IMU"},
-	{"Nexus (map)",          3, 1340, "stateNexusMap",      10, "NEXUS(~4.IMU"},
-	{"Nexus (tomb)",         3, 1350, "stateNexusTomb",     10, "NE3706~5.IMU"},
-	{"Nexus (cath)",         3, 1360, "stateNexusCath",     10, "NE3305~5.IMU"},
-	{"Nexus (airlock)",      3, 1370, "stateNexusAirlock",   0, "NE2D3A~5.IMU"},
-	{"Nexus (power)",        3, 1380, "stateNexusPowerOff",  0, "NE8522~5.IMU"},
-	{"Tram (mu-near)",       3, 1400, "stateMuseumTramNear", 0, "TRAM(M~1.IMU"},
-	{"Tram (mu-far)",        3, 1410, "stateMuseumTramFar",  0, "TRAM(M~2.IMU"},
-	{"Museum (lockup)",      3, 1420, "stateMuseumLockup",   0, "MUSEUM~1.IMU"},
-	{"Museum (amb-pool)",    3, 1433, "stateMuseumPool",    22, "MUSEUM~2.IMU"},
-	{"Museum (amb-spire)",   3, 1436, "stateMuseumSpire",   22, "MUSEUM~3.IMU"},
-	{"Museum (amb-mu)",      3, 1440, "stateMuseumMuseum",  22, "MUSEUM~4.IMU"},
-	{"Museum (library)",     3, 1450, "stateMuseumLibrary",  0, "MUB575~5.IMU"},
-	{"Museum (cavern)",      3, 1460, "stateMuseumCavern",   0, "MUF9BE~5.IMU"},
-	{"Tram (tomb-near)",     3, 1500, "stateTombTramNear",   0, "TRAM(T~1.IMU"},
-	{"Tomb (amb-base)",      3, 1510, "stateTombBase",      28, "TOMB(A~1.IMU"},
-	{"Tomb (amb-spire)",     3, 1520, "stateTombSpire",     28, "TOMB(A~2.IMU"},
-	{"Tomb (amb-cave)",      3, 1530, "stateTombCave",      28, "TOMB(A~3.IMU"},
-	{"Tomb (crypt)",         3, 1540, "stateTombCrypt",     31, "TOMB(C~1.IMU"},
-	{"Tomb (crypt-guards)",  3, 1550, "stateTombGuards",    31, "TOMB(C~2.IMU"},
-	{"Tomb (inner)",         3, 1560, "stateTombInner",      0, "TOMB(I~1.IMU"},
-	{"Tomb (creator 1)",     3, 1570, "stateTombCreator1",   0, "TOMB(C~3.IMU"},
-	{"Tomb (creator 2)",     3, 1580, "stateTombCreator2",   0, "TOMB(C~4.IMU"},
-	{"Tram (plan-near)",     3, 1600, "statePlanTramNear",   0, "TRAM(P~1.IMU"},
-	{"Tram (plan-far)",      3, 1610, "statePlanTramFar",    0, "TRAM(P~2.IMU"},
-	{"Plan (amb-base)",      3, 1620, "statePlanBase",      38, "PLAN(A~1.IMU"},
-	{"Plan (amb-spire)",     3, 1630, "statePlanSpire",     38, "PLAN(A~2.IMU"},
-	{"Plan (dome)",          3, 1650, "statePlanDome",       0, "PLAN(D~1.IMU"},
-	{"Tram (map-near)",      3, 1700, "stateMapTramNear",    0, "TRAM(M~3.IMU"},
-	{"Tram (map-far)",       3, 1710, "stateMapTramFar",     0, "TRAM(M~4.IMU"},
-	{"Map (amb-canyon)",     3, 1720, "stateMapCanyon",     43, "MAP(AM~1.IMU"},
-	{"Map (amb-exposed)",    3, 1730, "stateMapExposed",    43, "MAP(AM~2.IMU"},
-	{"Map (amb-nest)",       3, 1750, "stateMapNestEmpty",  43, "MAP(AM~4.IMU"},
-	{"Map (monster)",        3, 1760, "stateMapNestMonster", 0, "MAP(MO~1.IMU"},
-	{"Map (klein)",          3, 1770, "stateMapKlein",       0, "MAP(KL~1.IMU"},
-	{"Tram (cath-near)",     3, 1800, "stateCathTramNear",   0, "TRAM(C~1.IMU"},
-	{"Tram (cath-far)",      3, 1810, "stateCathTramFar",    0, "TRAM(C~2.IMU"},
-	{"Cath (amb-inside)",    3, 1820, "stateCathLab",       50, "CATH(A~1.IMU"},
-	{"Cath (amb-outside)",   3, 1830, "stateCathOutside",   50, "CATH(A~2.IMU"},
-	{"World (museum)",       3, 1900, "stateWorldMuseum",   52, "WORLD(~1.IMU"},
-	{"World (plan)",         3, 1901, "stateWorldPlan",     52, "WORLD(~2.IMU"},
-	{"World (tomb)",         3, 1902, "stateWorldTomb",     52, "WORLD(~3.IMU"},
-	{"World (map)",          3, 1903, "stateWorldMap",      52, "WORLD(~4.IMU"},
-	{"World (cath)",         3, 1904, "stateWorldCath",     52, "WO3227~5.IMU"},
-	{"Eye 1",                3, 1910, "stateEye1",           0, "EYE1~1.IMU"},
-	{"Eye 2",                3, 1911, "stateEye2",           0, "EYE2~1.IMU"},
-	{"Eye 3",                3, 1912, "stateEye3",           0, "EYE3~1.IMU"},
-	{"Eye 4",                3, 1913, "stateEye4",           0, "EYE4~1.IMU"},
-	{"Eye 5",                3, 1914, "stateEye5",           0, "EYE5~1.IMU"},
-	{"Eye 6",                3, 1915, "stateEye6",           0, "EYE6~1.IMU"},
-	{"Eye 7",                3, 1916, "stateEye7",           0, "EYE7~1.IMU"},
-	{"",                     0,   -1,  "",                   0, ""}
+	{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, ""}
 };
 
 const imuseDigTable _digSeqMusicTable[] = {
-	{"",                       0, 2000, "SEQ_NULL",            0, ""},
-	{"",                       0, 2005, "seqLogo",             0, ""},
-	{"",                       0, 2010, "seqIntro",            0, ""},
-	{"",                       6, 2020, "seqExplosion1b",      0, ""},
-	{"Seq (ast tunnel 1a)",    3, 2030, "seqAstTunnel1a",      0, "SEQ(AS~1.IMU"},
-	{"",                       6, 2031, "seqAstTunnel2b",      0, ""},
-	{"Seq (ast tunnel 3a)",    4, 2032, "seqAstTunnel3a",      0, "SEQ(AS~2.IMU"},
-	{"",                       5, 2040, "seqToPlanet1b",       0, ""},
-	{"Seq (arg begin)",        4, 2045, "seqArgBegin",         0, "SEQ(AR~1.IMU"},
-	{"Seq (arg end)",          4, 2046, "seqArgEnd",           0, "SEQ(AR~2.IMU"},
-	{"Seq (ghost-wreck)",      4, 2050, "seqWreckGhost",       0, "SEQ(GH~1.IMU"},
-	{"Seq (ghost-canyon)",     4, 2060, "seqCanyonGhost",      0, "SEQ(GH~2.IMU"},
-	{"",                       0, 2070, "seqBrinkFall",        0, ""},
-	{"Seq (pan up canyon)",    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, ""},
-	{"Seq (brink's madness)",  4, 2141, "seqBrinkRes2a",       0, "SEQ(BR~1.IMU"},
-	{"Seq (brink's madness)",  3, 2150, "seqLockupEntry",      0, "SEQ(BR~1.IMU"},
-	{"",                       0, 2160, "seqSerpentExplodes",  0, ""},
-	{"Seq (descent)",          4, 2170, "seqSwimUnderwater",   0, "SEQ(DE~1.IMU"},
-	{"Seq (plunge)",           4, 2175, "seqWavesPlunge",      0, "SEQ(PL~1.IMU"},
-	{"",                       0, 2180, "seqCryptOpens",       0, ""},
-	{"",                       0, 2190, "seqGuardsFight",      0, ""},
-	{"Seq (creator res 1.1a)", 3, 2200, "seqCreatorRes1.1a",   0, "SEQ(CR~1.IMU"},
-	{"",                       6, 2201, "seqCreatorRes1.2b",   0, ""},
-	{"",                       6, 2210, "seqMaggieCapture1b",  0, ""},
-	{"Seq (brink's madness)",  3, 2220, "seqStealCrystals",    0, "SEQ(BR~1.IMU"},
-	{"",                       0, 2230, "seqGetByMonster",     0, ""},
-	{"",                       6, 2240, "seqKillMonster1b",    0, ""},
-	{"Seq (creator res 2.1a)", 3, 2250, "seqCreatorRes2.1a",   0, "SEQ(CR~2.IMU"},
-	{"",                       6, 2251, "seqCreatorRes2.2b",   0, ""},
-	{"Seq (creator res 2.3a)", 4, 2252, "seqCreatorRes2.3a",   0, "SEQ(CR~3.IMU"},
-	{"",                       0, 2260, "seqMaggieInsists",    0, ""},
-	{"",                       0, 2270, "seqBrinkHelpCall",    0, ""},
-	{"Seq (brink crevice 1a)", 3, 2280, "seqBrinkCrevice1a",   0, "SEQ(BR~2.IMU"},
-	{"Seq (brink crevice 2a)", 3, 2281, "seqBrinkCrevice2a",   0, "SEQ(BR~3.IMU"},
-	{"",                       6, 2290, "seqCathAccess1b",     0, ""},
-	{"Seq (cath access 2a)",   4, 2291, "seqCathAccess2a",     0, "SEQ(CA~1.IMU"},
-	{"Seq (brink's madness)",  3, 2300, "seqBrinkAtGenerator", 0, "SEQ(BR~1.IMU"},
-	{"",                       6, 2320, "seqFightBrink1b",     0, ""},
-	{"",                       6, 2340, "seqMaggieDies1b",     0, ""},
-	{"",                       6, 2346, "seqMaggieRes1b",      0, ""},
-	{"Seq (maggie res 2a)",    4, 2347, "seqMaggieRes2a",      0, "SEQ(MA~1.IMU"},
-	{"",                       0, 2350, "seqCreatureFalls",    0, ""},
-	{"",                       5, 2360, "seqFinale1b",         0, ""},
-	{"Seq (finale 2a)",        3, 2370, "seqFinale2a",         0, "SEQ(FI~1.IMU"},
-	{"",                       6, 2380, "seqFinale3b1",        0, ""},
-	{"",                       6, 2390, "seqFinale3b2",        0, ""},
-	{"Seq (finale 4a)",        3, 2400, "seqFinale4a",         0, "SEQ(FI~2.IMU"},
-	{"Seq (finale 5a)",        3, 2410, "seqFinale5a",         0, "SEQ(FI~3.IMU"},
-	{"Seq (finale 6a)",        3, 2420, "seqFinale6a",         0, "SEQ(FI~4.IMU"},
-	{"Seq (finale 7a)",        3, 2430, "seqFinale7a",         0, "SE3D2B~5.IMU"},
-	{"",                       6, 2440, "seqFinale8b",         0, ""},
-	{"Seq (finale 9a)",        4, 2450, "seqFinale9a",         0, "SE313B~5.IMU"},
-	{"",                       0,   -1, "",                    0, ""}
+	{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, ""}
 };
 
 const imuseComiTable _comiStateMusicTable[] = {
-	{"",                   0, 1000, "STATE_NULL",         0, 0,    0, ""},
-	{"",                   0, 1001, "stateNoChange",      0, 0,    0, ""},
-	{"1098-Credits1",      3, 1098, "stateCredits1",      0, 0, 1000, "1098-C~1.IMX"},
-	{"1099-Menu",          3, 1099, "stateMenu",          0, 0, 1000, "1099-M~1.IMX"},
-	{"1100-Hold1",         3, 1100, "stateHold1",         4, 0, 1000, "1100-H~1.IMX"},
-	{"1101-Waterline1",    3, 1101, "stateWaterline1",    4, 0, 1000, "1101-W~1.IMX"},
-	{"1102-Hold2",         3, 1102, "stateHold2",         6, 1, 1000, "1102-H~1.IMX"},
-	{"1103-Waterline2",    3, 1103, "stateWaterline2",    6, 0, 1000, "1103-W~1.IMX"},
-	{"1104-Cannon",        3, 1104, "stateCannon",        0, 0, 1000, "1104-C~1.IMX"},
-	{"1105-Treasure",      3, 1105, "stateTreasure",      0, 0, 1000, "1105-T~1.IMX"},
-	{"1200-Fort Base",     3, 1200, "stateFortBase",     10, 1, 1000, "1200-F~1.IMX"},
-	{"1201-Pre-Fort",      3, 1201, "statePreFort",      10, 1, 1000, "1201-P~1.IMX"},
-	{"1202-PreVoo Out",    3, 1202, "statePreVooOut",    12, 0, 1000, "1202-P~1.IMX"},
-	{"1203-PreVoo In",     3, 1203, "statePreVooIn",     12, 0, 1000, "1203-P~1.IMX"},
-	{"1204-PreVoo Lady",   3, 1204, "statePreVooLady",   12, 0, 1000, "1204-P~1.IMX"},
-	{"1205-Voodoo Out",    3, 1205, "stateVoodooOut",     0, 0, 1000, "1205-V~1.IMX"},
-	{"1210-Voodoo In",     3, 1210, "stateVoodooIn",      0, 0, 1000, "1210-V~1.IMX"},
-	{"1210-Voodoo In",    12, 1212, "stateVoodooInAlt",   0, 1,  700, "1210-V~1.IMX"},
-	{"1215-Voodoo Lady",   3, 1215, "stateVoodooLady",    0, 0, 1000, "1215-V~1.IMX"},
-	{"1219-Pre-Map",       3, 1219, "statePrePlundermap", 0, 0, 1000, "1219-P~1.IMX"},
-	{"1220-Plunder Map",   3, 1220, "statePlundermap",    0, 0, 1000, "1220-P~1.IMX"},
-	{"1222-Pre-Cabana",    3, 1222, "statePreCabana",     0, 0, 1000, "1222-P~1.IMX"},
-	{"1223-Cabana",        3, 1223, "stateCabana",        0, 0, 1000, "1223-C~1.IMX"},
-	{"1224-Post-Cabana",   3, 1224, "statePostCabana",   23, 0, 1000, "1224-P~1.IMX"},
-	{"1225-Beach Club",    3, 1225, "stateBeachClub",    23, 0, 1000, "1225-B~1.IMX"},
-	{"1230-Cliff",         3, 1230, "stateCliff",         0, 0, 1000, "1230-C~1.IMX"},
-	{"1232-Belly",         3, 1232, "stateBelly",         0, 0,  800, "1232-B~1.IMX"},
-	{"1235-Quicksand",     3, 1235, "stateQuicksand",     0, 0, 1000, "1235-Q~1.IMX"},
-	{"1240-Danger Beach",  3, 1240, "stateDangerBeach",   0, 0,  800, "1240-D~1.IMX"},
-	{"1240-Danger Beach", 12, 1241, "stateDangerBeachAlt",0, 2,  800, "1240-D~1.IMX"},
-	{"1245-Row Boat",      3, 1245, "stateRowBoat",       0, 0, 1000, "1245-R~1.IMX"},
-	{"1247-Alongside",     3, 1247, "stateAlongside",     0, 0,  800, "1247-A~1.IMX"},
-	{"1247-Alongside",    12, 1248, "stateAlongsideAlt",  0, 1,  800, "1247-A~1.IMX"},
-	{"1250-Chimp Boat",    3, 1250, "stateChimpBoat",     0, 0,  500, "1250-C~1.IMX"},
-	{"1255-Mr Fossey",     3, 1255, "stateMrFossey",      0, 0,  800, "1255-M~1.IMX"},
-	{"1259-Pre-Town",      3, 1259, "statePreTown",       0, 0, 1000, "1259-P~1.IMX"},
-	{"1260-Town",          3, 1260, "stateTown",          0, 0, 1000, "1260-T~1.IMX"},
-	{"1264-Pre-Meadow",    3, 1264, "statePreMeadow",     0, 0, 1000, "1264-P~1.IMX"},
-	{"1265-Meadow",        3, 1265, "stateMeadow",        0, 0, 1000, "1265-M~1.IMX"},
-	{"1266-Meadow Amb",    3, 1266, "stateMeadowAmb",     0, 0, 1000, "1266-M~1.IMX"},
-	{"1270-Wardrobe-Pre",  3, 1270, "stateWardrobePre",  40, 0, 1000, "1270-W~1.IMX"},
-	{"1272-Pre-Show",      3, 1272, "statePreShow",      40, 0, 1000, "1272-P~1.IMX"},
-	{"1274-Wardrobe-Show", 3, 1274, "stateWardrobeShow", 42, 0, 1000, "1274-W~1.IMX"},
-	{"1276-Show",          3, 1276, "stateShow",         42, 0, 1000, "1276-S~1.IMX"},
-	{"1277-Wardrobe-Jug",  3, 1277, "stateWardrobeJug",  44, 0, 1000, "1277-W~1.IMX"},
-	{"1278-Juggling",      3, 1278, "stateJuggling",     44, 0, 1000, "1278-J~1.IMX"},
-	{"1279-Post-Show",     3, 1279, "statePostShow",      0, 0, 1000, "1279-P~1.IMX"},
-	{"1280-Chicken Shop",  3, 1280, "stateChickenShop",   0, 0, 1000, "1280-C~1.IMX"},
-	{"1285-Barber Shop",   3, 1285, "stateBarberShop",   48, 0, 1000, "1285-B~1.IMX"},
-	{"1286-Van Helgen",    3, 1286, "stateVanHelgen",    48, 0, 1000, "1286-V~1.IMX"},
-	{"1287-Bill",          3, 1287, "stateBill",         48, 0, 1000, "1287-B~1.IMX"},
-	{"1288-Haggis",        3, 1288, "stateHaggis",       48, 0, 1000, "1288-H~1.IMX"},
-	{"1289-Rottingham",    3, 1289, "stateRottingham",   48, 0, 1000, "1289-R~1.IMX"},
-	{"1305-Deck",          3, 1305, "stateDeck",          0, 0, 1000, "1305-D~1.IMX"},
-	{"1310-Combat Map",    3, 1310, "stateCombatMap",     0, 0, 1000, "1310-C~1.IMX"},
-	{"1320-Ship Combat",   3, 1320, "stateShipCombat",    0, 0, 1000, "1320-S~1.IMX"},
-	{"1325-Swordfight",    3, 1325, "stateSwordfight",    0, 0, 1000, "1325-S~1.IMX"},
-	{"1327-Sword Rott",    3, 1327, "stateSwordRott",     0, 0, 1000, "1327-S~1.IMX"},
-	{"1330-Town Edge",     3, 1330, "stateTownEdge",      0, 0, 1000, "1330-T~1.IMX"},
-	{"1335-Sword Lose",    3, 1335, "stateSwordLose",     0, 0, 1000, "1335-S~1.IMX"},
-	{"1340-Sword Win",     3, 1340, "stateSwordWin",      0, 0, 1000, "1340-S~1.IMX"},
-	{"1345-Get Map",       3, 1345, "stateGetMap",        0, 0, 1000, "1345-G~1.IMX"},
-	{"1400-Wreck Beach",   3, 1400, "stateWreckBeach",    0, 0, 1000, "1400-W~1.IMX"},
-	{"1405-Blood Map",     3, 1405, "stateBloodMap",     63, 0, 1000, "1405-B~1.IMX"},
-	{"1410-Clearing",      3, 1410, "stateClearing",      0, 0, 1000, "1410-C~1.IMX"},
-	{"1415-Lighthouse",    3, 1415, "stateLighthouse",   63, 0, 1000, "1415-L~1.IMX"},
-	{"1420-Village",       3, 1420, "stateVillage",      66, 0, 1000, "1420-V~1.IMX"},
-	{"1423-Volcano",       3, 1423, "stateVolcano",      66, 0, 1000, "1423-V~1.IMX"},
-	{"1425-Altar",         3, 1425, "stateAltar",        66, 0, 1000, "1425-A~1.IMX"},
-	{"1430-Hotel Out",     3, 1430, "stateHotelOut",      0, 0, 1000, "1430-H~1.IMX"},
-	{"1435-Hotel Bar",     3, 1435, "stateHotelBar",     70, 0, 1000, "1435-H~1.IMX"},
-	{"1440-Hotel In",      3, 1440, "stateHotelIn",      70, 0, 1000, "1440-H~1.IMX"},
-	{"1445-Tarot Lady",    3, 1445, "stateTarotLady",    70, 0, 1000, "1445-T~1.IMX"},
-	{"1447-Goodsoup",      3, 1447, "stateGoodsoup",     70, 0, 1000, "1447-G~1.IMX"},
-	{"1448-Guest Room",    3, 1448, "stateGuestRoom",     0, 0, 1000, "1448-G~1.IMX"},
-	{"1450-Windmill",      3, 1450, "stateWindmill",     63, 0, 1000, "1450-W~1.IMX"},
-	{"1455-Cemetary",      3, 1455, "stateCemetary",      0, 0, 1000, "1455-C~1.IMX"},
-	{"1460-Crypt",         3, 1460, "stateCrypt",        77, 0, 1000, "1460-C~1.IMX"},
-	{"1463-Gravedigger",   3, 1463, "stateGraveDigger",  77, 0, 1000, "1463-G~1.IMX"},
-	{"1465-Monkey1",       3, 1465, "stateMonkey1",       0, 0, 1000, "1465-M~1.IMX"},
-	{"1475-Stan Dark",     3, 1475, "stateStanDark",      0, 0, 1000, "1475-S~1.IMX"},
-	{"1477-Stan",          3, 1477, "stateStanLight",     0, 0, 1000, "1477-S~1.IMX"},
-	{"1480-Egg Beach",     3, 1480, "stateEggBeach",     63, 0, 1000, "1480-E~1.IMX"},
-	{"1485-Skull Island",  3, 1485, "stateSkullIsland",   0, 0, 1000, "1485-S~1.IMX"},
-	{"1490-Smugglers",     3, 1490, "stateSmugglersCave", 0, 0, 1000, "1490-S~1.IMX"},
-	{"1500-Le Talk",       3, 1500, "stateLeChuckTalk",   0, 0, 1000, "1500-L~1.IMX"},
-	{"1505-Carnival",      3, 1505, "stateCarnival",      0, 0, 1000, "1505-C~1.IMX"},
-	{"1511-Hang",          3, 1511, "stateHang",         87, 0, 1000, "1511-H~1.IMX"},
-	{"1512-Rum",           3, 1512, "stateRum",          87, 0, 1000, "1512-RUM.IMX"},
-	{"1513-Torture",       3, 1513, "stateTorture",      87, 0, 1000, "1513-T~1.IMX"},
-	{"1514-Snow",          3, 1514, "stateSnow",         87, 0, 1000, "1514-S~1.IMX"},
-	{"1515-Credits (end)", 3, 1515, "stateCredits",       0, 0, 1000, "1515-C~1.IMX"},
-	{"1520-Carn Amb",      3, 1520, "stateCarnAmb",       0, 0, 1000, "1520-C~1.IMX"},
-	{"",                   0,   -1, "",                   0, 0,    0, ""}
+	{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, ""}
 };
 
 const imuseComiTable _comiSeqMusicTable[] = {
-	{"",                   0, 2000, "SEQ_NULL",        0, 0,    0, ""},
-	{"",                   0, 2100, "seqINTRO",        0, 0,    0, ""},
-	{"2105-Interlude1",    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, ""},
-	{"2200-Interlude2",    3, 2200, "seqInterlude2",   0, 0, 1000, "2200-I~1.IMX"},
-	{"2210-Kidnapped",     3, 2210, "seqKidnapped",    0, 0, 1000, "2210-K~1.IMX"},
-	{"",                   8, 2220, "seqSnakeVomits",  0, 1,    0, ""},
-	{"",                   8, 2222, "seqPopBalloon",   0, 1,    0, ""},
-	{"2225-Drop Balls",    3, 2225, "seqDropBalls",    0, 0, 1000, "2225-D~1.IMX"},
-	{"2232-Arrive Barber", 4, 2232, "seqArriveBarber", 0, 0, 1000, "2232-A~1.IMX"},
-	{"2233-Atonal",        3, 2233, "seqAtonal",       0, 0, 1000, "2233-A~1.IMX"},
-	{"2235-Shave Head",    3, 2235, "seqShaveHead1",   0, 0, 1000, "2235-S~1.IMX"},
-	{"2235-Shave Head",    2, 2236, "seqShaveHead2",   0, 2, 1000, "2235-S~1.IMX"},
-	{"2245-Caber Lose",    3, 2245, "seqCaberLose",    0, 0, 1000, "2245-C~1.IMX"},
-	{"2250-Caber Win",     3, 2250, "seqCaberWin",     0, 0, 1000, "2250-C~1.IMX"},
-	{"2255-Duel",          3, 2255, "seqDuel1",        0, 0, 1000, "2255-D~1.IMX"},
-	{"2255-Duel",          2, 2256, "seqDuel2",        0, 2, 1000, "2255-D~1.IMX"},
-	{"2255-Duel",          2, 2257, "seqDuel3",        0, 3, 1000, "2255-D~1.IMX"},
-	{"2260-Blow Up Tree",  3, 2260, "seqBlowUpTree1",  0, 0, 1000, "2260-B~1.IMX"},
-	{"2260-Blow Up Tree",  2, 2261, "seqBlowUpTree2",  0, 2, 1000, "2260-B~1.IMX"},
-	{"2275-Monkeys",       3, 2275, "seqMonkeys",      0, 0, 1000, "2275-M~1.IMX"},
-	{"",                   9, 2277, "seqAttack",       0, 1,    0, ""},
-	{"2285-Sharks",        3, 2285, "seqSharks",       0, 0, 1000, "2285-S~1.IMX"},
-	{"2287-Towel Walk",    3, 2287, "seqTowelWalk",    0, 0, 1000, "2287-T~1.IMX"},
-	{"",                   0, 2293, "seqNICE_BOOTS",   0, 0,    0, ""},
-	{"",                   0, 2295, "seqBIG_BONED",    0, 0,    0, ""},
-	{"2300-To Blood",      3, 2300, "seqToBlood",      0, 0, 1000, "2300-T~1.IMX"},
-	{"2301-Interlude3",    3, 2301, "seqInterlude3",   0, 0, 1000, "2301-I~1.IMX"},
-	{"2302-Rott Attack",   3, 2302, "seqRott1",        0, 0, 1000, "2302-R~1.IMX"},
-	{"2302-Rott Attack",   2, 2304, "seqRott2",        0, 2, 1000, "2302-R~1.IMX"},
-	{"2302-Rott Attack",   2, 2305, "seqRott2b",       0,21, 1000, "2302-R~1.IMX"},
-	{"2302-Rott Attack",   2, 2306, "seqRott3",        0, 3, 1000, "2302-R~1.IMX"},
-	{"2302-Rott Attack",   2, 2308, "seqRott4",        0, 4, 1000, "2302-R~1.IMX"},
-	{"2302-Rott Attack",   2, 2309, "seqRott5",        0, 5, 1000, "2302-R~1.IMX"},
-	{"2311-Song",          3, 2311, "seqVerse1",       0, 0, 1000, "2311-S~1.IMX"},
-	{"2311-Song",          2, 2312, "seqVerse2",       0, 2, 1000, "2311-S~1.IMX"},
-	{"2311-Song",          2, 2313, "seqVerse3",       0, 3, 1000, "2311-S~1.IMX"},
-	{"2311-Song",          2, 2314, "seqVerse4",       0, 4, 1000, "2311-S~1.IMX"},
-	{"2311-Song",          2, 2315, "seqVerse5",       0, 5, 1000, "2311-S~1.IMX"},
-	{"2311-Song",          2, 2316, "seqVerse6",       0, 6, 1000, "2311-S~1.IMX"},
-	{"2311-Song",          2, 2317, "seqVerse7",       0, 7, 1000, "2311-S~1.IMX"},
-	{"2311-Song",          2, 2318, "seqVerse8",       0, 8, 1000, "2311-S~1.IMX"},
-	{"2311-Song",          2, 2319, "seqSongEnd",      0, 9, 1000, "2311-S~1.IMX"},
-	{"2336-Riposte Lose",  2, 2336, "seqRiposteLose",  0, 0, 1000, "2336-R~1.IMX"},
-	{"2337-Riposte Win",   2, 2337, "seqRiposteWin",   0, 0, 1000, "2337-R~1.IMX"},
-	{"2338-Insult Lose",   2, 2338, "seqInsultLose",   0, 0, 1000, "2338-I~1.IMX"},
-	{"2339-Insult Win",    2, 2339, "seqInsultWin",    0, 0, 1000, "2339-I~1.IMX"},
-	{"1335-Sword Lose",    3, 2340, "seqSwordLose",    0, 0, 1000, "1335-S~1.IMX"},
-	{"1340-Sword Win",     3, 2345, "seqSwordWin",     0, 0, 1000, "1340-S~1.IMX"},
-	{"1345-Get Map",       3, 2347, "seqGetMap",       0, 0, 1000, "1345-G~1.IMX"},
-	{"2400-Interlude4",    3, 2400, "seqInterlude4",   0, 0, 1000, "2400-I~1.IMX"},
-	{"",                   0, 2405, "seqSHIPWRECK",    0, 0,    0, ""},
-	{"2408-Fake Credits",  3, 2408, "seqFakeCredits",  0, 0, 1000, "2408-F~1.IMX"},
-	{"2410-Pass Out",      3, 2410, "seqPassOut",      0, 0, 1000, "2410-P~1.IMX"},
-	{"2414-Ghost Talk",    3, 2414, "seqGhostTalk",    0, 0, 1000, "2414-G~1.IMX"},
-	{"2414-Ghost Talk",    2, 2415, "seqGhostWedding", 0, 1, 1000, "2414-G~1.IMX"},
-	{"2420-Eruption",      3, 2420, "seqEruption",     0, 0, 1000, "2420-E~1.IMX"},
-	{"2425-Sacrifice",     3, 2425, "seqSacrifice",    0, 0, 1000, "2425-S~1.IMX"},
-	{"2425-Sacrifice",     2, 2426, "seqSacrificeEnd", 0, 1, 1000, "2425-S~1.IMX"},
-	{"2430-Scare Digger",  3, 2430, "seqScareDigger",  0, 0, 1000, "2430-S~1.IMX"},
-	{"2445-Skull Arrive",  3, 2445, "seqSkullArrive",  0, 0, 1000, "2445-S~1.IMX"},
-	{"2450-Cliff Fall",    3, 2450, "seqFloat",        0, 0, 1000, "2450-C~1.IMX"},
-	{"2450-Cliff Fall",    2, 2451, "seqFall",         0, 1, 1000, "2450-C~1.IMX"},
-	{"2450-Cliff Fall",    2, 2452, "seqUmbrella",     0, 0, 1000, "2450-C~1.IMX"},
-	{"2460-Fight",         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, ""},
-	{"2500-Interlude5",    3, 2500, "seqInterlude5",   0, 0, 1000, "2500-I~1.IMX"},
-	{"2502-Exit Skycar",   3, 2502, "seqExitSkycar",   0, 0, 1000, "2502-E~1.IMX"},
-	{"2504-Grow",          3, 2504, "seqGrow1",        0, 0, 1000, "2504-G~1.IMX"},
-	{"2504-Grow",          2, 2505, "seqGrow2",        0, 1, 1000, "2504-G~1.IMX"},
-	{"2508-Interlude6",    3, 2508, "seqInterlude6",   0, 0, 1000, "2508-I~1.IMX"},
-	{"",                   0, 2515, "seqFINALE",       0, 0,    0, ""},
-	{"2520-Out",           3, 2520, "seqOut",          0, 0, 1000, "2520-OUT.IMX"},
-	{"2530-Zap1",          3, 2530, "seqZap1a",        0, 0, 1000, "2530-Z~1.IMX"},
-	{"2530-Zap1",          2, 2531, "seqZap1b",        0, 1, 1000, "2530-Z~1.IMX"},
-	{"2530-Zap1",          2, 2532, "seqZap1c",        0, 2, 1000, "2530-Z~1.IMX"},
-	{"2540-Zap2",          2, 2540, "seqZap2a",        0, 0, 1000, "2540-Z~1.IMX"},
-	{"2540-Zap2",          2, 2541, "seqZap2b",        0, 1, 1000, "2540-Z~1.IMX"},
-	{"2540-Zap2",          2, 2542, "seqZap2c",        0, 2, 1000, "2540-Z~1.IMX"},
-	{"2550-Zap3",          3, 2550, "seqZap3a",        0, 0, 1000, "2550-Z~1.IMX"},
-	{"2550-Zap3",          2, 2551, "seqZap3b",        0, 1, 1000, "2550-Z~1.IMX"},
-	{"2550-Zap3",          2, 2552, "seqZap3c",        0, 2, 1000, "2550-Z~1.IMX"},
-	{"2560-Zap4",          3, 2560, "seqZap4a",        0, 0, 1000, "2560-Z~1.IMX"},
-	{"2560-Zap4",          2, 2561, "seqZap4b",        0, 1, 1000, "2560-Z~1.IMX"},
-	{"2560-Zap4",          2, 2562, "seqZap4c",        0, 2, 1000, "2560-Z~1.IMX"},
-	{"",                   0,   -1, "",                0, 0,    0, ""}
+	{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, ""}
 };
 
 const imuseFtStateTable _ftStateMusicTable[] = {