fixed fade out delay

svn-id: r13373

3 files changed, 172 insertions, 172 deletions

diff --git a/scumm/imuse_digi/dimuse.h b/scumm/imuse_digi/dimuse.h
index 651985ae41..cc030bc321 100644
--- a/scumm/imuse_digi/dimuse.h
+++ b/scumm/imuse_digi/dimuse.h
@@ -178,7 +178,7 @@ struct imuseComiTable {
 	char name[20];
 	byte param;
 	byte hookId;
-	int16 fadeDelay;
+	int16 fadeOut60TicksDelay;
 	char filename[13];
 };
 
diff --git a/scumm/imuse_digi/dimuse_music.cpp b/scumm/imuse_digi/dimuse_music.cpp
index 711013e843..acc31ed529 100644
--- a/scumm/imuse_digi/dimuse_music.cpp
+++ b/scumm/imuse_digi/dimuse_music.cpp
@@ -306,17 +306,17 @@ void IMuseDigital::playComiMusic(const char *songName, const imuseComiTable *tab
 			setFade(table->soundId, 127, 120);
 			break;
 		case 2:
-			fadeOutMusic(table->fadeDelay);
+			fadeOutMusic(table->fadeOut60TicksDelay);
 			startMusic(table->filename, table->soundId, table->hookId, 127);
 			break;
 		case 3:
 			if ((!sequence) && (table->param != 0)) {
 				if (table->param == _comiStateMusicTable[_curMusicState].param) {
-					fadeOutMusic(table->fadeDelay);
+					fadeOutMusic(table->fadeOut60TicksDelay);
 					startMusic(table->filename, table->soundId, 0, 127);
 				}
 			} else {
-				fadeOutMusic(table->fadeDelay);
+				fadeOutMusic(table->fadeOut60TicksDelay);
 				startMusic(table->filename, table->soundId, hookId, 127);
 			}
 			break;
@@ -325,7 +325,7 @@ void IMuseDigital::playComiMusic(const char *songName, const imuseComiTable *tab
 			startMusic(table->filename, table->soundId, table->hookId, 127);
 			break;
 		case 12:
-			fadeOutMusic(table->fadeDelay);
+			fadeOutMusic(table->fadeOut60TicksDelay);
 			startMusic(table->filename, table->soundId, table->hookId, 127);
 			break;
 	}
diff --git a/scumm/imuse_digi/dimuse_tables.cpp b/scumm/imuse_digi/dimuse_tables.cpp
index a4b2c60d1a..f683ccd01d 100644
--- a/scumm/imuse_digi/dimuse_tables.cpp
+++ b/scumm/imuse_digi/dimuse_tables.cpp
@@ -152,7 +152,7 @@ const imuseRoomMap _digStateMusicMap[] = {
 };
 
 const imuseDigTable _digStateMusicTable[] = {
-	{0, 1000, "STATE_NULL",          0, 0, ""},
+	{0,   60, "STATE_NULL",          0, 0, ""},
 	{0, 1001, "stateNoChange",       0, 0, ""},
 	{3, 1100, "stateAstShip",        2, 0, "ASTERO~1.IMU"},
 	{3, 1120, "stateAstClose",       2, 0, "ASTERO~2.IMU"},
@@ -293,190 +293,190 @@ const imuseDigTable _digSeqMusicTable[] = {
 const 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"},
+	{3, 1098, "stateCredits1",      0, 0,   60, "1098-C~1.IMX"},
+	{3, 1099, "stateMenu",          0, 0,   60, "1099-M~1.IMX"},
+	{3, 1100, "stateHold1",         4, 0,   60, "1100-H~1.IMX"},
+	{3, 1101, "stateWaterline1",    4, 0,   60, "1101-W~1.IMX"},
+	{3, 1102, "stateHold2",         6, 1,   60, "1102-H~1.IMX"},
+	{3, 1103, "stateWaterline2",    6, 0,   60, "1103-W~1.IMX"},
+	{3, 1104, "stateCannon",        0, 0,   60, "1104-C~1.IMX"},
+	{3, 1105, "stateTreasure",      0, 0,   60, "1105-T~1.IMX"},
+	{3, 1200, "stateFortBase",     10, 1,   60, "1200-F~1.IMX"},
+	{3, 1201, "statePreFort",      10, 1,   60, "1201-P~1.IMX"},
+	{3, 1202, "statePreVooOut",    12, 0,   60, "1202-P~1.IMX"},
+	{3, 1203, "statePreVooIn",     12, 0,   60, "1203-P~1.IMX"},
+	{3, 1204, "statePreVooLady",   12, 0,   60, "1204-P~1.IMX"},
+	{3, 1205, "stateVoodooOut",     0, 0,   60, "1205-V~1.IMX"},
+	{3, 1210, "stateVoodooIn",      0, 0,   60, "1210-V~1.IMX"},
+	{12,1212, "stateVoodooInAlt",   0, 1,   42, "1210-V~1.IMX"},
+	{3, 1215, "stateVoodooLady",    0, 0,   60, "1215-V~1.IMX"},
+	{3, 1219, "statePrePlundermap", 0, 0,   60, "1219-P~1.IMX"},
+	{3, 1220, "statePlundermap",    0, 0,   60, "1220-P~1.IMX"},
+	{3, 1222, "statePreCabana",     0, 0,   60, "1222-P~1.IMX"},
+	{3, 1223, "stateCabana",        0, 0,   60, "1223-C~1.IMX"},
+	{3, 1224, "statePostCabana",   23, 0,   60, "1224-P~1.IMX"},
+	{3, 1225, "stateBeachClub",    23, 0,   60, "1225-B~1.IMX"},
+	{3, 1230, "stateCliff",         0, 0,   60, "1230-C~1.IMX"},
+	{3, 1232, "stateBelly",         0, 0,   48, "1232-B~1.IMX"},
+	{3, 1235, "stateQuicksand",     0, 0,   60, "1235-Q~1.IMX"},
+	{3, 1240, "stateDangerBeach",   0, 0,   48, "1240-D~1.IMX"},
+	{12,1241, "stateDangerBeachAlt",0, 2,   48, "1240-D~1.IMX"},
+	{3, 1245, "stateRowBoat",       0, 0,   60, "1245-R~1.IMX"},
+	{3, 1247, "stateAlongside",     0, 0,   48, "1247-A~1.IMX"},
+	{12,1248, "stateAlongsideAlt",  0, 1,   48, "1247-A~1.IMX"},
+	{3, 1250, "stateChimpBoat",     0, 0,   30, "1250-C~1.IMX"},
+	{3, 1255, "stateMrFossey",      0, 0,   48, "1255-M~1.IMX"},
+	{3, 1259, "statePreTown",       0, 0,   60, "1259-P~1.IMX"},
+	{3, 1260, "stateTown",          0, 0,   60, "1260-T~1.IMX"},
+	{3, 1264, "statePreMeadow",     0, 0,   60, "1264-P~1.IMX"},
+	{3, 1265, "stateMeadow",        0, 0,   60, "1265-M~1.IMX"},
+	{3, 1266, "stateMeadowAmb",     0, 0,   60, "1266-M~1.IMX"},
+	{3, 1270, "stateWardrobePre",  40, 0,   60, "1270-W~1.IMX"},
+	{3, 1272, "statePreShow",      40, 0,   60, "1272-P~1.IMX"},
+	{3, 1274, "stateWardrobeShow", 42, 0,   60, "1274-W~1.IMX"},
+	{3, 1276, "stateShow",         42, 0,   60, "1276-S~1.IMX"},
+	{3, 1277, "stateWardrobeJug",  44, 0,   60, "1277-W~1.IMX"},
+	{3, 1278, "stateJuggling",     44, 0,   60, "1278-J~1.IMX"},
+	{3, 1279, "statePostShow",      0, 0,   60, "1279-P~1.IMX"},
+	{3, 1280, "stateChickenShop",   0, 0,   60, "1280-C~1.IMX"},
+	{3, 1285, "stateBarberShop",   48, 0,   60, "1285-B~1.IMX"},
+	{3, 1286, "stateVanHelgen",    48, 0,   60, "1286-V~1.IMX"},
+	{3, 1287, "stateBill",         48, 0,   60, "1287-B~1.IMX"},
+	{3, 1288, "stateHaggis",       48, 0,   60, "1288-H~1.IMX"},
+	{3, 1289, "stateRottingham",   48, 0,   60, "1289-R~1.IMX"},
+	{3, 1305, "stateDeck",          0, 0,   60, "1305-D~1.IMX"},
+	{3, 1310, "stateCombatMap",     0, 0,   60, "1310-C~1.IMX"},
+	{3, 1320, "stateShipCombat",    0, 0,   60, "1320-S~1.IMX"},
+	{3, 1325, "stateSwordfight",    0, 0,   60, "1325-S~1.IMX"},
+	{3, 1327, "stateSwordRott",     0, 0,   60, "1327-S~1.IMX"},
+	{3, 1330, "stateTownEdge",      0, 0,   60, "1330-T~1.IMX"},
+	{3, 1335, "stateSwordLose",     0, 0,   60, "1335-S~1.IMX"},
+	{3, 1340, "stateSwordWin",      0, 0,   60, "1340-S~1.IMX"},
+	{3, 1345, "stateGetMap",        0, 0,   60, "1345-G~1.IMX"},
+	{3, 1400, "stateWreckBeach",    0, 0,   60, "1400-W~1.IMX"},
+	{3, 1405, "stateBloodMap",     63, 0,   60, "1405-B~1.IMX"},
+	{3, 1410, "stateClearing",      0, 0,   60, "1410-C~1.IMX"},
+	{3, 1415, "stateLighthouse",   63, 0,   60, "1415-L~1.IMX"},
+	{3, 1420, "stateVillage",      66, 0,   60, "1420-V~1.IMX"},
+	{3, 1423, "stateVolcano",      66, 0,   60, "1423-V~1.IMX"},
+	{3, 1425, "stateAltar",        66, 0,   60, "1425-A~1.IMX"},
+	{3, 1430, "stateHotelOut",      0, 0,   60, "1430-H~1.IMX"},
+	{3, 1435, "stateHotelBar",     70, 0,   60, "1435-H~1.IMX"},
+	{3, 1440, "stateHotelIn",      70, 0,   60, "1440-H~1.IMX"},
+	{3, 1445, "stateTarotLady",    70, 0,   60, "1445-T~1.IMX"},
+	{3, 1447, "stateGoodsoup",     70, 0,   60, "1447-G~1.IMX"},
+	{3, 1448, "stateGuestRoom",     0, 0,   60, "1448-G~1.IMX"},
+	{3, 1450, "stateWindmill",     63, 0,   60, "1450-W~1.IMX"},
+	{3, 1455, "stateCemetary",      0, 0,   60, "1455-C~1.IMX"},
+	{3, 1460, "stateCrypt",        77, 0,   60, "1460-C~1.IMX"},
+	{3, 1463, "stateGraveDigger",  77, 0,   60, "1463-G~1.IMX"},
+	{3, 1465, "stateMonkey1",       0, 0,   60, "1465-M~1.IMX"},
+	{3, 1475, "stateStanDark",      0, 0,   60, "1475-S~1.IMX"},
+	{3, 1477, "stateStanLight",     0, 0,   60, "1477-S~1.IMX"},
+	{3, 1480, "stateEggBeach",     63, 0,   60, "1480-E~1.IMX"},
+	{3, 1485, "stateSkullIsland",   0, 0,   60, "1485-S~1.IMX"},
+	{3, 1490, "stateSmugglersCave", 0, 0,   60, "1490-S~1.IMX"},
+	{3, 1500, "stateLeChuckTalk",   0, 0,   60, "1500-L~1.IMX"},
+	{3, 1505, "stateCarnival",      0, 0,   60, "1505-C~1.IMX"},
+	{3, 1511, "stateHang",         87, 0,   60, "1511-H~1.IMX"},
+	{3, 1512, "stateRum",          87, 0,   60, "1512-RUM.IMX"},
+	{3, 1513, "stateTorture",      87, 0,   60, "1513-T~1.IMX"},
+	{3, 1514, "stateSnow",         87, 0,   60, "1514-S~1.IMX"},
+	{3, 1515, "stateCredits",       0, 0,   60, "1515-C~1.IMX"},
+	{3, 1520, "stateCarnAmb",       0, 0,   60, "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, ""},
-	{3, 2105, "seqInterlude1",   0, 0, 1000, "2105-I~1.IMX"},
+	{3, 2105, "seqInterlude1",   0, 0,   60, "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"},
+	{0, 2120, "seqCURSED_RING",  0, 0,   60, ""},
+	{3, 2200, "seqInterlude2",   0, 0,   60, "2200-I~1.IMX"},
+	{3, 2210, "seqKidnapped",    0, 0,   60, "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"},
+	{3, 2225, "seqDropBalls",    0, 0,   60, "2225-D~1.IMX"},
+	{4, 2232, "seqArriveBarber", 0, 0,   60, "2232-A~1.IMX"},
+	{3, 2233, "seqAtonal",       0, 0,   60, "2233-A~1.IMX"},
+	{3, 2235, "seqShaveHead1",   0, 0,   60, "2235-S~1.IMX"},
+	{2, 2236, "seqShaveHead2",   0, 2,   60, "2235-S~1.IMX"},
+	{3, 2245, "seqCaberLose",    0, 0,   60, "2245-C~1.IMX"},
+	{3, 2250, "seqCaberWin",     0, 0,   60, "2250-C~1.IMX"},
+	{3, 2255, "seqDuel1",        0, 0,   60, "2255-D~1.IMX"},
+	{2, 2256, "seqDuel2",        0, 2,   60, "2255-D~1.IMX"},
+	{2, 2257, "seqDuel3",        0, 3,   60, "2255-D~1.IMX"},
+	{3, 2260, "seqBlowUpTree1",  0, 0,   60, "2260-B~1.IMX"},
+	{2, 2261, "seqBlowUpTree2",  0, 2,   60, "2260-B~1.IMX"},
+	{3, 2275, "seqMonkeys",      0, 0,   60, "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"},
+	{3, 2285, "seqSharks",       0, 0,   60, "2285-S~1.IMX"},
+	{3, 2287, "seqTowelWalk",    0, 0,   60, "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"},
+	{3, 2300, "seqToBlood",      0, 0,   60, "2300-T~1.IMX"},
+	{3, 2301, "seqInterlude3",   0, 0,   60, "2301-I~1.IMX"},
+	{3, 2302, "seqRott1",        0, 0,   60, "2302-R~1.IMX"},
+	{2, 2304, "seqRott2",        0, 2,   60, "2302-R~1.IMX"},
+	{2, 2305, "seqRott2b",       0,21,   60, "2302-R~1.IMX"},
+	{2, 2306, "seqRott3",        0, 3,   60, "2302-R~1.IMX"},
+	{2, 2308, "seqRott4",        0, 4,   60, "2302-R~1.IMX"},
+	{2, 2309, "seqRott5",        0, 5,   60, "2302-R~1.IMX"},
+	{3, 2311, "seqVerse1",       0, 0,   60, "2311-S~1.IMX"},
+	{2, 2312, "seqVerse2",       0, 2,   60, "2311-S~1.IMX"},
+	{2, 2313, "seqVerse3",       0, 3,   60, "2311-S~1.IMX"},
+	{2, 2314, "seqVerse4",       0, 4,   60, "2311-S~1.IMX"},
+	{2, 2315, "seqVerse5",       0, 5,   60, "2311-S~1.IMX"},
+	{2, 2316, "seqVerse6",       0, 6,   60, "2311-S~1.IMX"},
+	{2, 2317, "seqVerse7",       0, 7,   60, "2311-S~1.IMX"},
+	{2, 2318, "seqVerse8",       0, 8,   60, "2311-S~1.IMX"},
+	{2, 2319, "seqSongEnd",      0, 9,   60, "2311-S~1.IMX"},
+	{2, 2336, "seqRiposteLose",  0, 0,   60, "2336-R~1.IMX"},
+	{2, 2337, "seqRiposteWin",   0, 0,   60, "2337-R~1.IMX"},
+	{2, 2338, "seqInsultLose",   0, 0,   60, "2338-I~1.IMX"},
+	{2, 2339, "seqInsultWin",    0, 0,   60, "2339-I~1.IMX"},
+	{3, 2340, "seqSwordLose",    0, 0,   60, "1335-S~1.IMX"},
+	{3, 2345, "seqSwordWin",     0, 0,   60, "1340-S~1.IMX"},
+	{3, 2347, "seqGetMap",       0, 0,   60, "1345-G~1.IMX"},
+	{3, 2400, "seqInterlude4",   0, 0,   60, "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"},
+	{3, 2408, "seqFakeCredits",  0, 0,   60, "2408-F~1.IMX"},
+	{3, 2410, "seqPassOut",      0, 0,   60, "2410-P~1.IMX"},
+	{3, 2414, "seqGhostTalk",    0, 0,   60, "2414-G~1.IMX"},
+	{2, 2415, "seqGhostWedding", 0, 1,   60, "2414-G~1.IMX"},
+	{3, 2420, "seqEruption",     0, 0,   60, "2420-E~1.IMX"},
+	{3, 2425, "seqSacrifice",    0, 0,   60, "2425-S~1.IMX"},
+	{2, 2426, "seqSacrificeEnd", 0, 1,   60, "2425-S~1.IMX"},
+	{3, 2430, "seqScareDigger",  0, 0,   60, "2430-S~1.IMX"},
+	{3, 2445, "seqSkullArrive",  0, 0,   60, "2445-S~1.IMX"},
+	{3, 2450, "seqFloat",        0, 0,   60, "2450-C~1.IMX"},
+	{2, 2451, "seqFall",         0, 1,   60, "2450-C~1.IMX"},
+	{2, 2452, "seqUmbrella",     0, 0,   60, "2450-C~1.IMX"},
+	{3, 2460, "seqFight",        0, 0,   60, "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"},
+	{3, 2500, "seqInterlude5",   0, 0,   60, "2500-I~1.IMX"},
+	{3, 2502, "seqExitSkycar",   0, 0,   60, "2502-E~1.IMX"},
+	{3, 2504, "seqGrow1",        0, 0,   60, "2504-G~1.IMX"},
+	{2, 2505, "seqGrow2",        0, 1,   60, "2504-G~1.IMX"},
+	{3, 2508, "seqInterlude6",   0, 0,   60, "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"},
+	{3, 2520, "seqOut",          0, 0,   60, "2520-OUT.IMX"},
+	{3, 2530, "seqZap1a",        0, 0,   60, "2530-Z~1.IMX"},
+	{2, 2531, "seqZap1b",        0, 1,   60, "2530-Z~1.IMX"},
+	{2, 2532, "seqZap1c",        0, 2,   60, "2530-Z~1.IMX"},
+	{2, 2540, "seqZap2a",        0, 0,   60, "2540-Z~1.IMX"},
+	{2, 2541, "seqZap2b",        0, 1,   60, "2540-Z~1.IMX"},
+	{2, 2542, "seqZap2c",        0, 2,   60, "2540-Z~1.IMX"},
+	{3, 2550, "seqZap3a",        0, 0,   60, "2550-Z~1.IMX"},
+	{2, 2551, "seqZap3b",        0, 1,   60, "2550-Z~1.IMX"},
+	{2, 2552, "seqZap3c",        0, 2,   60, "2550-Z~1.IMX"},
+	{3, 2560, "seqZap4a",        0, 0,   60, "2560-Z~1.IMX"},
+	{2, 2561, "seqZap4b",        0, 1,   60, "2560-Z~1.IMX"},
+	{2, 2562, "seqZap4c",        0, 2,   60, "2560-Z~1.IMX"},
 	{0,   -1, "",                0, 0,    0, ""}
 };