Make ADGameFileDescription is built in directly into ADGameDescription.

svn-id: r24947

2 files changed, 648 insertions, 734 deletions

diff --git a/engines/agos/agosgame.cpp b/engines/agos/agosgame.cpp
index fdc74709eb..1687d2229d 100644
--- a/engines/agos/agosgame.cpp
+++ b/engines/agos/agosgame.cpp
@@ -1,651 +1,3 @@
-static const ADGameFileDescription ELVIRA1AMIGA_GameFiles[] = {
-	{ "gameamiga",		GAME_BASEFILE,	"7bdaff4a118d8035047cf9b1393b3fa0"},
-	{ "icon.dat",		GAME_ICONFILE,	"2db931e84f1ca01f0816dddfae3f49e1"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription ELVIRA1AMIGADEMO_GameFiles[] = {
-	{ "agos.mdf",		GAME_MENUFILE,	"825bc8eecd599f4c26732902ba2c2c77"},
-	{ "englishdemo",	GAME_BASEFILE,	"7bbc2dfe8619ef579004ff57674c6e92"},
-	{ "icon.dat",		GAME_ICONFILE,	"68b329da9893e34099c7d8ad5cb9c940"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription ELVIRA1ST_GameFiles[] = {
-	{ "gamest",		GAME_BASEFILE,	"8942859018fcfb2dbed13e83d974d1ab"},
-	{ "icon.dat",		GAME_ICONFILE,	"2db931e84f1ca01f0816dddfae3f49e1"},
-	{ "tbllist",		GAME_TBLFILE,	"5b6ff494bf7e24213758598ef4ac0a8b"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription ELVIRA1DOS_EN_GameFiles[] = {
-	{ "gamepc",		GAME_BASEFILE,	"a49e132a1f18306dd5d1ec2fe435e178"},
-	{ "icon.dat",		GAME_ICONFILE,	"fda48c9da7f3e72d0313e2f5f760fc45"},
-	{ "tbllist",		GAME_TBLFILE,	"319f6b227c7822a551f57d24e70f8149"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription ELVIRA1DOS_DE_GameFiles[] = {
-	{ "gamepc",		GAME_BASEFILE,	"d0b593143e21fc150c044819df2c0b98"},
-	{ "icon.dat",		GAME_ICONFILE,	"fda48c9da7f3e72d0313e2f5f760fc45"},
-	{ "tbllist",		GAME_TBLFILE,	"319f6b227c7822a551f57d24e70f8149"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription ELVIRA1DOS_FR_GameFiles[] = {
-	{ "gamepc",		GAME_BASEFILE,	"9076d507d60cc454df662316438ec843"},
-	{ "icon.dat",		GAME_ICONFILE,	"fda48c9da7f3e72d0313e2f5f760fc45"},
-	{ "tbllist",		GAME_TBLFILE,	"319f6b227c7822a551f57d24e70f8149"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription ELVIRA2AMIGA_GameFiles[] = {
-	{ "gameamiga",		GAME_BASEFILE,	"4aa163967f5d2bd319f8350d6af03186"},
-	{ "icon.dat",		GAME_ICONFILE,	"a88b1c02e13ab04dd790ec30502c323d"},
-	{ "menus.dat",		GAME_MENUFILE,	"a2fdc88a77c8bdffec6b36cbeda4d955"},
-	{ "stripped.txt",	GAME_STRFILE,	"41c975a9c1106cb5298a0bc3df0a266e"},
-	{ "tbllist",		GAME_TBLFILE,	"177f5f2640e80ef92d1421d32de06a5e"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription ELVIRA2ST_GameFiles[] = {
-	{ "gamest",		GAME_BASEFILE,	"1b1acd637d32bee79859b7cc9de070e7"},
-	{ "icon.dat",		GAME_ICONFILE,	"9a4eaf4df0cdf5cc85a5134150f96589"},
-	{ "menus.dat",		GAME_MENUFILE,	"a2fdc88a77c8bdffec6b36cbeda4d955"},
-	{ "stripped.txt",	GAME_STRFILE,	"41c975a9c1106cb5298a0bc3df0a266e"},
-	{ "tbllist",		GAME_TBLFILE,	"177f5f2640e80ef92d1421d32de06a5e"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription ELVIRA2DOS_EN_GameFiles[] = {
-	{ "gamepc",		GAME_BASEFILE,	"3313254722031b22d833a2cf45a91fd7"},
-	{ "icon.dat",		GAME_ICONFILE,	"83a7278bff55c82fbb3aef92981866c9"},
-	{ "menus.dat",		GAME_MENUFILE,	"a2fdc88a77c8bdffec6b36cbeda4d955"},
-	{ "stripped.txt",	GAME_STRFILE,	"c2533277b7ff11f5495967d55355ea17"},
-	{ "tbllist",		GAME_TBLFILE,	"8252660df0edbdbc3e6377e155bbd0c5"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription ELVIRA2DOS_EN_ALT_GameFiles[] = {
-	{ "gamepc",		GAME_BASEFILE,	"1282fd5c520861ae2b73bf653afef547"},
-	{ "icon.dat",		GAME_ICONFILE,	"83a7278bff55c82fbb3aef92981866c9"},
-	{ "menus.dat",		GAME_MENUFILE,	"a2fdc88a77c8bdffec6b36cbeda4d955"},
-	{ "stripped.txt",	GAME_STRFILE,	"c2533277b7ff11f5495967d55355ea17"},
-	{ "tbllist",		GAME_TBLFILE,	"8252660df0edbdbc3e6377e155bbd0c5"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription ELVIRA2DOS_DE_GameFiles[] = {
-	{ "gamepc",		GAME_BASEFILE,	"d1979d2fbc5fb5276563578ca55cbcec"},
-	{ "icon.dat",		GAME_ICONFILE,	"83a7278bff55c82fbb3aef92981866c9"},
-	{ "menus.dat",		GAME_MENUFILE,	"a2fdc88a77c8bdffec6b36cbeda4d955"},
-	{ "stripped.txt",	GAME_STRFILE,	"c3a8f644551a27c8a2fec0f8070b46b7"},
-	{ "tbllist",		GAME_TBLFILE,	"8252660df0edbdbc3e6377e155bbd0c5"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription ELVIRA2DOS_FR_GameFiles[] = {
-	{ "gamepc",		GAME_BASEFILE,	"4bf28ab00f5324fd938e632595742382"},
-	{ "icon.dat",		GAME_ICONFILE,	"83a7278bff55c82fbb3aef92981866c9"},
-	{ "menus.dat",		GAME_MENUFILE,	"a2fdc88a77c8bdffec6b36cbeda4d955"},
-	{ "stripped.txt",	GAME_STRFILE,	"c3a8f644551a27c8a2fec0f8070b46b7"},
-	{ "tbllist",		GAME_TBLFILE,	"8252660df0edbdbc3e6377e155bbd0c5"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription WAXWORKSAMIGA_GameFiles[] = {
-	{ "gameamiga",		GAME_BASEFILE,	"eca24fe7c3e005caca47cecac56f7245"},
-	{ "icon.pkd",		GAME_ICONFILE,	"4822a91c18b1b2005ac17fc617f7dcbe"},
-	{ "menus.dat",		GAME_MENUFILE,	"3409eeb8ca8b46fc04da99de67573f5e"},
-	{ "stripped.txt",	GAME_STRFILE,	"6faaebff2786216900061eeb978f10af"},
-	{ "tbllist",		GAME_TBLFILE,	"95c44bfc380770a6b6dd0dfcc69e80a0"},
-	{ "xtbllist",		GAME_XTBLFILE,	"6c7b3db345d46349a5226f695c03e20f"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription WAXWORKSDOS_GameFiles[] = {
-	{ "gamepc",		GAME_BASEFILE,	"7751e9358e894e32ef40ef3b3bae0f2a"},
-	{ "icon.dat",		GAME_ICONFILE,	"ef1b8ad3494cf103dc10a99fe152ef9a"},
-	{ "menus.dat",		GAME_MENUFILE,	"3409eeb8ca8b46fc04da99de67573f5e"},
-	{ "roomslst",		GAME_RMSLFILE,	"e3758c46ab8f3c23a1ac012bd607108d"},
-	{ "stripped.txt",	GAME_STRFILE,	"f259e3e07a1cde8d0404a767d815e12c"},
-	{ "tbllist",		GAME_TBLFILE,	"95c44bfc380770a6b6dd0dfcc69e80a0"},
-	{ "xtbllist",		GAME_XTBLFILE,	"6c7b3db345d46349a5226f695c03e20f"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON1ACORNDEMO_GameFiles[] = {
-	{ "data", 	GAME_GMEFILE,	"b4a7526ced425ba8ad0d548d0ec69900"},
-	{ "gamebase", 	GAME_BASEFILE,	"425c7d1957699d35abca7e12a08c7422"},
-	{ "icondata", 	GAME_ICONFILE, 	"22107c24dfb31b66ac503c28a6e20b19"},
-	{ "stripped", 	GAME_STRFILE,	"d9de7542612d9f4e0819ad0df5eac56b"},
-	{ "tbllist", 	GAME_TBLFILE,	"d198a80de2c59e4a0cd24b98814849e8"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON1ACORN_GameFiles[] = {
-	{ "data", 	GAME_GMEFILE,	"64958b3a38afdcb85da1eeed85169806"},
-	{ "gamebase", 	GAME_BASEFILE,	"28261b99cd9da1242189b4f6f2841bd6"},
-	{ "icondata", 	GAME_ICONFILE, 	"22107c24dfb31b66ac503c28a6e20b19"},
-	{ "stripped", 	GAME_STRFILE,	"f3b27a3fbb45dcd323a48159496e45e8"},
-	{ "tbllist", 	GAME_TBLFILE,	"d198a80de2c59e4a0cd24b98814849e8"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON1AMIGA_ECS_GameFiles[] = {
-	{ "gameamiga",		GAME_BASEFILE,	"bb94a688e247695d912cce9d0173d73a"},
-	{ "icon.pkd",		GAME_ICONFILE,	"565ef7a98dcc21ef526a2bb10b6f42ed"},
-	{ "stripped.txt",	GAME_STRFILE,	"f5fc67db3b8c5283cda51c43b98a74f8"},
-	{ "tbllist",		GAME_TBLFILE,	"f9d5bf2ce09f82289c791c3ca26e1e4b"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON1AMIGA_ECS_DEMO_GameFiles[] = {
-	{ "gameamiga",		GAME_BASEFILE,	"4696309eed9d7335c62ebb87a0f006ad"},
-	{ "icon.pkd",		GAME_ICONFILE,	"ebc96af15bfaf75ba8210326b9260d2f"},
-	{ "stripped.txt",	GAME_STRFILE,	"8edde5b9498dc9f31da1093028da467c"},
-	{ "tbllist",		GAME_TBLFILE,	"1247e024e1f13ca54c1e354120c7519c"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON1AMIGA_AGA_EN_GameFiles[] = {
-	{ "gameamiga",		GAME_BASEFILE,	"6c9ad2ff571d34a4cf0c696cf4e13500"},
-	{ "icon.pkd",		GAME_ICONFILE,	"565ef7a98dcc21ef526a2bb10b6f42ed"},
-	{ "stripped.txt",	GAME_STRFILE,	"c649fcc0439766810e5097ee7e81d4c8"},
-	{ "tbllist",		GAME_TBLFILE,	"f9d5bf2ce09f82289c791c3ca26e1e4b"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON1AMIGA_AGA_FR_GameFiles[] = {
-	{ "gameamiga",		GAME_BASEFILE,	"bd9828b9d4e5d89b50fe8c47a8e6bc07"},
-	{ "icon.pkd",		GAME_ICONFILE,	"565ef7a98dcc21ef526a2bb10b6f42ed"},
-	{ "stripped.txt",	GAME_STRFILE,	"2297baec985617d0d5612a0124bac359"},
-	{ "tbllist",		GAME_TBLFILE,	"f9d5bf2ce09f82289c791c3ca26e1e4b"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON1AMIGA_AGA_DE_GameFiles[] = {
-	{ "gameamiga",		GAME_BASEFILE,	"a2de9553f3b73064369948b5af38bb30"},
-	{ "icon.pkd",		GAME_ICONFILE,	"565ef7a98dcc21ef526a2bb10b6f42ed"},
-	{ "stripped.txt",	GAME_STRFILE,	"c649fcc0439766810e5097ee7e81d4c8"},
-	{ "tbllist",		GAME_TBLFILE,	"f9d5bf2ce09f82289c791c3ca26e1e4b"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON1CD32_GameFiles[] = {
-	{ "gameamiga",		GAME_BASEFILE,	"bab7f19237cf7d7619b6c73631da1854"},
-	{ "icon.pkd",		GAME_ICONFILE,	"565ef7a98dcc21ef526a2bb10b6f42ed"},
-	{ "stripped.txt",	GAME_STRFILE,	"59be788020441e21861e284236fd08c1"},
-	{ "tbllist",		GAME_TBLFILE,	"f9d5bf2ce09f82289c791c3ca26e1e4b"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON1CD32_ALT_GameFiles[] = {
-	{ "gameamiga",		GAME_BASEFILE,	"ec5358680c117f29b128cbbb322111a4"},
-	{ "icon.pkd",		GAME_ICONFILE,	"8ce5a46466a4f8f6d0f780b0ef00d5f5"},
-	{ "stripped.txt",	GAME_STRFILE,	"59be788020441e21861e284236fd08c1"},
-	{ "tbllist",		GAME_TBLFILE,	"f9d5bf2ce09f82289c791c3ca26e1e4b"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON1DOS_INF_GameFiles[] = {
-	{ "gamepc",		GAME_BASEFILE,	"9f93d27432ce44a787eef10adb640870"},
-	{ "icon.dat",		GAME_ICONFILE,	"22107c24dfb31b66ac503c28a6e20b19"},
-	{ "stripped.txt",	GAME_STRFILE,	"2af9affc5981eec44b90d4c556145cb8"},
-	{ "tbllist",		GAME_TBLFILE,	"d198a80de2c59e4a0cd24b98814849e8"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON1DOS_INF_RU_GameFiles[] = {
-	{ "gamepc",		GAME_BASEFILE,	"605fb866e03ec1c41b10c6a518ddfa49"},
-	{ "icon.dat",		GAME_ICONFILE,	"22107c24dfb31b66ac503c28a6e20b19"},
-	{ "stripped.txt",	GAME_STRFILE,	"2af9affc5981eec44b90d4c556145cb8"},
-	{ "tbllist",		GAME_TBLFILE,	"d198a80de2c59e4a0cd24b98814849e8"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON1DOS_EN_GameFiles[] = {
-	{ "gamepc",		GAME_BASEFILE,	"c392e494dcabed797b98cbcfc687b33a"},
-	{ "icon.dat",		GAME_ICONFILE,	"22107c24dfb31b66ac503c28a6e20b19"},
-	{ "stripped.txt",	GAME_STRFILE,	"c95a0a1ee973e19c2a1c5d12026c139f"},
-	{ "tbllist",		GAME_TBLFILE,	"d198a80de2c59e4a0cd24b98814849e8"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON1DOS_RU_GameFiles[] = {
-	{ "gamepc",		GAME_BASEFILE,	"605fb866e03ec1c41b10c6a518ddfa49"},
-	{ "icon.dat",		GAME_ICONFILE,	"22107c24dfb31b66ac503c28a6e20b19"},
-	{ "stripped.txt",	GAME_STRFILE,	"c95a0a1ee973e19c2a1c5d12026c139f"},
-	{ "tbllist",		GAME_TBLFILE,	"d198a80de2c59e4a0cd24b98814849e8"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON1DOS_FR_GameFiles[] = {
-	{ "gamepc",		GAME_BASEFILE,	"34759d0d4285a2f4b21b8e03b8fcefb3"},
-	{ "icon.dat",		GAME_ICONFILE,	"22107c24dfb31b66ac503c28a6e20b19"},
-	{ "stripped.txt",	GAME_STRFILE,	"aa01e7386057abc0c3e27dbaa9c4ba5b"},
-	{ "tbllist",		GAME_TBLFILE,	"d198a80de2c59e4a0cd24b98814849e8"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON1DOS_DE_GameFiles[] = {
-	{ "gamepc",		GAME_BASEFILE,	"063015e6ce7d90b570dbc21fe0c667b1"},
-	{ "icon.dat",		GAME_ICONFILE,	"22107c24dfb31b66ac503c28a6e20b19"},
-	{ "stripped.txt",	GAME_STRFILE,	"c95a0a1ee973e19c2a1c5d12026c139f"},
-	{ "tbllist",		GAME_TBLFILE,	"d198a80de2c59e4a0cd24b98814849e8"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON1DOS_IT_GameFiles[] = {
-	{ "gamepc",		GAME_BASEFILE,	"65c9b2dea57df84ef55d1eaf384ebd30"},
-	{ "icon.dat",		GAME_ICONFILE,	"22107c24dfb31b66ac503c28a6e20b19"},
-	{ "stripped.txt",	GAME_STRFILE,	"2af9affc5981eec44b90d4c556145cb8"},
-	{ "tbllist",		GAME_TBLFILE,	"d198a80de2c59e4a0cd24b98814849e8"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON1DOS_ES_GameFiles[] = {
-	{ "gamepc",		GAME_BASEFILE,	"5374fafdea2068134f33deab225feed3"},
-	{ "icon.dat",		GAME_ICONFILE,	"22107c24dfb31b66ac503c28a6e20b19"},
-	{ "stripped.txt",	GAME_STRFILE,	"2af9affc5981eec44b90d4c556145cb8"},
-	{ "tbllist",		GAME_TBLFILE,	"d198a80de2c59e4a0cd24b98814849e8"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON1DEMO_GameFiles[] = {
-	{ "gdemo",		GAME_BASEFILE,	"2be4a21bc76e2fdc071867c130651439"},
-	{ "icon.dat",		GAME_ICONFILE,	"55af3b4d93972bc58bfee38a86b76c3f"},
-	{ "stripped.txt",	GAME_STRFILE,	"33a2e329b97b2a349858d6a093159eb7"},
-	{ "tbllist",		GAME_TBLFILE,	"1247e024e1f13ca54c1e354120c7519c"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON1TALKIE_EN_GameFiles[] = {
-	{ "gamepc",		GAME_BASEFILE,	"28261b99cd9da1242189b4f6f2841bd6"},
-	{ "icon.dat",		GAME_ICONFILE,	"22107c24dfb31b66ac503c28a6e20b19"},
-	{ "simon.gme",		GAME_GMEFILE,	"64958b3a38afdcb85da1eeed85169806"},
-	{ "stripped.txt",	GAME_STRFILE,	"f3b27a3fbb45dcd323a48159496e45e8"},
-	{ "tbllist",		GAME_TBLFILE,	"d198a80de2c59e4a0cd24b98814849e8"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON1TALKIE_EN_ALT_GameFiles[] = {
-	{ "gamepc",		GAME_BASEFILE,	"c0b948b6821d2140f8b977144f21027a"},
-	{ "icon.dat",		GAME_ICONFILE,	"22107c24dfb31b66ac503c28a6e20b19"},
-	{ "simon.gme",		GAME_GMEFILE,	"64f73e94639b63af846ac4a8a94a23d8"},
-	{ "stripped.txt",	GAME_STRFILE,	"f3b27a3fbb45dcd323a48159496e45e8"},
-	{ "tbllist",		GAME_TBLFILE,	"d198a80de2c59e4a0cd24b98814849e8"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON1TALKIE_FR_GameFiles[] = {
-	{ "gamepc",		GAME_BASEFILE,	"3cfb9d1ff4ec725af9924140126cf69f"},
-	{ "icon.dat",		GAME_ICONFILE,	"22107c24dfb31b66ac503c28a6e20b19"},
-	{ "simon.gme",		GAME_GMEFILE,	"638049fa5d41b81fb6fb11671721b871"},
-	{ "stripped.txt",	GAME_STRFILE,	"ef51ac74c946881ae4d7ca66cc7a0d1e"},
-	{ "tbllist",		GAME_TBLFILE,	"d198a80de2c59e4a0cd24b98814849e8"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON1TALKIE_DE_GameFiles[] = {
-	{ "gamepc",		GAME_BASEFILE,	"48b1f3499e2e0d731047f4d481ff7817"},
-	{ "icon.dat",		GAME_ICONFILE,	"22107c24dfb31b66ac503c28a6e20b19"},
-	{ "simon.gme",		GAME_GMEFILE,	"7db9912acac4f1d965a64bdcfc370ba1"},
-	{ "stripped.txt",	GAME_STRFILE,	"40d68bec54042ef930f084ad9a4342a1"},
-	{ "tbllist",		GAME_TBLFILE,	"d198a80de2c59e4a0cd24b98814849e8"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON1TALKIE_HB_GameFiles[] = {
-	{ "gamepc",		GAME_BASEFILE,	"bc66e9c0b296e1b155a246917133f71a"},
-	{ "icon.dat",		GAME_ICONFILE,	"22107c24dfb31b66ac503c28a6e20b19"},
-	{ "simon.gme",		GAME_GMEFILE,	"a34b2c8642f2e3676d7088b5c8b3e884"},
-	{ "stripped.txt",	GAME_STRFILE,	"9d31bef42db1a8abe4e9f368014df1d5"},
-	{ "tbllist",		GAME_TBLFILE,	"d198a80de2c59e4a0cd24b98814849e8"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON1TALKIE_IT_GameFiles[] = {
-	{ "gamepc",		GAME_BASEFILE,	"8d3ca654e158c91b860c7eae31d65312"},
-	{ "icon.dat",		GAME_ICONFILE,	"22107c24dfb31b66ac503c28a6e20b19"},
-	{ "simon.gme",		GAME_GMEFILE,	"52e315e0e02feca86d15cc82e3306b6c"},
-	{ "stripped.txt",	GAME_STRFILE,	"9d31bef42db1a8abe4e9f368014df1d5"},
-	{ "tbllist",		GAME_TBLFILE,	"d198a80de2c59e4a0cd24b98814849e8"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON1TALKIE_IT_ALT_GameFiles[] = {
-	{ "gamepc",		GAME_BASEFILE,	"8d3ca654e158c91b860c7eae31d65312"},
-	{ "icon.dat",		GAME_ICONFILE,	"22107c24dfb31b66ac503c28a6e20b19"},
-	{ "simon.gme",		GAME_GMEFILE,	"104efd83c8f3edf545982e07d87f66ac"},
-	{ "stripped.txt",	GAME_STRFILE,	"9d31bef42db1a8abe4e9f368014df1d5"},
-	{ "tbllist",		GAME_TBLFILE,	"d198a80de2c59e4a0cd24b98814849e8"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON1TALKIE_ES_GameFiles[] = {
-	{ "gamepc",		GAME_BASEFILE,	"439f801ba52c02c9d1844600d1ce0f5e"},
-	{ "icon.dat",		GAME_ICONFILE,	"22107c24dfb31b66ac503c28a6e20b19"},
-	{ "simon.gme",		GAME_GMEFILE,	"eff2774a73890b9eac533db90cd1afa1"},
-	{ "stripped.txt",	GAME_STRFILE,	"9d31bef42db1a8abe4e9f368014df1d5"},
-	{ "tbllist",		GAME_TBLFILE,	"d198a80de2c59e4a0cd24b98814849e8"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON1WIN_EN_GameFiles[] = {
-	{ "gamepc",		GAME_BASEFILE,	"c7c12fea7f6d0bfd22af5cdbc8166862"},
-	{ "icon.dat",		GAME_ICONFILE,	"22107c24dfb31b66ac503c28a6e20b19"},
-	{ "simon.gme",		GAME_GMEFILE,	"b1b18d0731b64c0738c5cc4a2ee792fc"},
-	{ "stripped.txt",	GAME_STRFILE,	"a27e87a9ba21212d769804b3df47bfb2"},
-	{ "tbllist",		GAME_TBLFILE,	"d198a80de2c59e4a0cd24b98814849e8"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON1WIN_RU_GameFiles[] = {
-	{ "gamepc",		GAME_BASEFILE,	"4536a706412b36d628f12142bfa97af0"},
-	{ "icon.dat",		GAME_ICONFILE,	"22107c24dfb31b66ac503c28a6e20b19"},
-	{ "simon.gme",		GAME_GMEFILE,	"b1b18d0731b64c0738c5cc4a2ee792fc"},
-	{ "stripped.txt",	GAME_STRFILE,	"a27e87a9ba21212d769804b3df47bfb2"},
-	{ "tbllist",		GAME_TBLFILE,	"d198a80de2c59e4a0cd24b98814849e8"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON1WIN_DE_GameFiles[] = {
-	{ "gamepc",		GAME_BASEFILE,	"48b1f3499e2e0d731047f4d481ff7817"},
-	{ "icon.dat",		GAME_ICONFILE,	"22107c24dfb31b66ac503c28a6e20b19"},
-	{ "simon.gme",		GAME_GMEFILE,	"acd9cc438525b142d93b15c77a6f551b"},
-	{ "stripped.txt",	GAME_STRFILE,	"40d68bec54042ef930f084ad9a4342a1"},
-	{ "tbllist",		GAME_TBLFILE,	"d198a80de2c59e4a0cd24b98814849e8"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON2DOS_EN_GameFiles[] = {
-	{ "game32",		GAME_BASEFILE,	"27c8e7feada80c75b70b9c2f6088d519"},
-	{ "icon.dat",		GAME_ICONFILE,	"ee92d1f84893195a60449f2430d07285"},
-	{ "simon2.gme",		GAME_GMEFILE,	"eefcc32b1f2c0482c1a59a963a146345"},
-	{ "stripped.txt",	GAME_STRFILE,	"e229f84d46fa83f99b4a7115679f3fb6"},
-	{ "tbllist",		GAME_TBLFILE,	"2082f8d02075e590300478853a91ffd9"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON2DOS_RU_GameFiles[] = {
-	{ "game32",		GAME_BASEFILE,	"7edfc633dd50f8caa719c478443db70b"},
-	{ "icon.dat",		GAME_ICONFILE,	"ee92d1f84893195a60449f2430d07285"},
-	{ "simon2.gme",		GAME_GMEFILE,	"eefcc32b1f2c0482c1a59a963a146345"},
-	{ "stripped.txt",	GAME_STRFILE,	"e229f84d46fa83f99b4a7115679f3fb6"},
-	{ "tbllist",		GAME_TBLFILE,	"2082f8d02075e590300478853a91ffd9"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON2DOS_EN_ALT_GameFiles[] = {
-	{ "game32",		GAME_BASEFILE,	"604d04315935e77624bd356ac926e068"},
-	{ "icon.dat",		GAME_ICONFILE,	"72096a62d36e6034ea9fecc13b2dbdab"},
-	{ "simon2.gme",		GAME_GMEFILE,	"aa6840420899a31874204f90bb214108"},
-	{ "stripped.txt",	GAME_STRFILE,	"e229f84d46fa83f99b4a7115679f3fb6"},
-	{ "tbllist",		GAME_TBLFILE,	"2082f8d02075e590300478853a91ffd9"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON2DOS2_RU_GameFiles[] = {
-	{ "game32",		GAME_BASEFILE,	"eb8bde3685842a8fd38f60bc476ef8e9"},
-	{ "icon.dat",		GAME_ICONFILE,	"72096a62d36e6034ea9fecc13b2dbdab"},
-	{ "simon2.gme",		GAME_GMEFILE,	"aa6840420899a31874204f90bb214108"},
-	{ "stripped.txt",	GAME_STRFILE,	"e229f84d46fa83f99b4a7115679f3fb6"},
-	{ "tbllist",		GAME_TBLFILE,	"2082f8d02075e590300478853a91ffd9"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON2DOS_DE_GameFiles[] = {
-	{ "game32",		GAME_BASEFILE,	"eb6e3e37fe52993f948d7e2d6b869828"},
-	{ "icon.dat",		GAME_ICONFILE,	"72096a62d36e6034ea9fecc13b2dbdab"},
-	{ "simon2.gme",		GAME_GMEFILE,	"5fa9d080b04c610f526bd685be1bf747"},
-	{ "stripped.txt",	GAME_STRFILE,	"fd30df01cc248ecbaef302af855e0212"},
-	{ "tbllist",		GAME_TBLFILE,	"2082f8d02075e590300478853a91ffd9"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON2DOS_IT_GameFiles[] = {
-	{ "game32",		GAME_BASEFILE,	"3e11d400bea0638f360a724687005cd1"},
-	{ "icon.dat",		GAME_ICONFILE,	"72096a62d36e6034ea9fecc13b2dbdab"},
-	{ "simon2.gme",		GAME_GMEFILE,	"f306a397565d7f13bec7ecf14c723de7"},
-	{ "stripped.txt",	GAME_STRFILE,	"bea6843fb9f3b2144fcb146d62db0b9a"},
-	{ "tbllist",		GAME_TBLFILE,	"2082f8d02075e590300478853a91ffd9"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON2DEMO_EN_GameFiles[] = {
-	{ "gsptr30",		GAME_BASEFILE,	"3794c15887539b8578bacab694ccf08a"},
-	{ "icon.dat",		GAME_ICONFILE,	"72096a62d36e6034ea9fecc13b2dbdab"},
-	{ "simon2.gme",		GAME_GMEFILE,	"f8c9e6df1e55923a749e115ba74210c4"},
-	{ "stripped.txt",	GAME_STRFILE,	"e229f84d46fa83f99b4a7115679f3fb6"},
-	{ "tbllist",		GAME_TBLFILE,	"a0d5a494b5d3d209d1a1d76cc8d76601"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON2DEMO_DE_GameFiles[] = {
-	{ "gsptr30",		GAME_BASEFILE,	"7596ef2644fde56ee5fad0dcd483a01e"},
-	{ "icon.dat",		GAME_ICONFILE,	"72096a62d36e6034ea9fecc13b2dbdab"},
-	{ "simon2.gme",		GAME_GMEFILE,	"3f308f201f6b1ddf7c2704c1fc43a3e1"},
-	{ "stripped.txt",	GAME_STRFILE,	"4c68cf64e581a9bd638a56c900b08bfe"},
-	{ "tbllist",		GAME_TBLFILE,	"a0d5a494b5d3d209d1a1d76cc8d76601"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON2TALKIE_EN_GameFiles[] = {
-	{ "gsptr30",		GAME_BASEFILE,	"8c301fb9c4fcf119d2730ccd2a565eb3"},
-	{ "icon.dat",		GAME_ICONFILE,	"72096a62d36e6034ea9fecc13b2dbdab"},
-	{ "simon2.gme",		GAME_GMEFILE,	"9c535d403966750ae98bdaf698375a38"},
-	{ "stripped.txt",	GAME_STRFILE,	"e229f84d46fa83f99b4a7115679f3fb6"},
-	{ "tbllist",		GAME_TBLFILE,	"2082f8d02075e590300478853a91ffd9"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON2TALKIE_EN_ALT_GameFiles[] = {
-	{ "gsptr30",		GAME_BASEFILE,	"608e277904d87dd28725fa08eacc2c0d"},
-	{ "icon.dat",		GAME_ICONFILE,	"72096a62d36e6034ea9fecc13b2dbdab"},
-	{ "simon2.gme",		GAME_GMEFILE,	"8d6dcc65577e285dbca03ff6d7d9323c"},
-	{ "stripped.txt",	GAME_STRFILE,	"e229f84d46fa83f99b4a7115679f3fb6"},
-	{ "tbllist",		GAME_TBLFILE,	"a0d5a494b5d3d209d1a1d76cc8d76601"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON2TALKIE_FR_GameFiles[] = {
-	{ "gsptr30",		GAME_BASEFILE,	"43b3a04d2f0a0cbd1b024c814856561a"},
-	{ "icon.dat",		GAME_ICONFILE,	"72096a62d36e6034ea9fecc13b2dbdab"},
-	{ "simon2.gme",		GAME_GMEFILE,	"8af0e02c0c3344db64dffc12196eb59d"},
-	{ "stripped.txt",	GAME_STRFILE,	"5ea27977b4d7dcfd50eb5074e162ebbf"},
-	{ "tbllist",		GAME_TBLFILE,	"2082f8d02075e590300478853a91ffd9"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON2TALKIE_DE_GameFiles[] = {
-	{ "gsptr30",		GAME_BASEFILE,	"0d05c3f4c06c9a4ceb3d2f5bc0b18e11"},
-	{ "icon.dat",		GAME_ICONFILE,	"72096a62d36e6034ea9fecc13b2dbdab"},
-	{ "simon2.gme",		GAME_GMEFILE,	"6c5fdfdd0eab9038767c2d22858406b2"},
-	{ "stripped.txt",	GAME_STRFILE,	"6de6292c9ac11bfb2e70fdb0f773ba85"},
-	{ "tbllist",		GAME_TBLFILE,	"2082f8d02075e590300478853a91ffd9"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON2TALKIE_DE_ALT_GameFiles[] = {
-	{ "gsptr30",		GAME_BASEFILE,	"a76ea940076b5d9316796dea225a9b69"},
-	{ "icon.dat",		GAME_ICONFILE,	"72096a62d36e6034ea9fecc13b2dbdab"},
-	{ "simon2.gme",		GAME_GMEFILE,	"ec9f0f24fd895e7ea72e3c8e448c0240"},
-	{ "stripped.txt",	GAME_STRFILE,	"6de6292c9ac11bfb2e70fdb0f773ba85"},
-	{ "tbllist",		GAME_TBLFILE,	"2082f8d02075e590300478853a91ffd9"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON2TALKIE_HB_GameFiles[] = {
-	{ "gsptr30",		GAME_BASEFILE,	"952a2b1be23c3c609ba8d988a9a1627d"},
-	{ "icon.dat",		GAME_ICONFILE,	"72096a62d36e6034ea9fecc13b2dbdab"},
-	{ "simon2.gme",		GAME_GMEFILE,	"a2b249a82ea182af09789eb95fb6c5be"},
-	{ "stripped.txt",	GAME_STRFILE,	"de9dbc24158660e153483fa0cf6c3172"},
-	{ "tbllist",		GAME_TBLFILE,	"2082f8d02075e590300478853a91ffd9"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON2TALKIE_IT_GameFiles[] = {
-	{ "gsptr30",		GAME_BASEFILE,	"3e11d400bea0638f360a724687005cd1"},
-	{ "icon.dat",		GAME_ICONFILE,	"72096a62d36e6034ea9fecc13b2dbdab"},
-	{ "simon2.gme",		GAME_GMEFILE,	"344aca58e5ad5e25c517d5eb1d85c435"},
-	{ "stripped.txt",	GAME_STRFILE,	"bea6843fb9f3b2144fcb146d62db0b9a"},
-	{ "tbllist",		GAME_TBLFILE,	"2082f8d02075e590300478853a91ffd9"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON2TALKIE_ES_GameFiles[] = {
-	{ "gsptr30",		GAME_BASEFILE,	"268dc322aa73bcf27bb016b8e8ceb889"},
-	{ "icon.dat",		GAME_ICONFILE,	"72096a62d36e6034ea9fecc13b2dbdab"},
-	{ "simon2.gme",		GAME_GMEFILE,	"4f43bd06b6cc78dbd25a7475ca964eb1"},
-	{ "stripped.txt",	GAME_STRFILE,	"d13753796bd81bf313a2449f34d8b112"},
-	{ "tbllist",		GAME_TBLFILE,	"2082f8d02075e590300478853a91ffd9"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON2WIN_CZ_GameFiles[] = {
-	{ "gsptr30",		GAME_BASEFILE,	"eb8217f9ec4628d12ca606033146c48c"},
-	{ "icon.dat",		GAME_ICONFILE,	"72096a62d36e6034ea9fecc13b2dbdab"},
-	{ "simon2.gme",		GAME_GMEFILE,	"2d1074788501c55dcd9e59269ea0aaed"},
-	{ "stripped.txt",	GAME_STRFILE,	"e229f84d46fa83f99b4a7115679f3fb6"},
-	{ "tbllist",		GAME_TBLFILE,	"2082f8d02075e590300478853a91ffd9"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON2WIN_EN_GameFiles[] = {
-	{ "gsptr30",		GAME_BASEFILE,	"608e277904d87dd28725fa08eacc2c0d"},
-	{ "icon.dat",		GAME_ICONFILE,	"72096a62d36e6034ea9fecc13b2dbdab"},
-	{ "simon2.gme",		GAME_GMEFILE,	"e749c4c103d7e7d51b34620ed76c5a04"},
-	{ "stripped.txt",	GAME_STRFILE,	"e229f84d46fa83f99b4a7115679f3fb6"},
-	{ "tbllist",		GAME_TBLFILE,	"2082f8d02075e590300478853a91ffd9"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON2WIN_DE_GameFiles[] = {
-	{ "gsptr30",		GAME_BASEFILE,	"a76ea940076b5d9316796dea225a9b69"},
-	{ "icon.dat",		GAME_ICONFILE,	"72096a62d36e6034ea9fecc13b2dbdab"},
-	{ "simon2.gme",		GAME_GMEFILE,	"9609a933c541fed2e00c6c3479d7c181"},
-	{ "stripped.txt",	GAME_STRFILE,	"6de6292c9ac11bfb2e70fdb0f773ba85"},
-	{ "tbllist",		GAME_TBLFILE,	"2082f8d02075e590300478853a91ffd9"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON2WIN_DE_ALT_GameFiles[] = {
-	{ "gsptr30",		GAME_BASEFILE,	"9e858b3bb189c134c3a5f34c3385a8d3"},
-	{ "icon.dat",		GAME_ICONFILE,	"ee92d1f84893195a60449f2430d07285"},
-	{ "simon2.gme",		GAME_GMEFILE,	"16d574da07e93bcae43cee353dab8c7e"},
-	{ "stripped.txt",	GAME_STRFILE,	"6de6292c9ac11bfb2e70fdb0f773ba85"},
-	{ "tbllist",		GAME_TBLFILE,	"2082f8d02075e590300478853a91ffd9"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SIMON2WIN_PL_GameFiles[] = {
-	{ "gsptr30",		GAME_BASEFILE,	"657fd873f5d0637097ee02315b447e6f"},
-	{ "icon.dat",		GAME_ICONFILE,	"72096a62d36e6034ea9fecc13b2dbdab"},
-	{ "simon2.gme",		GAME_GMEFILE,	"7b9afcf82a94722707e0d025c0192be8"},
-	{ "stripped.txt",	GAME_STRFILE,	"e229f84d46fa83f99b4a7115679f3fb6"},
-	{ "tbllist",		GAME_TBLFILE,	"2082f8d02075e590300478853a91ffd9"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription FEEBLEFILES_AMI_DE_GameFiles[] = {
-	{ "game22",		GAME_BASEFILE,	"bcd76ac080003eee3649df18db25b60e"},
-	{ "gfxindex.dat",	GAME_GFXIDXFILE,"f550f7915c5ce3a68c9f870f507449c2"},
-	{ "tbllist",		GAME_TBLFILE,	"0bbfee8e69739111eb36b0d138da8ddf"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription FEEBLEFILES_AMI_UK_GameFiles[] = {
-	{ "game22",		GAME_BASEFILE,	"629762ea9ca9ee9ff85f4774d219f5c7"},
-	{ "gfxindex.dat",	GAME_GFXIDXFILE,"f550f7915c5ce3a68c9f870f507449c2"},
-	{ "tbllist",		GAME_TBLFILE,	"0bbfee8e69739111eb36b0d138da8ddf"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription FEEBLEFILES_MAC_DE_GameFiles[] = {
-	{ "game22",		GAME_BASEFILE,	"bcd76ac080003eee3649df18db25b60e"},
-	{ "graphics.vga",	GAME_GFXIDXFILE,"11a4853cb35956846976e9473ee0e41e"},
-	{ "tbllist",		GAME_TBLFILE,	"0bbfee8e69739111eb36b0d138da8ddf"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription FEEBLEFILES_MAC_FR_GameFiles[] = {
-	{ "game22",		GAME_BASEFILE,	"ba90b40a47726039671d9e91630dd7ed"},
-	{ "graphics.vga",	GAME_GFXIDXFILE,"11a4853cb35956846976e9473ee0e41e"},
-	{ "tbllist",		GAME_TBLFILE,	"0bbfee8e69739111eb36b0d138da8ddf"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription FEEBLEFILES_MAC_ES_GameFiles[] = {
-	{ "game22",		GAME_BASEFILE,	"71d7d2d5e479b053c5a9757f1702c9c3"},
-	{ "graphics.vga",	GAME_GFXIDXFILE,"11a4853cb35956846976e9473ee0e41e"},
-	{ "tbllist",		GAME_TBLFILE,	"0bbfee8e69739111eb36b0d138da8ddf"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription FEEBLEFILES_MAC_UK_GameFiles[] = {
-	{ "game22",		GAME_BASEFILE,	"629762ea9ca9ee9ff85f4774d219f5c7"},
-	{ "graphics.vga",	GAME_GFXIDXFILE,"11a4853cb35956846976e9473ee0e41e"},
-	{ "tbllist",		GAME_TBLFILE,	"0bbfee8e69739111eb36b0d138da8ddf"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription FEEBLEFILES_EN_2CD_GameFiles[] = {
-	{ "game22",		GAME_BASEFILE,	"629762ea9ca9ee9ff85f4774d219f5c7"},
-	{ "tbllist",		GAME_TBLFILE,	"0bbfee8e69739111eb36b0d138da8ddf"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription FEEBLEFILES_EN_4CD_GameFiles[] = {
-	{ "game22",		GAME_BASEFILE,	"a8746407a5b20a7da0da0a14c380af1c"},
-	{ "tbllist",		GAME_TBLFILE,	"0bbfee8e69739111eb36b0d138da8ddf"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription FEEBLEFILES_DE_GameFiles[] = {
-	{ "game22",		GAME_BASEFILE,	"bcd76ac080003eee3649df18db25b60e"},
-	{ "tbllist",		GAME_TBLFILE,	"0bbfee8e69739111eb36b0d138da8ddf"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription FEEBLEFILES_FR_GameFiles[] = {
-	{ "game22",		GAME_BASEFILE,	"ba90b40a47726039671d9e91630dd7ed"},
-	{ "tbllist",		GAME_TBLFILE,	"0bbfee8e69739111eb36b0d138da8ddf"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription FEEBLEFILES_IT_GameFiles[] = {
-	{ "game22",		GAME_BASEFILE,	"80576f2e1ed4c912b63921fe77af313e"},
-	{ "tbllist",		GAME_TBLFILE,	"0bbfee8e69739111eb36b0d138da8ddf"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription FEEBLEFILES_ES_GameFiles[] = {
-	{ "game22",		GAME_BASEFILE,	"71d7d2d5e479b053c5a9757f1702c9c3"},
-	{ "tbllist",		GAME_TBLFILE,	"0bbfee8e69739111eb36b0d138da8ddf"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription DIMP_GameFiles[] = {
-	{ "Gdimp",		GAME_BASEFILE,	"0b1e89ae1dc2e012b7fa7a987b4ac42a"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription JUMBLE_GameFiles[] = {
-	{ "Gjumble",		GAME_BASEFILE,	"d54cce46d339038d1a6b74ea213655bc"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription PUZZLE_GameFiles[] = {
-	{ "Gpuzzle",		GAME_BASEFILE,	"3f80dac8e0d85401a1058a560fe49ab6"},
-	{ NULL, 0, NULL}
-};
-
-static const ADGameFileDescription SWAMPY_GameFiles[] = {
-	{ "Gswampy",		GAME_BASEFILE,	"3a6d4d7b2433e660f2483f9396cc87a2"},
-	{ NULL, 0, NULL}
-};
-
 #define FILE_MD5_BYTES 5000
 
 static const AGOSGameDescription gameDescriptions[] = {
@@ -654,7 +6,11 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"elvira1",
 			"Floppy",
-			ELVIRA1AMIGA_GameFiles,
+			{
+	{ "gameamiga",		GAME_BASEFILE,	"7bdaff4a118d8035047cf9b1393b3fa0"},
+	{ "icon.dat",		GAME_ICONFILE,	"2db931e84f1ca01f0816dddfae3f49e1"},
+	{ NULL, 0, NULL}
+			},
 			Common::EN_ANY,
 			Common::kPlatformAmiga,
 		},
@@ -669,7 +25,13 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"elvira1",
 			"Demo",
-			ELVIRA1AMIGADEMO_GameFiles,
+
+			{
+	{ "agos.mdf",		GAME_MENUFILE,	"825bc8eecd599f4c26732902ba2c2c77"},
+	{ "englishdemo",	GAME_BASEFILE,	"7bbc2dfe8619ef579004ff57674c6e92"},
+	{ "icon.dat",		GAME_ICONFILE,	"68b329da9893e34099c7d8ad5cb9c940"},
+	{ NULL, 0, NULL}
+			},
 			Common::EN_ANY,
 			Common::kPlatformAmiga,
 		},
@@ -684,7 +46,13 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"elvira1",
 			"Floppy",
-			ELVIRA1ST_GameFiles,
+
+			{
+	{ "gamest",		GAME_BASEFILE,	"8942859018fcfb2dbed13e83d974d1ab"},
+	{ "icon.dat",		GAME_ICONFILE,	"2db931e84f1ca01f0816dddfae3f49e1"},
+	{ "tbllist",		GAME_TBLFILE,	"5b6ff494bf7e24213758598ef4ac0a8b"},
+	{ NULL, 0, NULL}
+			},
 			Common::EN_ANY,
 			Common::kPlatformAtariST,
 		},
@@ -699,7 +67,13 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"elvira1",
 			"Floppy",
-			ELVIRA1DOS_EN_GameFiles,
+
+			{
+	{ "gamepc",		GAME_BASEFILE,	"a49e132a1f18306dd5d1ec2fe435e178"},
+	{ "icon.dat",		GAME_ICONFILE,	"fda48c9da7f3e72d0313e2f5f760fc45"},
+	{ "tbllist",		GAME_TBLFILE,	"319f6b227c7822a551f57d24e70f8149"},
+	{ NULL, 0, NULL}
+			},
 			Common::EN_ANY,
 			Common::kPlatformPC,
 		},
@@ -714,7 +88,13 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"elvira1",
 			"Floppy",
-			ELVIRA1DOS_DE_GameFiles,
+
+			{
+	{ "gamepc",		GAME_BASEFILE,	"d0b593143e21fc150c044819df2c0b98"},
+	{ "icon.dat",		GAME_ICONFILE,	"fda48c9da7f3e72d0313e2f5f760fc45"},
+	{ "tbllist",		GAME_TBLFILE,	"319f6b227c7822a551f57d24e70f8149"},
+	{ NULL, 0, NULL}
+			},
 			Common::DE_DEU,
 			Common::kPlatformPC,
 		},
@@ -729,7 +109,13 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"elvira1",
 			"Floppy",
-			ELVIRA1DOS_FR_GameFiles,
+
+			{
+	{ "gamepc",		GAME_BASEFILE,	"9076d507d60cc454df662316438ec843"},
+	{ "icon.dat",		GAME_ICONFILE,	"fda48c9da7f3e72d0313e2f5f760fc45"},
+	{ "tbllist",		GAME_TBLFILE,	"319f6b227c7822a551f57d24e70f8149"},
+	{ NULL, 0, NULL}
+			},
 			Common::FR_FRA,
 			Common::kPlatformPC,
 		},
@@ -744,7 +130,15 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"elvira2",
 			"Floppy",
-			ELVIRA2AMIGA_GameFiles,
+
+			{
+	{ "gameamiga",		GAME_BASEFILE,	"4aa163967f5d2bd319f8350d6af03186"},
+	{ "icon.dat",		GAME_ICONFILE,	"a88b1c02e13ab04dd790ec30502c323d"},
+	{ "menus.dat",		GAME_MENUFILE,	"a2fdc88a77c8bdffec6b36cbeda4d955"},
+	{ "stripped.txt",	GAME_STRFILE,	"41c975a9c1106cb5298a0bc3df0a266e"},
+	{ "tbllist",		GAME_TBLFILE,	"177f5f2640e80ef92d1421d32de06a5e"},
+	{ NULL, 0, NULL}
+			},
 			Common::EN_ANY,
 			Common::kPlatformAmiga,
 		},
@@ -759,7 +153,15 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"elvira2",
 			"Floppy",
-			ELVIRA2ST_GameFiles,
+
+			{
+	{ "gamest",		GAME_BASEFILE,	"1b1acd637d32bee79859b7cc9de070e7"},
+	{ "icon.dat",		GAME_ICONFILE,	"9a4eaf4df0cdf5cc85a5134150f96589"},
+	{ "menus.dat",		GAME_MENUFILE,	"a2fdc88a77c8bdffec6b36cbeda4d955"},
+	{ "stripped.txt",	GAME_STRFILE,	"41c975a9c1106cb5298a0bc3df0a266e"},
+	{ "tbllist",		GAME_TBLFILE,	"177f5f2640e80ef92d1421d32de06a5e"},
+	{ NULL, 0, NULL}
+			},
 			Common::EN_ANY,
 			Common::kPlatformAtariST,
 		},
@@ -774,7 +176,15 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"elvira2",
 			"Floppy",
-			ELVIRA2DOS_EN_GameFiles,
+
+			{
+	{ "gamepc",		GAME_BASEFILE,	"3313254722031b22d833a2cf45a91fd7"},
+	{ "icon.dat",		GAME_ICONFILE,	"83a7278bff55c82fbb3aef92981866c9"},
+	{ "menus.dat",		GAME_MENUFILE,	"a2fdc88a77c8bdffec6b36cbeda4d955"},
+	{ "stripped.txt",	GAME_STRFILE,	"c2533277b7ff11f5495967d55355ea17"},
+	{ "tbllist",		GAME_TBLFILE,	"8252660df0edbdbc3e6377e155bbd0c5"},
+	{ NULL, 0, NULL}
+			},
 			Common::EN_ANY,
 			Common::kPlatformPC,
 		},
@@ -789,7 +199,15 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"elvira2",
 			"Floppy",
-			ELVIRA2DOS_EN_ALT_GameFiles,
+
+			{
+	{ "gamepc",		GAME_BASEFILE,	"1282fd5c520861ae2b73bf653afef547"},
+	{ "icon.dat",		GAME_ICONFILE,	"83a7278bff55c82fbb3aef92981866c9"},
+	{ "menus.dat",		GAME_MENUFILE,	"a2fdc88a77c8bdffec6b36cbeda4d955"},
+	{ "stripped.txt",	GAME_STRFILE,	"c2533277b7ff11f5495967d55355ea17"},
+	{ "tbllist",		GAME_TBLFILE,	"8252660df0edbdbc3e6377e155bbd0c5"},
+	{ NULL, 0, NULL}
+			},
 			Common::EN_ANY,
 			Common::kPlatformPC,
 		},
@@ -804,7 +222,15 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"elvira2",
 			"Floppy",
-			ELVIRA2DOS_DE_GameFiles,
+
+			{
+	{ "gamepc",		GAME_BASEFILE,	"d1979d2fbc5fb5276563578ca55cbcec"},
+	{ "icon.dat",		GAME_ICONFILE,	"83a7278bff55c82fbb3aef92981866c9"},
+	{ "menus.dat",		GAME_MENUFILE,	"a2fdc88a77c8bdffec6b36cbeda4d955"},
+	{ "stripped.txt",	GAME_STRFILE,	"c3a8f644551a27c8a2fec0f8070b46b7"},
+	{ "tbllist",		GAME_TBLFILE,	"8252660df0edbdbc3e6377e155bbd0c5"},
+	{ NULL, 0, NULL}
+			},
 			Common::DE_DEU,
 			Common::kPlatformPC,
 		},
@@ -819,7 +245,15 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"elvira2",
 			"Floppy",
-			ELVIRA2DOS_FR_GameFiles,
+
+			{
+	{ "gamepc",		GAME_BASEFILE,	"4bf28ab00f5324fd938e632595742382"},
+	{ "icon.dat",		GAME_ICONFILE,	"83a7278bff55c82fbb3aef92981866c9"},
+	{ "menus.dat",		GAME_MENUFILE,	"a2fdc88a77c8bdffec6b36cbeda4d955"},
+	{ "stripped.txt",	GAME_STRFILE,	"c3a8f644551a27c8a2fec0f8070b46b7"},
+	{ "tbllist",		GAME_TBLFILE,	"8252660df0edbdbc3e6377e155bbd0c5"},
+	{ NULL, 0, NULL}
+			},
 			Common::FR_FRA,
 			Common::kPlatformPC,
 		},
@@ -834,7 +268,16 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"waxworks",
 			"Floppy",
-			WAXWORKSAMIGA_GameFiles,
+
+			{
+	{ "gameamiga",		GAME_BASEFILE,	"eca24fe7c3e005caca47cecac56f7245"},
+	{ "icon.pkd",		GAME_ICONFILE,	"4822a91c18b1b2005ac17fc617f7dcbe"},
+	{ "menus.dat",		GAME_MENUFILE,	"3409eeb8ca8b46fc04da99de67573f5e"},
+	{ "stripped.txt",	GAME_STRFILE,	"6faaebff2786216900061eeb978f10af"},
+	{ "tbllist",		GAME_TBLFILE,	"95c44bfc380770a6b6dd0dfcc69e80a0"},
+	{ "xtbllist",		GAME_XTBLFILE,	"6c7b3db345d46349a5226f695c03e20f"},
+	{ NULL, 0, NULL}
+			},
 			Common::EN_ANY,
 			Common::kPlatformAmiga,
 		},
@@ -849,7 +292,17 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"waxworks",
 			"Floppy",
-			WAXWORKSDOS_GameFiles,
+
+			{
+	{ "gamepc",		GAME_BASEFILE,	"7751e9358e894e32ef40ef3b3bae0f2a"},
+	{ "icon.dat",		GAME_ICONFILE,	"ef1b8ad3494cf103dc10a99fe152ef9a"},
+	{ "menus.dat",		GAME_MENUFILE,	"3409eeb8ca8b46fc04da99de67573f5e"},
+	{ "roomslst",		GAME_RMSLFILE,	"e3758c46ab8f3c23a1ac012bd607108d"},
+	{ "stripped.txt",	GAME_STRFILE,	"f259e3e07a1cde8d0404a767d815e12c"},
+	{ "tbllist",		GAME_TBLFILE,	"95c44bfc380770a6b6dd0dfcc69e80a0"},
+	{ "xtbllist",		GAME_XTBLFILE,	"6c7b3db345d46349a5226f695c03e20f"},
+	{ NULL, 0, NULL}
+			},
 			Common::EN_ANY,
 			Common::kPlatformPC,
 		},
@@ -864,7 +317,15 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon1",
 			"CD Demo",
-			SIMON1ACORNDEMO_GameFiles,
+
+			{
+	{ "data", 	GAME_GMEFILE,	"b4a7526ced425ba8ad0d548d0ec69900"},
+	{ "gamebase", 	GAME_BASEFILE,	"425c7d1957699d35abca7e12a08c7422"},
+	{ "icondata", 	GAME_ICONFILE, 	"22107c24dfb31b66ac503c28a6e20b19"},
+	{ "stripped", 	GAME_STRFILE,	"d9de7542612d9f4e0819ad0df5eac56b"},
+	{ "tbllist", 	GAME_TBLFILE,	"d198a80de2c59e4a0cd24b98814849e8"},
+	{ NULL, 0, NULL}
+			},
 			Common::EN_ANY,
 			Common::kPlatformAcorn,
 		},
@@ -879,7 +340,15 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon1",
 			"CD",
-			SIMON1ACORN_GameFiles,
+
+			{
+	{ "data", 	GAME_GMEFILE,	"64958b3a38afdcb85da1eeed85169806"},
+	{ "gamebase", 	GAME_BASEFILE,	"28261b99cd9da1242189b4f6f2841bd6"},
+	{ "icondata", 	GAME_ICONFILE, 	"22107c24dfb31b66ac503c28a6e20b19"},
+	{ "stripped", 	GAME_STRFILE,	"f3b27a3fbb45dcd323a48159496e45e8"},
+	{ "tbllist", 	GAME_TBLFILE,	"d198a80de2c59e4a0cd24b98814849e8"},
+	{ NULL, 0, NULL}
+			},
 			Common::EN_ANY,
 			Common::kPlatformAcorn,
 		},
@@ -894,7 +363,14 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon1",
 			"ECS Floppy",
-			SIMON1AMIGA_ECS_GameFiles,
+
+			{
+	{ "gameamiga",		GAME_BASEFILE,	"bb94a688e247695d912cce9d0173d73a"},
+	{ "icon.pkd",		GAME_ICONFILE,	"565ef7a98dcc21ef526a2bb10b6f42ed"},
+	{ "stripped.txt",	GAME_STRFILE,	"f5fc67db3b8c5283cda51c43b98a74f8"},
+	{ "tbllist",		GAME_TBLFILE,	"f9d5bf2ce09f82289c791c3ca26e1e4b"},
+	{ NULL, 0, NULL}
+			},
 			Common::EN_ANY,
 			Common::kPlatformAmiga,
 		},
@@ -909,7 +385,14 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon1",
 			"ECS Demo",
-			SIMON1AMIGA_ECS_DEMO_GameFiles,
+
+			{
+	{ "gameamiga",		GAME_BASEFILE,	"4696309eed9d7335c62ebb87a0f006ad"},
+	{ "icon.pkd",		GAME_ICONFILE,	"ebc96af15bfaf75ba8210326b9260d2f"},
+	{ "stripped.txt",	GAME_STRFILE,	"8edde5b9498dc9f31da1093028da467c"},
+	{ "tbllist",		GAME_TBLFILE,	"1247e024e1f13ca54c1e354120c7519c"},
+	{ NULL, 0, NULL}
+			},
 			Common::EN_ANY,
 			Common::kPlatformAmiga,
 		},
@@ -924,7 +407,14 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon1",
 			"AGA Floppy",
-			SIMON1AMIGA_AGA_EN_GameFiles,
+
+			{
+	{ "gameamiga",		GAME_BASEFILE,	"6c9ad2ff571d34a4cf0c696cf4e13500"},
+	{ "icon.pkd",		GAME_ICONFILE,	"565ef7a98dcc21ef526a2bb10b6f42ed"},
+	{ "stripped.txt",	GAME_STRFILE,	"c649fcc0439766810e5097ee7e81d4c8"},
+	{ "tbllist",		GAME_TBLFILE,	"f9d5bf2ce09f82289c791c3ca26e1e4b"},
+	{ NULL, 0, NULL}
+			},
 			Common::EN_ANY,
 			Common::kPlatformAmiga,
 		},
@@ -939,7 +429,14 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon1",
 			"AGA Floppy",
-			SIMON1AMIGA_AGA_FR_GameFiles,
+
+			{
+	{ "gameamiga",		GAME_BASEFILE,	"bd9828b9d4e5d89b50fe8c47a8e6bc07"},
+	{ "icon.pkd",		GAME_ICONFILE,	"565ef7a98dcc21ef526a2bb10b6f42ed"},
+	{ "stripped.txt",	GAME_STRFILE,	"2297baec985617d0d5612a0124bac359"},
+	{ "tbllist",		GAME_TBLFILE,	"f9d5bf2ce09f82289c791c3ca26e1e4b"},
+	{ NULL, 0, NULL}
+			},
 			Common::FR_FRA,
 			Common::kPlatformAmiga,
 		},
@@ -954,7 +451,14 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon1",
 			"AGA Floppy",
-			SIMON1AMIGA_AGA_DE_GameFiles,
+
+			{
+	{ "gameamiga",		GAME_BASEFILE,	"a2de9553f3b73064369948b5af38bb30"},
+	{ "icon.pkd",		GAME_ICONFILE,	"565ef7a98dcc21ef526a2bb10b6f42ed"},
+	{ "stripped.txt",	GAME_STRFILE,	"c649fcc0439766810e5097ee7e81d4c8"},
+	{ "tbllist",		GAME_TBLFILE,	"f9d5bf2ce09f82289c791c3ca26e1e4b"},
+	{ NULL, 0, NULL}
+			},
 			Common::DE_DEU,
 			Common::kPlatformAmiga,
 		},
@@ -969,7 +473,14 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon1",
 			"CD32",
-			SIMON1CD32_GameFiles,
+
+			{
+	{ "gameamiga",		GAME_BASEFILE,	"bab7f19237cf7d7619b6c73631da1854"},
+	{ "icon.pkd",		GAME_ICONFILE,	"565ef7a98dcc21ef526a2bb10b6f42ed"},
+	{ "stripped.txt",	GAME_STRFILE,	"59be788020441e21861e284236fd08c1"},
+	{ "tbllist",		GAME_TBLFILE,	"f9d5bf2ce09f82289c791c3ca26e1e4b"},
+	{ NULL, 0, NULL}
+			},
 			Common::EN_ANY,
 			Common::kPlatformAmiga,
 		},
@@ -984,7 +495,14 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon1",
 			"CD32",
-			SIMON1CD32_ALT_GameFiles,
+
+			{
+	{ "gameamiga",		GAME_BASEFILE,	"ec5358680c117f29b128cbbb322111a4"},
+	{ "icon.pkd",		GAME_ICONFILE,	"8ce5a46466a4f8f6d0f780b0ef00d5f5"},
+	{ "stripped.txt",	GAME_STRFILE,	"59be788020441e21861e284236fd08c1"},
+	{ "tbllist",		GAME_TBLFILE,	"f9d5bf2ce09f82289c791c3ca26e1e4b"},
+	{ NULL, 0, NULL}
+			},
 			Common::EN_ANY,
 			Common::kPlatformAmiga,
 		},
@@ -999,7 +517,14 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon1",
 			"Floppy Demo",
-			SIMON1DEMO_GameFiles,
+
+			{
+	{ "gdemo",		GAME_BASEFILE,	"2be4a21bc76e2fdc071867c130651439"},
+	{ "icon.dat",		GAME_ICONFILE,	"55af3b4d93972bc58bfee38a86b76c3f"},
+	{ "stripped.txt",	GAME_STRFILE,	"33a2e329b97b2a349858d6a093159eb7"},
+	{ "tbllist",		GAME_TBLFILE,	"1247e024e1f13ca54c1e354120c7519c"},
+	{ NULL, 0, NULL}
+			},
 			Common::EN_ANY,
 			Common::kPlatformPC,
 		},
@@ -1014,7 +539,14 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon1",
 			"Floppy",
-			SIMON1DOS_EN_GameFiles,
+
+			{
+	{ "gamepc",		GAME_BASEFILE,	"c392e494dcabed797b98cbcfc687b33a"},
+	{ "icon.dat",		GAME_ICONFILE,	"22107c24dfb31b66ac503c28a6e20b19"},
+	{ "stripped.txt",	GAME_STRFILE,	"c95a0a1ee973e19c2a1c5d12026c139f"},
+	{ "tbllist",		GAME_TBLFILE,	"d198a80de2c59e4a0cd24b98814849e8"},
+	{ NULL, 0, NULL}
+			},
 			Common::EN_ANY,
 			Common::kPlatformPC,
 		},
@@ -1029,7 +561,14 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon1",
 			"Floppy",
-			SIMON1DOS_RU_GameFiles,
+
+			{
+	{ "gamepc",		GAME_BASEFILE,	"605fb866e03ec1c41b10c6a518ddfa49"},
+	{ "icon.dat",		GAME_ICONFILE,	"22107c24dfb31b66ac503c28a6e20b19"},
+	{ "stripped.txt",	GAME_STRFILE,	"c95a0a1ee973e19c2a1c5d12026c139f"},
+	{ "tbllist",		GAME_TBLFILE,	"d198a80de2c59e4a0cd24b98814849e8"},
+	{ NULL, 0, NULL}
+			},
 			Common::RU_RUS,
 			Common::kPlatformPC,
 		},
@@ -1044,7 +583,14 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon1",
 			"Floppy",
-			SIMON1DOS_INF_GameFiles,
+
+			{
+	{ "gamepc",		GAME_BASEFILE,	"9f93d27432ce44a787eef10adb640870"},
+	{ "icon.dat",		GAME_ICONFILE,	"22107c24dfb31b66ac503c28a6e20b19"},
+	{ "stripped.txt",	GAME_STRFILE,	"2af9affc5981eec44b90d4c556145cb8"},
+	{ "tbllist",		GAME_TBLFILE,	"d198a80de2c59e4a0cd24b98814849e8"},
+	{ NULL, 0, NULL}
+			},
 			Common::EN_ANY,
 			Common::kPlatformPC,
 		},
@@ -1059,7 +605,14 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon1",
 			"Floppy",
-			SIMON1DOS_INF_RU_GameFiles,
+
+			{
+	{ "gamepc",		GAME_BASEFILE,	"605fb866e03ec1c41b10c6a518ddfa49"},
+	{ "icon.dat",		GAME_ICONFILE,	"22107c24dfb31b66ac503c28a6e20b19"},
+	{ "stripped.txt",	GAME_STRFILE,	"2af9affc5981eec44b90d4c556145cb8"},
+	{ "tbllist",		GAME_TBLFILE,	"d198a80de2c59e4a0cd24b98814849e8"},
+	{ NULL, 0, NULL}
+			},
 			Common::RU_RUS,
 			Common::kPlatformPC,
 		},
@@ -1074,7 +627,14 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon1",
 			"Floppy",
-			SIMON1DOS_FR_GameFiles,
+
+			{
+	{ "gamepc",		GAME_BASEFILE,	"34759d0d4285a2f4b21b8e03b8fcefb3"},
+	{ "icon.dat",		GAME_ICONFILE,	"22107c24dfb31b66ac503c28a6e20b19"},
+	{ "stripped.txt",	GAME_STRFILE,	"aa01e7386057abc0c3e27dbaa9c4ba5b"},
+	{ "tbllist",		GAME_TBLFILE,	"d198a80de2c59e4a0cd24b98814849e8"},
+	{ NULL, 0, NULL}
+			},
 			Common::FR_FRA,
 			Common::kPlatformPC,
 		},
@@ -1089,7 +649,14 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon1",
 			"Floppy",
-			SIMON1DOS_DE_GameFiles,
+
+			{
+	{ "gamepc",		GAME_BASEFILE,	"063015e6ce7d90b570dbc21fe0c667b1"},
+	{ "icon.dat",		GAME_ICONFILE,	"22107c24dfb31b66ac503c28a6e20b19"},
+	{ "stripped.txt",	GAME_STRFILE,	"c95a0a1ee973e19c2a1c5d12026c139f"},
+	{ "tbllist",		GAME_TBLFILE,	"d198a80de2c59e4a0cd24b98814849e8"},
+	{ NULL, 0, NULL}
+			},
 			Common::DE_DEU,
 			Common::kPlatformPC,
 		},
@@ -1104,7 +671,14 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon1",
 			"Floppy",
-			SIMON1DOS_IT_GameFiles,
+
+			{
+	{ "gamepc",		GAME_BASEFILE,	"65c9b2dea57df84ef55d1eaf384ebd30"},
+	{ "icon.dat",		GAME_ICONFILE,	"22107c24dfb31b66ac503c28a6e20b19"},
+	{ "stripped.txt",	GAME_STRFILE,	"2af9affc5981eec44b90d4c556145cb8"},
+	{ "tbllist",		GAME_TBLFILE,	"d198a80de2c59e4a0cd24b98814849e8"},
+	{ NULL, 0, NULL}
+			},
 			Common::IT_ITA,
 			Common::kPlatformPC,
 		},
@@ -1119,7 +693,14 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon1",
 			"Floppy",
-			SIMON1DOS_ES_GameFiles,
+
+			{
+	{ "gamepc",		GAME_BASEFILE,	"5374fafdea2068134f33deab225feed3"},
+	{ "icon.dat",		GAME_ICONFILE,	"22107c24dfb31b66ac503c28a6e20b19"},
+	{ "stripped.txt",	GAME_STRFILE,	"2af9affc5981eec44b90d4c556145cb8"},
+	{ "tbllist",		GAME_TBLFILE,	"d198a80de2c59e4a0cd24b98814849e8"},
+	{ NULL, 0, NULL}
+			},
 			Common::ES_ESP,
 			Common::kPlatformPC,
 		},
@@ -1134,7 +715,15 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon1",
 			"CD",
-			SIMON1TALKIE_EN_GameFiles,
+
+			{
+	{ "gamepc",		GAME_BASEFILE,	"28261b99cd9da1242189b4f6f2841bd6"},
+	{ "icon.dat",		GAME_ICONFILE,	"22107c24dfb31b66ac503c28a6e20b19"},
+	{ "simon.gme",		GAME_GMEFILE,	"64958b3a38afdcb85da1eeed85169806"},
+	{ "stripped.txt",	GAME_STRFILE,	"f3b27a3fbb45dcd323a48159496e45e8"},
+	{ "tbllist",		GAME_TBLFILE,	"d198a80de2c59e4a0cd24b98814849e8"},
+	{ NULL, 0, NULL}
+			},
 			Common::EN_ANY,
 			Common::kPlatformPC,
 		},
@@ -1149,7 +738,15 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon1",
 			"CD",
-			SIMON1TALKIE_EN_ALT_GameFiles,
+
+			{
+	{ "gamepc",		GAME_BASEFILE,	"c0b948b6821d2140f8b977144f21027a"},
+	{ "icon.dat",		GAME_ICONFILE,	"22107c24dfb31b66ac503c28a6e20b19"},
+	{ "simon.gme",		GAME_GMEFILE,	"64f73e94639b63af846ac4a8a94a23d8"},
+	{ "stripped.txt",	GAME_STRFILE,	"f3b27a3fbb45dcd323a48159496e45e8"},
+	{ "tbllist",		GAME_TBLFILE,	"d198a80de2c59e4a0cd24b98814849e8"},
+	{ NULL, 0, NULL}
+			},
 			Common::EN_ANY,
 			Common::kPlatformPC,
 		},
@@ -1164,7 +761,15 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon1",
 			"CD",
-			SIMON1TALKIE_FR_GameFiles,
+
+			{
+	{ "gamepc",		GAME_BASEFILE,	"3cfb9d1ff4ec725af9924140126cf69f"},
+	{ "icon.dat",		GAME_ICONFILE,	"22107c24dfb31b66ac503c28a6e20b19"},
+	{ "simon.gme",		GAME_GMEFILE,	"638049fa5d41b81fb6fb11671721b871"},
+	{ "stripped.txt",	GAME_STRFILE,	"ef51ac74c946881ae4d7ca66cc7a0d1e"},
+	{ "tbllist",		GAME_TBLFILE,	"d198a80de2c59e4a0cd24b98814849e8"},
+	{ NULL, 0, NULL}
+			},
 			Common::FR_FRA,
 			Common::kPlatformPC,
 		},
@@ -1179,7 +784,15 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon1",
 			"CD",
-			SIMON1TALKIE_DE_GameFiles,
+
+			{
+	{ "gamepc",		GAME_BASEFILE,	"48b1f3499e2e0d731047f4d481ff7817"},
+	{ "icon.dat",		GAME_ICONFILE,	"22107c24dfb31b66ac503c28a6e20b19"},
+	{ "simon.gme",		GAME_GMEFILE,	"7db9912acac4f1d965a64bdcfc370ba1"},
+	{ "stripped.txt",	GAME_STRFILE,	"40d68bec54042ef930f084ad9a4342a1"},
+	{ "tbllist",		GAME_TBLFILE,	"d198a80de2c59e4a0cd24b98814849e8"},
+	{ NULL, 0, NULL}
+			},
 			Common::DE_DEU,
 			Common::kPlatformPC,
 		},
@@ -1194,7 +807,15 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon1",
 			"CD",
-			SIMON1TALKIE_HB_GameFiles,
+
+			{
+	{ "gamepc",		GAME_BASEFILE,	"bc66e9c0b296e1b155a246917133f71a"},
+	{ "icon.dat",		GAME_ICONFILE,	"22107c24dfb31b66ac503c28a6e20b19"},
+	{ "simon.gme",		GAME_GMEFILE,	"a34b2c8642f2e3676d7088b5c8b3e884"},
+	{ "stripped.txt",	GAME_STRFILE,	"9d31bef42db1a8abe4e9f368014df1d5"},
+	{ "tbllist",		GAME_TBLFILE,	"d198a80de2c59e4a0cd24b98814849e8"},
+	{ NULL, 0, NULL}
+			},
 			Common::HB_ISR,
 			Common::kPlatformPC,
 		},
@@ -1209,7 +830,15 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon1",
 			"CD",
-			SIMON1TALKIE_IT_GameFiles,
+
+			{
+	{ "gamepc",		GAME_BASEFILE,	"8d3ca654e158c91b860c7eae31d65312"},
+	{ "icon.dat",		GAME_ICONFILE,	"22107c24dfb31b66ac503c28a6e20b19"},
+	{ "simon.gme",		GAME_GMEFILE,	"52e315e0e02feca86d15cc82e3306b6c"},
+	{ "stripped.txt",	GAME_STRFILE,	"9d31bef42db1a8abe4e9f368014df1d5"},
+	{ "tbllist",		GAME_TBLFILE,	"d198a80de2c59e4a0cd24b98814849e8"},
+	{ NULL, 0, NULL}
+			},
 			Common::IT_ITA,
 			Common::kPlatformPC,
 		},
@@ -1224,7 +853,15 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon1",
 			"CD",
-			SIMON1TALKIE_IT_ALT_GameFiles,
+
+			{
+	{ "gamepc",		GAME_BASEFILE,	"8d3ca654e158c91b860c7eae31d65312"},
+	{ "icon.dat",		GAME_ICONFILE,	"22107c24dfb31b66ac503c28a6e20b19"},
+	{ "simon.gme",		GAME_GMEFILE,	"104efd83c8f3edf545982e07d87f66ac"},
+	{ "stripped.txt",	GAME_STRFILE,	"9d31bef42db1a8abe4e9f368014df1d5"},
+	{ "tbllist",		GAME_TBLFILE,	"d198a80de2c59e4a0cd24b98814849e8"},
+	{ NULL, 0, NULL}
+			},
 			// FIXME: DOS version which uses WAV format
 			Common::IT_ITA,
 			Common::kPlatformWindows,
@@ -1240,7 +877,15 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon1",
 			"CD",
-			SIMON1TALKIE_ES_GameFiles,
+
+			{
+	{ "gamepc",		GAME_BASEFILE,	"439f801ba52c02c9d1844600d1ce0f5e"},
+	{ "icon.dat",		GAME_ICONFILE,	"22107c24dfb31b66ac503c28a6e20b19"},
+	{ "simon.gme",		GAME_GMEFILE,	"eff2774a73890b9eac533db90cd1afa1"},
+	{ "stripped.txt",	GAME_STRFILE,	"9d31bef42db1a8abe4e9f368014df1d5"},
+	{ "tbllist",		GAME_TBLFILE,	"d198a80de2c59e4a0cd24b98814849e8"},
+	{ NULL, 0, NULL}
+			},
 			Common::ES_ESP,
 			Common::kPlatformPC,
 		},
@@ -1255,7 +900,15 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon1",
 			"CD",
-			SIMON1WIN_EN_GameFiles,
+
+			{
+	{ "gamepc",		GAME_BASEFILE,	"c7c12fea7f6d0bfd22af5cdbc8166862"},
+	{ "icon.dat",		GAME_ICONFILE,	"22107c24dfb31b66ac503c28a6e20b19"},
+	{ "simon.gme",		GAME_GMEFILE,	"b1b18d0731b64c0738c5cc4a2ee792fc"},
+	{ "stripped.txt",	GAME_STRFILE,	"a27e87a9ba21212d769804b3df47bfb2"},
+	{ "tbllist",		GAME_TBLFILE,	"d198a80de2c59e4a0cd24b98814849e8"},
+	{ NULL, 0, NULL}
+			},
 			Common::EN_ANY,
 			Common::kPlatformWindows,
 		},
@@ -1270,7 +923,15 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon1",
 			"CD",
-			SIMON1WIN_RU_GameFiles,
+
+			{
+	{ "gamepc",		GAME_BASEFILE,	"4536a706412b36d628f12142bfa97af0"},
+	{ "icon.dat",		GAME_ICONFILE,	"22107c24dfb31b66ac503c28a6e20b19"},
+	{ "simon.gme",		GAME_GMEFILE,	"b1b18d0731b64c0738c5cc4a2ee792fc"},
+	{ "stripped.txt",	GAME_STRFILE,	"a27e87a9ba21212d769804b3df47bfb2"},
+	{ "tbllist",		GAME_TBLFILE,	"d198a80de2c59e4a0cd24b98814849e8"},
+	{ NULL, 0, NULL}
+			},
 			Common::RU_RUS,
 			Common::kPlatformWindows,
 		},
@@ -1285,7 +946,15 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon1",
 			"CD",
-			SIMON1WIN_DE_GameFiles,
+
+			{
+	{ "gamepc",		GAME_BASEFILE,	"48b1f3499e2e0d731047f4d481ff7817"},
+	{ "icon.dat",		GAME_ICONFILE,	"22107c24dfb31b66ac503c28a6e20b19"},
+	{ "simon.gme",		GAME_GMEFILE,	"acd9cc438525b142d93b15c77a6f551b"},
+	{ "stripped.txt",	GAME_STRFILE,	"40d68bec54042ef930f084ad9a4342a1"},
+	{ "tbllist",		GAME_TBLFILE,	"d198a80de2c59e4a0cd24b98814849e8"},
+	{ NULL, 0, NULL}
+			},
 			Common::DE_DEU,
 			Common::kPlatformWindows,
 		},
@@ -1300,7 +969,15 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon2",
 			"Floppy",
-			SIMON2DOS_EN_GameFiles,
+
+			{
+	{ "game32",		GAME_BASEFILE,	"27c8e7feada80c75b70b9c2f6088d519"},
+	{ "icon.dat",		GAME_ICONFILE,	"ee92d1f84893195a60449f2430d07285"},
+	{ "simon2.gme",		GAME_GMEFILE,	"eefcc32b1f2c0482c1a59a963a146345"},
+	{ "stripped.txt",	GAME_STRFILE,	"e229f84d46fa83f99b4a7115679f3fb6"},
+	{ "tbllist",		GAME_TBLFILE,	"2082f8d02075e590300478853a91ffd9"},
+	{ NULL, 0, NULL}
+			},
 			Common::EN_ANY,
 			Common::kPlatformPC,
 		},
@@ -1315,7 +992,15 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon2",
 			"Floppy",
-			SIMON2DOS_RU_GameFiles,
+
+			{
+	{ "game32",		GAME_BASEFILE,	"7edfc633dd50f8caa719c478443db70b"},
+	{ "icon.dat",		GAME_ICONFILE,	"ee92d1f84893195a60449f2430d07285"},
+	{ "simon2.gme",		GAME_GMEFILE,	"eefcc32b1f2c0482c1a59a963a146345"},
+	{ "stripped.txt",	GAME_STRFILE,	"e229f84d46fa83f99b4a7115679f3fb6"},
+	{ "tbllist",		GAME_TBLFILE,	"2082f8d02075e590300478853a91ffd9"},
+	{ NULL, 0, NULL}
+			},
 			Common::RU_RUS,
 			Common::kPlatformPC,
 		},
@@ -1330,7 +1015,15 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon2",
 			"Floppy",
-			SIMON2DOS_EN_ALT_GameFiles,
+
+			{
+	{ "game32",		GAME_BASEFILE,	"604d04315935e77624bd356ac926e068"},
+	{ "icon.dat",		GAME_ICONFILE,	"72096a62d36e6034ea9fecc13b2dbdab"},
+	{ "simon2.gme",		GAME_GMEFILE,	"aa6840420899a31874204f90bb214108"},
+	{ "stripped.txt",	GAME_STRFILE,	"e229f84d46fa83f99b4a7115679f3fb6"},
+	{ "tbllist",		GAME_TBLFILE,	"2082f8d02075e590300478853a91ffd9"},
+	{ NULL, 0, NULL}
+			},
 			Common::EN_ANY,
 			Common::kPlatformPC,
 		},
@@ -1345,7 +1038,15 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon2",
 			"Floppy",
-			SIMON2DOS2_RU_GameFiles,
+
+			{
+	{ "game32",		GAME_BASEFILE,	"eb8bde3685842a8fd38f60bc476ef8e9"},
+	{ "icon.dat",		GAME_ICONFILE,	"72096a62d36e6034ea9fecc13b2dbdab"},
+	{ "simon2.gme",		GAME_GMEFILE,	"aa6840420899a31874204f90bb214108"},
+	{ "stripped.txt",	GAME_STRFILE,	"e229f84d46fa83f99b4a7115679f3fb6"},
+	{ "tbllist",		GAME_TBLFILE,	"2082f8d02075e590300478853a91ffd9"},
+	{ NULL, 0, NULL}
+			},
 			Common::RU_RUS,
 			Common::kPlatformPC,
 		},
@@ -1360,7 +1061,15 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon2",
 			"Floppy",
-			SIMON2DOS_DE_GameFiles,
+
+			{
+	{ "game32",		GAME_BASEFILE,	"eb6e3e37fe52993f948d7e2d6b869828"},
+	{ "icon.dat",		GAME_ICONFILE,	"72096a62d36e6034ea9fecc13b2dbdab"},
+	{ "simon2.gme",		GAME_GMEFILE,	"5fa9d080b04c610f526bd685be1bf747"},
+	{ "stripped.txt",	GAME_STRFILE,	"fd30df01cc248ecbaef302af855e0212"},
+	{ "tbllist",		GAME_TBLFILE,	"2082f8d02075e590300478853a91ffd9"},
+	{ NULL, 0, NULL}
+			},
 			Common::DE_DEU,
 			Common::kPlatformPC,
 		},
@@ -1375,7 +1084,15 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon2",
 			"Floppy",
-			SIMON2DOS_IT_GameFiles,
+
+			{
+	{ "game32",		GAME_BASEFILE,	"3e11d400bea0638f360a724687005cd1"},
+	{ "icon.dat",		GAME_ICONFILE,	"72096a62d36e6034ea9fecc13b2dbdab"},
+	{ "simon2.gme",		GAME_GMEFILE,	"f306a397565d7f13bec7ecf14c723de7"},
+	{ "stripped.txt",	GAME_STRFILE,	"bea6843fb9f3b2144fcb146d62db0b9a"},
+	{ "tbllist",		GAME_TBLFILE,	"2082f8d02075e590300478853a91ffd9"},
+	{ NULL, 0, NULL}
+			},
 			Common::IT_ITA,
 			Common::kPlatformPC,
 		},
@@ -1390,7 +1107,15 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon2",
 			"CD Demo",
-			SIMON2DEMO_EN_GameFiles,
+
+			{
+	{ "gsptr30",		GAME_BASEFILE,	"3794c15887539b8578bacab694ccf08a"},
+	{ "icon.dat",		GAME_ICONFILE,	"72096a62d36e6034ea9fecc13b2dbdab"},
+	{ "simon2.gme",		GAME_GMEFILE,	"f8c9e6df1e55923a749e115ba74210c4"},
+	{ "stripped.txt",	GAME_STRFILE,	"e229f84d46fa83f99b4a7115679f3fb6"},
+	{ "tbllist",		GAME_TBLFILE,	"a0d5a494b5d3d209d1a1d76cc8d76601"},
+	{ NULL, 0, NULL}
+			},
 			Common::EN_ANY,
 			Common::kPlatformPC,
 		},
@@ -1405,7 +1130,15 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon2",
 			"CD Demo",
-			SIMON2DEMO_DE_GameFiles,
+
+			{
+	{ "gsptr30",		GAME_BASEFILE,	"7596ef2644fde56ee5fad0dcd483a01e"},
+	{ "icon.dat",		GAME_ICONFILE,	"72096a62d36e6034ea9fecc13b2dbdab"},
+	{ "simon2.gme",		GAME_GMEFILE,	"3f308f201f6b1ddf7c2704c1fc43a3e1"},
+	{ "stripped.txt",	GAME_STRFILE,	"4c68cf64e581a9bd638a56c900b08bfe"},
+	{ "tbllist",		GAME_TBLFILE,	"a0d5a494b5d3d209d1a1d76cc8d76601"},
+	{ NULL, 0, NULL}
+			},
 			Common::DE_DEU,
 			Common::kPlatformPC,
 		},
@@ -1420,7 +1153,15 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon2",
 			"CD",
-			SIMON2TALKIE_EN_GameFiles,
+
+			{
+	{ "gsptr30",		GAME_BASEFILE,	"8c301fb9c4fcf119d2730ccd2a565eb3"},
+	{ "icon.dat",		GAME_ICONFILE,	"72096a62d36e6034ea9fecc13b2dbdab"},
+	{ "simon2.gme",		GAME_GMEFILE,	"9c535d403966750ae98bdaf698375a38"},
+	{ "stripped.txt",	GAME_STRFILE,	"e229f84d46fa83f99b4a7115679f3fb6"},
+	{ "tbllist",		GAME_TBLFILE,	"2082f8d02075e590300478853a91ffd9"},
+	{ NULL, 0, NULL}
+			},
 			Common::EN_ANY,
 			Common::kPlatformPC,
 		},
@@ -1435,7 +1176,15 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon2",
 			"CD",
-			SIMON2TALKIE_EN_ALT_GameFiles,
+
+			{
+	{ "gsptr30",		GAME_BASEFILE,	"608e277904d87dd28725fa08eacc2c0d"},
+	{ "icon.dat",		GAME_ICONFILE,	"72096a62d36e6034ea9fecc13b2dbdab"},
+	{ "simon2.gme",		GAME_GMEFILE,	"8d6dcc65577e285dbca03ff6d7d9323c"},
+	{ "stripped.txt",	GAME_STRFILE,	"e229f84d46fa83f99b4a7115679f3fb6"},
+	{ "tbllist",		GAME_TBLFILE,	"a0d5a494b5d3d209d1a1d76cc8d76601"},
+	{ NULL, 0, NULL}
+			},
 			Common::EN_ANY,
 			Common::kPlatformPC,
 		},
@@ -1450,7 +1199,15 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon2",
 			"CD",
-			SIMON2TALKIE_FR_GameFiles,
+
+			{
+	{ "gsptr30",		GAME_BASEFILE,	"43b3a04d2f0a0cbd1b024c814856561a"},
+	{ "icon.dat",		GAME_ICONFILE,	"72096a62d36e6034ea9fecc13b2dbdab"},
+	{ "simon2.gme",		GAME_GMEFILE,	"8af0e02c0c3344db64dffc12196eb59d"},
+	{ "stripped.txt",	GAME_STRFILE,	"5ea27977b4d7dcfd50eb5074e162ebbf"},
+	{ "tbllist",		GAME_TBLFILE,	"2082f8d02075e590300478853a91ffd9"},
+	{ NULL, 0, NULL}
+			},
 			Common::FR_FRA,
 			Common::kPlatformPC,
 		},
@@ -1465,7 +1222,15 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon2",
 			"CD",
-			SIMON2TALKIE_DE_GameFiles,
+
+			{
+	{ "gsptr30",		GAME_BASEFILE,	"0d05c3f4c06c9a4ceb3d2f5bc0b18e11"},
+	{ "icon.dat",		GAME_ICONFILE,	"72096a62d36e6034ea9fecc13b2dbdab"},
+	{ "simon2.gme",		GAME_GMEFILE,	"6c5fdfdd0eab9038767c2d22858406b2"},
+	{ "stripped.txt",	GAME_STRFILE,	"6de6292c9ac11bfb2e70fdb0f773ba85"},
+	{ "tbllist",		GAME_TBLFILE,	"2082f8d02075e590300478853a91ffd9"},
+	{ NULL, 0, NULL}
+			},
 			Common::DE_DEU,
 			Common::kPlatformPC,
 		},
@@ -1480,7 +1245,15 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon2",
 			"CD",
-			SIMON2TALKIE_DE_ALT_GameFiles,
+
+			{
+	{ "gsptr30",		GAME_BASEFILE,	"a76ea940076b5d9316796dea225a9b69"},
+	{ "icon.dat",		GAME_ICONFILE,	"72096a62d36e6034ea9fecc13b2dbdab"},
+	{ "simon2.gme",		GAME_GMEFILE,	"ec9f0f24fd895e7ea72e3c8e448c0240"},
+	{ "stripped.txt",	GAME_STRFILE,	"6de6292c9ac11bfb2e70fdb0f773ba85"},
+	{ "tbllist",		GAME_TBLFILE,	"2082f8d02075e590300478853a91ffd9"},
+	{ NULL, 0, NULL}
+			},
 			Common::DE_DEU,
 			Common::kPlatformPC,
 		},
@@ -1495,7 +1268,15 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon2",
 			"CD",
-			SIMON2TALKIE_HB_GameFiles,
+
+			{
+	{ "gsptr30",		GAME_BASEFILE,	"952a2b1be23c3c609ba8d988a9a1627d"},
+	{ "icon.dat",		GAME_ICONFILE,	"72096a62d36e6034ea9fecc13b2dbdab"},
+	{ "simon2.gme",		GAME_GMEFILE,	"a2b249a82ea182af09789eb95fb6c5be"},
+	{ "stripped.txt",	GAME_STRFILE,	"de9dbc24158660e153483fa0cf6c3172"},
+	{ "tbllist",		GAME_TBLFILE,	"2082f8d02075e590300478853a91ffd9"},
+	{ NULL, 0, NULL}
+			},
 			Common::HB_ISR,
 			Common::kPlatformPC,
 		},
@@ -1510,7 +1291,15 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon2",
 			"CD",
-			SIMON2TALKIE_IT_GameFiles,
+
+			{
+	{ "gsptr30",		GAME_BASEFILE,	"3e11d400bea0638f360a724687005cd1"},
+	{ "icon.dat",		GAME_ICONFILE,	"72096a62d36e6034ea9fecc13b2dbdab"},
+	{ "simon2.gme",		GAME_GMEFILE,	"344aca58e5ad5e25c517d5eb1d85c435"},
+	{ "stripped.txt",	GAME_STRFILE,	"bea6843fb9f3b2144fcb146d62db0b9a"},
+	{ "tbllist",		GAME_TBLFILE,	"2082f8d02075e590300478853a91ffd9"},
+	{ NULL, 0, NULL}
+			},
 			// FIXME: DOS version which uses WAV format
 			Common::IT_ITA,
 			Common::kPlatformWindows,
@@ -1526,7 +1315,15 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon2",
 			"CD",
-			SIMON2TALKIE_ES_GameFiles,
+
+			{
+	{ "gsptr30",		GAME_BASEFILE,	"268dc322aa73bcf27bb016b8e8ceb889"},
+	{ "icon.dat",		GAME_ICONFILE,	"72096a62d36e6034ea9fecc13b2dbdab"},
+	{ "simon2.gme",		GAME_GMEFILE,	"4f43bd06b6cc78dbd25a7475ca964eb1"},
+	{ "stripped.txt",	GAME_STRFILE,	"d13753796bd81bf313a2449f34d8b112"},
+	{ "tbllist",		GAME_TBLFILE,	"2082f8d02075e590300478853a91ffd9"},
+	{ NULL, 0, NULL}
+			},
 			Common::ES_ESP,
 			Common::kPlatformPC,
 		},
@@ -1541,7 +1338,15 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon2",
 			"CD",
-			SIMON2WIN_CZ_GameFiles,
+
+			{
+	{ "gsptr30",		GAME_BASEFILE,	"eb8217f9ec4628d12ca606033146c48c"},
+	{ "icon.dat",		GAME_ICONFILE,	"72096a62d36e6034ea9fecc13b2dbdab"},
+	{ "simon2.gme",		GAME_GMEFILE,	"2d1074788501c55dcd9e59269ea0aaed"},
+	{ "stripped.txt",	GAME_STRFILE,	"e229f84d46fa83f99b4a7115679f3fb6"},
+	{ "tbllist",		GAME_TBLFILE,	"2082f8d02075e590300478853a91ffd9"},
+	{ NULL, 0, NULL}
+			},
 			Common::CZ_CZE,
 			Common::kPlatformWindows,
 		},
@@ -1556,7 +1361,15 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon2",
 			"CD",
-			SIMON2WIN_EN_GameFiles,
+
+			{
+	{ "gsptr30",		GAME_BASEFILE,	"608e277904d87dd28725fa08eacc2c0d"},
+	{ "icon.dat",		GAME_ICONFILE,	"72096a62d36e6034ea9fecc13b2dbdab"},
+	{ "simon2.gme",		GAME_GMEFILE,	"e749c4c103d7e7d51b34620ed76c5a04"},
+	{ "stripped.txt",	GAME_STRFILE,	"e229f84d46fa83f99b4a7115679f3fb6"},
+	{ "tbllist",		GAME_TBLFILE,	"2082f8d02075e590300478853a91ffd9"},
+	{ NULL, 0, NULL}
+			},
 			Common::EN_ANY,
 			Common::kPlatformWindows,
 		},
@@ -1571,7 +1384,15 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon2",
 			"CD",
-			SIMON2WIN_DE_GameFiles,
+
+			{
+	{ "gsptr30",		GAME_BASEFILE,	"a76ea940076b5d9316796dea225a9b69"},
+	{ "icon.dat",		GAME_ICONFILE,	"72096a62d36e6034ea9fecc13b2dbdab"},
+	{ "simon2.gme",		GAME_GMEFILE,	"9609a933c541fed2e00c6c3479d7c181"},
+	{ "stripped.txt",	GAME_STRFILE,	"6de6292c9ac11bfb2e70fdb0f773ba85"},
+	{ "tbllist",		GAME_TBLFILE,	"2082f8d02075e590300478853a91ffd9"},
+	{ NULL, 0, NULL}
+			},
 			Common::DE_DEU,
 			Common::kPlatformWindows,
 		},
@@ -1586,7 +1407,15 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon2",
 			"CD",
-			SIMON2WIN_DE_ALT_GameFiles,
+
+			{
+	{ "gsptr30",		GAME_BASEFILE,	"9e858b3bb189c134c3a5f34c3385a8d3"},
+	{ "icon.dat",		GAME_ICONFILE,	"ee92d1f84893195a60449f2430d07285"},
+	{ "simon2.gme",		GAME_GMEFILE,	"16d574da07e93bcae43cee353dab8c7e"},
+	{ "stripped.txt",	GAME_STRFILE,	"6de6292c9ac11bfb2e70fdb0f773ba85"},
+	{ "tbllist",		GAME_TBLFILE,	"2082f8d02075e590300478853a91ffd9"},
+	{ NULL, 0, NULL}
+			},
 			Common::DE_DEU,
 			Common::kPlatformWindows,
 		},
@@ -1601,7 +1430,15 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"simon2",
 			"CD",
-			SIMON2WIN_PL_GameFiles,
+
+			{
+	{ "gsptr30",		GAME_BASEFILE,	"657fd873f5d0637097ee02315b447e6f"},
+	{ "icon.dat",		GAME_ICONFILE,	"72096a62d36e6034ea9fecc13b2dbdab"},
+	{ "simon2.gme",		GAME_GMEFILE,	"7b9afcf82a94722707e0d025c0192be8"},
+	{ "stripped.txt",	GAME_STRFILE,	"e229f84d46fa83f99b4a7115679f3fb6"},
+	{ "tbllist",		GAME_TBLFILE,	"2082f8d02075e590300478853a91ffd9"},
+	{ NULL, 0, NULL}
+			},
 			Common::PL_POL,
 			Common::kPlatformWindows,
 		},
@@ -1616,7 +1453,13 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"feeble",
 			"CD",
-			FEEBLEFILES_AMI_UK_GameFiles,
+
+			{
+	{ "game22",		GAME_BASEFILE,	"629762ea9ca9ee9ff85f4774d219f5c7"},
+	{ "gfxindex.dat",	GAME_GFXIDXFILE,"f550f7915c5ce3a68c9f870f507449c2"},
+	{ "tbllist",		GAME_TBLFILE,	"0bbfee8e69739111eb36b0d138da8ddf"},
+	{ NULL, 0, NULL}
+			},
 			Common::EN_ANY,
 			Common::kPlatformAmiga,
 		},
@@ -1631,7 +1474,13 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"feeble",
 			"CD",
-			FEEBLEFILES_AMI_DE_GameFiles,
+
+			{
+	{ "game22",		GAME_BASEFILE,	"bcd76ac080003eee3649df18db25b60e"},
+	{ "gfxindex.dat",	GAME_GFXIDXFILE,"f550f7915c5ce3a68c9f870f507449c2"},
+	{ "tbllist",		GAME_TBLFILE,	"0bbfee8e69739111eb36b0d138da8ddf"},
+	{ NULL, 0, NULL}
+			},
 			Common::DE_DEU,
 			Common::kPlatformAmiga,
 		},
@@ -1646,7 +1495,13 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"feeble",
 			"CD",
-			FEEBLEFILES_MAC_UK_GameFiles,
+
+			{
+	{ "game22",		GAME_BASEFILE,	"629762ea9ca9ee9ff85f4774d219f5c7"},
+	{ "graphics.vga",	GAME_GFXIDXFILE,"11a4853cb35956846976e9473ee0e41e"},
+	{ "tbllist",		GAME_TBLFILE,	"0bbfee8e69739111eb36b0d138da8ddf"},
+	{ NULL, 0, NULL}
+			},
 			Common::EN_ANY,
 			Common::kPlatformMacintosh,
 		},
@@ -1661,7 +1516,13 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"feeble",
 			"CD",
-			FEEBLEFILES_MAC_FR_GameFiles,
+
+			{
+	{ "game22",		GAME_BASEFILE,	"ba90b40a47726039671d9e91630dd7ed"},
+	{ "graphics.vga",	GAME_GFXIDXFILE,"11a4853cb35956846976e9473ee0e41e"},
+	{ "tbllist",		GAME_TBLFILE,	"0bbfee8e69739111eb36b0d138da8ddf"},
+	{ NULL, 0, NULL}
+			},
 			Common::FR_FRA,
 			Common::kPlatformMacintosh,
 		},
@@ -1676,7 +1537,13 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"feeble",
 			"CD",
-			FEEBLEFILES_MAC_DE_GameFiles,
+
+			{
+	{ "game22",		GAME_BASEFILE,	"bcd76ac080003eee3649df18db25b60e"},
+	{ "graphics.vga",	GAME_GFXIDXFILE,"11a4853cb35956846976e9473ee0e41e"},
+	{ "tbllist",		GAME_TBLFILE,	"0bbfee8e69739111eb36b0d138da8ddf"},
+	{ NULL, 0, NULL}
+			},
 			Common::DE_DEU,
 			Common::kPlatformMacintosh,
 		},
@@ -1691,7 +1558,13 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"feeble",
 			"CD",
-			FEEBLEFILES_MAC_ES_GameFiles,
+
+			{
+	{ "game22",		GAME_BASEFILE,	"71d7d2d5e479b053c5a9757f1702c9c3"},
+	{ "graphics.vga",	GAME_GFXIDXFILE,"11a4853cb35956846976e9473ee0e41e"},
+	{ "tbllist",		GAME_TBLFILE,	"0bbfee8e69739111eb36b0d138da8ddf"},
+	{ NULL, 0, NULL}
+			},
 			Common::ES_ESP,
 			Common::kPlatformMacintosh,
 		},
@@ -1706,7 +1579,12 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"feeble",
 			"2CD",
-			FEEBLEFILES_EN_2CD_GameFiles,
+
+			{
+	{ "game22",		GAME_BASEFILE,	"629762ea9ca9ee9ff85f4774d219f5c7"},
+	{ "tbllist",		GAME_TBLFILE,	"0bbfee8e69739111eb36b0d138da8ddf"},
+	{ NULL, 0, NULL}
+			},
 			Common::EN_ANY,
 			Common::kPlatformWindows,
 		},
@@ -1721,7 +1599,12 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"feeble",
 			"4CD",
-			FEEBLEFILES_EN_4CD_GameFiles,
+
+			{
+	{ "game22",		GAME_BASEFILE,	"a8746407a5b20a7da0da0a14c380af1c"},
+	{ "tbllist",		GAME_TBLFILE,	"0bbfee8e69739111eb36b0d138da8ddf"},
+	{ NULL, 0, NULL}
+			},
 			Common::EN_ANY,
 			Common::kPlatformWindows,
 		},
@@ -1736,7 +1619,12 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"feeble",
 			"4CD",
-			FEEBLEFILES_FR_GameFiles,
+
+			{
+	{ "game22",		GAME_BASEFILE,	"ba90b40a47726039671d9e91630dd7ed"},
+	{ "tbllist",		GAME_TBLFILE,	"0bbfee8e69739111eb36b0d138da8ddf"},
+	{ NULL, 0, NULL}
+			},
 			Common::FR_FRA,
 			Common::kPlatformWindows,
 		},
@@ -1751,7 +1639,12 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"feeble",
 			"4CD",
-			FEEBLEFILES_DE_GameFiles,
+
+			{
+	{ "game22",		GAME_BASEFILE,	"bcd76ac080003eee3649df18db25b60e"},
+	{ "tbllist",		GAME_TBLFILE,	"0bbfee8e69739111eb36b0d138da8ddf"},
+	{ NULL, 0, NULL}
+			},
 			Common::DE_DEU,
 			Common::kPlatformWindows,
 		},
@@ -1766,7 +1659,12 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"feeble",
 			"4CD",
-			FEEBLEFILES_IT_GameFiles,
+
+			{
+	{ "game22",		GAME_BASEFILE,	"80576f2e1ed4c912b63921fe77af313e"},
+	{ "tbllist",		GAME_TBLFILE,	"0bbfee8e69739111eb36b0d138da8ddf"},
+	{ NULL, 0, NULL}
+			},
 			Common::IT_ITA,
 			Common::kPlatformWindows,
 		},
@@ -1781,7 +1679,12 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"feeble",
 			"4CD",
-			FEEBLEFILES_ES_GameFiles,
+
+			{
+	{ "game22",		GAME_BASEFILE,	"71d7d2d5e479b053c5a9757f1702c9c3"},
+	{ "tbllist",		GAME_TBLFILE,	"0bbfee8e69739111eb36b0d138da8ddf"},
+	{ NULL, 0, NULL}
+			},
 			Common::ES_ESP,
 			Common::kPlatformWindows,
 		},
@@ -1796,7 +1699,11 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"dimp",
 			"CD",
-			DIMP_GameFiles,
+
+			{
+	{ "Gdimp",		GAME_BASEFILE,	"0b1e89ae1dc2e012b7fa7a987b4ac42a"},
+	{ NULL, 0, NULL}
+			},
 			Common::EN_ANY,
 			Common::kPlatformWindows,
 		},
@@ -1811,7 +1718,11 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"jumble",
 			"CD",
-			JUMBLE_GameFiles,
+
+			{
+	{ "Gjumble",		GAME_BASEFILE,	"d54cce46d339038d1a6b74ea213655bc"},
+	{ NULL, 0, NULL}
+			},
 			Common::EN_ANY,
 			Common::kPlatformWindows,
 		},
@@ -1826,7 +1737,11 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"puzzle",
 			"CD",
-			PUZZLE_GameFiles,
+
+			{
+	{ "Gpuzzle",		GAME_BASEFILE,	"3f80dac8e0d85401a1058a560fe49ab6"},
+	{ NULL, 0, NULL}
+			},
 			Common::EN_ANY,
 			Common::kPlatformWindows,
 		},
@@ -1841,7 +1756,11 @@ static const AGOSGameDescription gameDescriptions[] = {
 		{
 			"swampy",
 			"CD",
-			SWAMPY_GameFiles,
+
+			{
+	{ "Gswampy",		GAME_BASEFILE,	"3a6d4d7b2433e660f2483f9396cc87a2"},
+	{ NULL, 0, NULL}
+			},
 			Common::EN_ANY,
 			Common::kPlatformWindows,
 		},
@@ -1850,5 +1769,5 @@ static const AGOSGameDescription gameDescriptions[] = {
 		GID_SWAMPY,
 		GF_OLD_BUNDLE | GF_TALKIE,
 	},
-	{ { NULL, NULL, NULL, Common::UNK_LANG, Common::kPlatformUnknown }, 0, 0, 0 }
+	{ { NULL, NULL, {NULL, 0, NULL}, Common::UNK_LANG, Common::kPlatformUnknown }, 0, 0, 0 }
 };
diff --git a/engines/agos/game.cpp b/engines/agos/game.cpp
index 7b7f0f2168..671457665a 100644
--- a/engines/agos/game.cpp
+++ b/engines/agos/game.cpp
@@ -35,8 +35,6 @@ namespace AGOS {
 static DetectedGameList GAME_detectGames(const FSList &fslist);
 }
 
-using Common::File;
-
 /**
  * Conversion table mapping old obsolete target names to the
  * corresponding new target and platform combination.
@@ -77,9 +75,6 @@ REGISTER_PLUGIN(AGOS, "AGOS", "AGOS (C) Adventure Soft");
 
 namespace AGOS {
 
-using Common::ADGameFileDescription;
-using Common::ADGameDescription;
-
 #include "agosgame.cpp"
 
 bool AGOSEngine::initGame() {