Mercurial > hg > dmlib

comparison tools/lib64fmts.c @ 2125:56d4dc81774b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename various C64_* constants to D64_*.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 27 May 2019 08:35:35 +0300
parents f12ac487954b
children c1a9519a619f
comparison
equal deleted inserted replaced
2124:a17b37872d8e 2125:56d4dc81774b
922 922
923 static Uint8 fmtGetPixelPentelPaint( 923 static Uint8 fmtGetPixelPentelPaint(
924 const DMC64Image *img, const int bmoffs, const int scroffs, 924 const DMC64Image *img, const int bmoffs, const int scroffs,
925 const int shiftX, const int bitmap, const int rasterX, const int rasterY) 925 const int shiftX, const int bitmap, const int rasterX, const int rasterY)
926 { 926 {
927 const int ry = rasterY / C64_SPR_HEIGHT_PX; 927 const int ry = rasterY / D64_SPR_HEIGHT_PX;
928 const int yd = rasterY % C64_SPR_HEIGHT_PX; 928 const int yd = rasterY % D64_SPR_HEIGHT_PX;
929 const int rx = rasterX / C64_SPR_WIDTH_PX; 929 const int rx = rasterX / D64_SPR_WIDTH_PX;
930 const int xd = rasterX % C64_SPR_WIDTH_PX; 930 const int xd = rasterX % D64_SPR_WIDTH_PX;
931 const int offs = (ry * 8 + rx) * C64_SPR_SIZE + (yd * C64_SPR_WIDTH_UT) + (xd / 8); 931 const int offs = (ry * 8 + rx) * D64_SPR_SIZE + (yd * D64_SPR_WIDTH_UT) + (xd / 8);
932 const int mask = 1 << (7 - (rasterX & 7)); 932 const int mask = 1 << (7 - (rasterX & 7));
933 933
934 Uint8 color1 = dmC64GetGenericSCPixel(img, bmoffs, scroffs, shiftX, 0, bitmap, 0); 934 Uint8 color1 = dmC64GetGenericSCPixel(img, bmoffs, scroffs, shiftX, 0, bitmap, 0);
935 Uint8 color2 = img->extraData[0].data[offs] & mask ? 0x0f : 0; 935 Uint8 color2 = img->extraData[0].data[offs] & mask ? 0x0f : 0;
936 Uint8 color3 = img->extraData[0].data[offs + C64_SPR_SIZE * 155] & mask ? img->d022 : 0; 936 Uint8 color3 = img->extraData[0].data[offs + D64_SPR_SIZE * 155] & mask ? img->d022 : 0;
937 937
938 return color3 ? color3 : ( color2 ? color2 : color1 ); 938 return color3 ? color3 : ( color2 ? color2 : color1 );
939 } 939 }
940 940
941 941
983 c1 = dmC64GetGenericSCPixel(img, bmoffs, scroffs, shiftX, vbank , 0, 0), 983 c1 = dmC64GetGenericSCPixel(img, bmoffs, scroffs, shiftX, vbank , 0, 0),
984 c2 = dmC64GetGenericSCPixel(img, bmoffs, scroffs, shiftX, vbank + 8, 1, 0); 984 c2 = dmC64GetGenericSCPixel(img, bmoffs, scroffs, shiftX, vbank + 8, 1, 0);
985 985
986 (void) bitmap; 986 (void) bitmap;
987 (void) rasterX; 987 (void) rasterX;
988 return (c1 * C64_NCOLORS) + c2; 988 return (c1 * D64_NCOLORS) + c2;
989 } 989 }
990 990
991 991
992 static int fmtConvertECIBMP2Image(DMImage *dst, const DMC64Image *src, 992 static int fmtConvertECIBMP2Image(DMImage *dst, const DMC64Image *src,
993 const DMC64ImageFormat *fmt, const DMC64ImageConvSpec *spec) 993 const DMC64ImageFormat *fmt, const DMC64ImageConvSpec *spec)
1109 // 1109 //
1110 DMC64ImageCommonFormat dmC64CommonFormats[] = 1110 DMC64ImageCommonFormat dmC64CommonFormats[] =
1111 { 1111 {
1112 { // #0: Koala Painter type memory layout 1112 { // #0: Koala Painter type memory layout
1113 D64_FMT_MC, 1113 D64_FMT_MC,
1114 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT, 1114 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
1115 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT, 1115 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
1116 2, 1, 1116 2, 1,
1117 NULL, NULL, 1117 NULL, NULL,
1118 NULL, 1118 NULL,
1119 { 1119 {
1120 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL }, 1120 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL },
1125 } 1125 }
1126 }, 1126 },
1127 1127
1128 { // #1: Black Mail FLI Graph 1128 { // #1: Black Mail FLI Graph
1129 D64_FMT_MC | D64_FMT_FLI, 1129 D64_FMT_MC | D64_FMT_FLI,
1130 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT, 1130 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
1131 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT, 1131 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
1132 2, 1, 1132 2, 1,
1133 NULL, NULL, 1133 NULL, NULL,
1134 fmtGetPixelBlackMailFLI, 1134 fmtGetPixelBlackMailFLI,
1135 { 1135 {
1136 { DO_COPY , DS_EXTRA_DATA , 0x0000, 0, 200, 0, NULL, NULL }, 1136 { DO_COPY , DS_EXTRA_DATA , 0x0000, 0, 200, 0, NULL, NULL },
1141 } 1141 }
1142 }, 1142 },
1143 1143
1144 { // #2: Art Studio etc. Hires 1144 { // #2: Art Studio etc. Hires
1145 D64_FMT_HIRES, 1145 D64_FMT_HIRES,
1146 C64_SCR_WIDTH , C64_SCR_HEIGHT, 1146 D64_SCR_WIDTH , D64_SCR_HEIGHT,
1147 C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT, 1147 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
1148 1, 1, 1148 1, 1,
1149 NULL, NULL, 1149 NULL, NULL,
1150 NULL, 1150 NULL,
1151 { 1151 {
1152 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL }, 1152 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL },
1155 } 1155 }
1156 }, 1156 },
1157 1157
1158 { // #3: FunPaint II 1158 { // #3: FunPaint II
1159 D64_FMT_MC | D64_FMT_FLI | D64_FMT_ILACE, 1159 D64_FMT_MC | D64_FMT_FLI | D64_FMT_ILACE,
1160 C64_SCR_WIDTH, C64_SCR_HEIGHT, 1160 D64_SCR_WIDTH, D64_SCR_HEIGHT,
1161 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT, 1161 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
1162 1, 1, 1162 1, 1,
1163 NULL, NULL, 1163 NULL, NULL,
1164 fmtGetPixelFunPaint2, 1164 fmtGetPixelFunPaint2,
1165 { 1165 {
1166 DEF_SCREEN_RAMS_8(0x0000, 0, 0x400, 0), 1166 DEF_SCREEN_RAMS_8(0x0000, 0, 0x400, 0),
1175 } 1175 }
1176 }, 1176 },
1177 1177
1178 { // #4: DrazPaint 1.x & 2 1178 { // #4: DrazPaint 1.x & 2
1179 D64_FMT_MC, 1179 D64_FMT_MC,
1180 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT, 1180 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
1181 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT, 1181 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
1182 2, 1, 1182 2, 1,
1183 NULL, NULL, 1183 NULL, NULL,
1184 NULL, 1184 NULL,
1185 { 1185 {
1186 { DO_COPY , DS_COLOR_RAM , 0x0000, 0, 0, 0, NULL, NULL }, 1186 { DO_COPY , DS_COLOR_RAM , 0x0000, 0, 0, 0, NULL, NULL },
1191 } 1191 }
1192 }, 1192 },
1193 1193
1194 { // #5: DrazLace 1.0 1194 { // #5: DrazLace 1.0
1195 D64_FMT_MC | D64_FMT_ILACE, 1195 D64_FMT_MC | D64_FMT_ILACE,
1196 C64_SCR_WIDTH , C64_SCR_HEIGHT, 1196 D64_SCR_WIDTH , D64_SCR_HEIGHT,
1197 C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT, 1197 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
1198 1, 1, 1198 1, 1,
1199 NULL, NULL, 1199 NULL, NULL,
1200 NULL, 1200 NULL,
1201 { 1201 {
1202 { DO_COPY , DS_COLOR_RAM , 0x0000, 0, 0, 0, NULL, NULL }, 1202 { DO_COPY , DS_COLOR_RAM , 0x0000, 0, 0, 0, NULL, NULL },
1209 } 1209 }
1210 }, 1210 },
1211 1211
1212 { // #6: TruePaint 1212 { // #6: TruePaint
1213 D64_FMT_MC | D64_FMT_ILACE, 1213 D64_FMT_MC | D64_FMT_ILACE,
1214 C64_SCR_WIDTH , C64_SCR_HEIGHT, 1214 D64_SCR_WIDTH , D64_SCR_HEIGHT,
1215 C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT, 1215 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
1216 1, 1, 1216 1, 1,
1217 NULL, NULL, 1217 NULL, NULL,
1218 fmtGetPixelTruePaint, 1218 fmtGetPixelTruePaint,
1219 { 1219 {
1220 { DO_COPY , DS_SCREEN_RAM , 0x0000, 0, 0, 0, NULL, NULL }, 1220 { DO_COPY , DS_SCREEN_RAM , 0x0000, 0, 0, 0, NULL, NULL },
1228 } 1228 }
1229 }, 1229 },
1230 1230
1231 { // #7: ECI Graphic Editor Hires FLI 1231 { // #7: ECI Graphic Editor Hires FLI
1232 D64_FMT_HIRES | D64_FMT_FLI, 1232 D64_FMT_HIRES | D64_FMT_FLI,
1233 C64_SCR_WIDTH, C64_SCR_HEIGHT, 1233 D64_SCR_WIDTH, D64_SCR_HEIGHT,
1234 C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT, 1234 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
1235 1, 1, 1235 1, 1,
1236 fmtConvertECIBMP2Image, NULL, 1236 fmtConvertECIBMP2Image, NULL,
1237 fmtGetPixelECI, 1237 fmtGetPixelECI,
1238 { 1238 {
1239 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL }, 1239 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL },
1245 } 1245 }
1246 }, 1246 },
1247 1247
1248 { // #8: Cosmos Designs Hires Manager 1248 { // #8: Cosmos Designs Hires Manager
1249 D64_FMT_HIRES | D64_FMT_FLI, 1249 D64_FMT_HIRES | D64_FMT_FLI,
1250 C64_SCR_WIDTH, 24*8, // Actually 296 x 192 (=24*8) 1250 D64_SCR_WIDTH, 24*8, // Actually 296 x 192 (=24*8)
1251 C64_SCR_CH_WIDTH, 24, 1251 D64_SCR_CH_WIDTH, 24,
1252 1, 1, 1252 1, 1,
1253 NULL, NULL, 1253 NULL, NULL,
1254 fmtGetPixelCrestHIFLIorCDHM, 1254 fmtGetPixelCrestHIFLIorCDHM,
1255 { 1255 {
1256 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL }, 1256 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL },
1259 } 1259 }
1260 }, 1260 },
1261 1261
1262 { // #9: FBI Crew FLI Designer 1.x & 2.0 1262 { // #9: FBI Crew FLI Designer 1.x & 2.0
1263 D64_FMT_MC | D64_FMT_FLI, 1263 D64_FMT_MC | D64_FMT_FLI,
1264 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT, 1264 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
1265 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT, 1265 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
1266 2, 1, 1266 2, 1,
1267 NULL, NULL, 1267 NULL, NULL,
1268 fmtGetPixelFLIDesigner, 1268 fmtGetPixelFLIDesigner,
1269 { 1269 {
1270 { DO_COPY , DS_COLOR_RAM , 0x0000, 0, 0, 0, NULL, NULL }, 1270 { DO_COPY , DS_COLOR_RAM , 0x0000, 0, 0, 0, NULL, NULL },
1274 } 1274 }
1275 }, 1275 },
1276 1276
1277 { // #10: Doodle 1277 { // #10: Doodle
1278 D64_FMT_HIRES, 1278 D64_FMT_HIRES,
1279 C64_SCR_WIDTH , C64_SCR_HEIGHT, 1279 D64_SCR_WIDTH , D64_SCR_HEIGHT,
1280 C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT, 1280 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
1281 1, 1, 1281 1, 1,
1282 NULL, NULL, 1282 NULL, NULL,
1283 NULL, 1283 NULL,
1284 { 1284 {
1285 { DO_COPY , DS_SCREEN_RAM , 0x0000, 0, 0, 0, NULL, NULL }, 1285 { DO_COPY , DS_SCREEN_RAM , 0x0000, 0, 0, 0, NULL, NULL },
1334 "vid", "Vidcom 64 (unpacked)", 0x5800, 10050, DM_FMT_RDWR, 1334 "vid", "Vidcom 64 (unpacked)", 0x5800, 10050, DM_FMT_RDWR,
1335 NULL, 1335 NULL,
1336 NULL, NULL, 1336 NULL, NULL,
1337 { 1337 {
1338 D64_FMT_MC, 1338 D64_FMT_MC,
1339 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT, 1339 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
1340 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT, 1340 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
1341 2, 1, 1341 2, 1,
1342 NULL, NULL, 1342 NULL, NULL,
1343 NULL, 1343 NULL,
1344 { 1344 {
1345 { DO_COPY , DS_COLOR_RAM , 0x0000, 0, 0, 0, NULL, NULL }, 1345 { DO_COPY , DS_COLOR_RAM , 0x0000, 0, 0, 0, NULL, NULL },
1356 "p64", "Picasso 64 (unpacked)", 0x1800, 10050, DM_FMT_RDWR, 1356 "p64", "Picasso 64 (unpacked)", 0x1800, 10050, DM_FMT_RDWR,
1357 NULL, 1357 NULL,
1358 NULL, NULL, 1358 NULL, NULL,
1359 { 1359 {
1360 D64_FMT_MC, 1360 D64_FMT_MC,
1361 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT, 1361 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
1362 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT, 1362 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
1363 2, 1, 1363 2, 1,
1364 NULL, NULL, 1364 NULL, NULL,
1365 NULL, 1365 NULL,
1366 { 1366 {
1367 { DO_COPY , DS_COLOR_RAM , 0x0000, 0, 0, 0, NULL, NULL }, 1367 { DO_COPY , DS_COLOR_RAM , 0x0000, 0, 0, 0, NULL, NULL },
1406 "aas", "Advanced Art Studio (unpacked)", 0x2000, 10018, DM_FMT_RDWR, 1406 "aas", "Advanced Art Studio (unpacked)", 0x2000, 10018, DM_FMT_RDWR,
1407 NULL, 1407 NULL,
1408 NULL, NULL, 1408 NULL, NULL,
1409 { 1409 {
1410 D64_FMT_MC, 1410 D64_FMT_MC,
1411 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT, 1411 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
1412 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT, 1412 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
1413 2, 1, 1413 2, 1,
1414 NULL, NULL, 1414 NULL, NULL,
1415 NULL, 1415 NULL,
1416 { 1416 {
1417 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL }, 1417 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL },
1429 "ims", "Image System MC (unpacked)", 0x3c00, 10218, DM_FMT_RDWR, 1429 "ims", "Image System MC (unpacked)", 0x3c00, 10218, DM_FMT_RDWR,
1430 NULL, 1430 NULL,
1431 NULL, NULL, 1431 NULL, NULL,
1432 { 1432 {
1433 D64_FMT_MC, 1433 D64_FMT_MC,
1434 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT, 1434 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
1435 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT, 1435 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
1436 2, 1, 1436 2, 1,
1437 NULL, NULL, 1437 NULL, NULL,
1438 NULL, 1438 NULL,
1439 { 1439 {
1440 { DO_COPY , DS_COLOR_RAM , 0x0000, 0, 0, 0, NULL, NULL }, 1440 { DO_COPY , DS_COLOR_RAM , 0x0000, 0, 0, 0, NULL, NULL },
1451 "mil", "Micro Illustrator (unpacked)", 0x18dc, 10022, DM_FMT_RDWR | DM_FMT_BROKEN, 1451 "mil", "Micro Illustrator (unpacked)", 0x18dc, 10022, DM_FMT_RDWR | DM_FMT_BROKEN,
1452 fmtProbeMicroIllustrator, 1452 fmtProbeMicroIllustrator,
1453 NULL, NULL, 1453 NULL, NULL,
1454 { 1454 {
1455 D64_FMT_MC, 1455 D64_FMT_MC,
1456 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT, 1456 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
1457 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT, 1457 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
1458 2, 1, 1458 2, 1,
1459 NULL, NULL, 1459 NULL, NULL,
1460 NULL, 1460 NULL,
1461 { 1461 {
1462 { DO_COPY , DS_SCREEN_RAM , 20 + 0 , 0, 0, 0, NULL, NULL }, 1462 { DO_COPY , DS_SCREEN_RAM , 20 + 0 , 0, 0, 0, NULL, NULL },
1475 "cdu", "CDU-Paint (unpacked)", 0x7eef, 10277, DM_FMT_RDWR, 1475 "cdu", "CDU-Paint (unpacked)", 0x7eef, 10277, DM_FMT_RDWR,
1476 NULL, 1476 NULL,
1477 NULL, NULL, 1477 NULL, NULL,
1478 { 1478 {
1479 D64_FMT_MC, 1479 D64_FMT_MC,
1480 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT, 1480 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
1481 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT, 1481 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
1482 2, 1, 1482 2, 1,
1483 NULL, NULL, 1483 NULL, NULL,
1484 NULL, 1484 NULL,
1485 { 1485 {
1486 { DO_COPY , DS_BITMAP_RAM , 0x0000 + 0x111, 0, 0, 0, NULL, NULL }, 1486 { DO_COPY , DS_BITMAP_RAM , 0x0000 + 0x111, 0, 0, 0, NULL, NULL },
1497 "rbp", "Rainbow Painter (unpacked)", 0x5c00, 10242, DM_FMT_RDWR | DM_FMT_BROKEN, 1497 "rbp", "Rainbow Painter (unpacked)", 0x5c00, 10242, DM_FMT_RDWR | DM_FMT_BROKEN,
1498 NULL, 1498 NULL,
1499 NULL, NULL, 1499 NULL, NULL,
1500 { 1500 {
1501 D64_FMT_MC, 1501 D64_FMT_MC,
1502 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT, 1502 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
1503 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT, 1503 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
1504 2, 1, 1504 2, 1,
1505 NULL, NULL, 1505 NULL, NULL,
1506 NULL, 1506 NULL,
1507 { 1507 {
1508 { DO_COPY , DS_SCREEN_RAM , 0x0000, 0, 0, 0, NULL, NULL }, 1508 { DO_COPY , DS_SCREEN_RAM , 0x0000, 0, 0, 0, NULL, NULL },
1520 "sar", "Saracen Paint (unpacked)", 0x7800, 10219, DM_FMT_RDWR, 1520 "sar", "Saracen Paint (unpacked)", 0x7800, 10219, DM_FMT_RDWR,
1521 fmtProbeSaracenPaint, 1521 fmtProbeSaracenPaint,
1522 NULL, NULL, 1522 NULL, NULL,
1523 { 1523 {
1524 D64_FMT_MC, 1524 D64_FMT_MC,
1525 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT, 1525 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
1526 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT, 1526 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
1527 2, 1, 1527 2, 1,
1528 NULL, NULL, 1528 NULL, NULL,
1529 NULL, 1529 NULL,
1530 { 1530 {
1531 { DO_COPY , DS_SCREEN_RAM , 0x7800 - 0x7800, 0, 0, 0, NULL, NULL }, 1531 { DO_COPY , DS_SCREEN_RAM , 0x7800 - 0x7800, 0, 0, 0, NULL, NULL },
1542 "blp", "Blazing Paddles (unpacked)", 0xA000, 10242, DM_FMT_RDWR, 1542 "blp", "Blazing Paddles (unpacked)", 0xA000, 10242, DM_FMT_RDWR,
1543 NULL, 1543 NULL,
1544 NULL, NULL, 1544 NULL, NULL,
1545 { 1545 {
1546 D64_FMT_MC, 1546 D64_FMT_MC,
1547 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT, 1547 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
1548 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT, 1548 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
1549 2, 1, 1549 2, 1,
1550 NULL, NULL, 1550 NULL, NULL,
1551 NULL, 1551 NULL,
1552 { 1552 {
1553 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL }, 1553 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL },
1566 "pmg", "Paint Magic crippled MC (unpacked)", 0x3f8e, 9332, DM_FMT_RDWR, 1566 "pmg", "Paint Magic crippled MC (unpacked)", 0x3f8e, 9332, DM_FMT_RDWR,
1567 NULL, 1567 NULL,
1568 NULL, NULL, 1568 NULL, NULL,
1569 { 1569 {
1570 D64_FMT_MC, 1570 D64_FMT_MC,
1571 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT, 1571 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
1572 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT, 1572 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
1573 2, 1, 1573 2, 1,
1574 NULL, NULL, 1574 NULL, NULL,
1575 NULL, 1575 NULL,
1576 { 1576 {
1577 { DO_COPY , DS_BITMAP_RAM , 0x4000 + 0x72 - 0x4000, 0, 0, 0, NULL, NULL }, 1577 { DO_COPY , DS_BITMAP_RAM , 0x4000 + 0x72 - 0x4000, 0, 0, 0, NULL, NULL },
1589 "a64", "Wigmore Artist 64 (unpacked)", 0x4000, 10242, DM_FMT_RDWR, 1589 "a64", "Wigmore Artist 64 (unpacked)", 0x4000, 10242, DM_FMT_RDWR,
1590 NULL, 1590 NULL,
1591 NULL, NULL, 1591 NULL, NULL,
1592 { 1592 {
1593 D64_FMT_MC, 1593 D64_FMT_MC,
1594 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT, 1594 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
1595 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT, 1595 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
1596 2, 1, 1596 2, 1,
1597 NULL, NULL, 1597 NULL, NULL,
1598 NULL, 1598 NULL,
1599 { 1599 {
1600 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL }, 1600 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL },
1661 "mon", "Monomagic (unpacked)", 0x2000, 8194, DM_FMT_RDWR, 1661 "mon", "Monomagic (unpacked)", 0x2000, 8194, DM_FMT_RDWR,
1662 NULL, 1662 NULL,
1663 NULL, NULL, 1663 NULL, NULL,
1664 { 1664 {
1665 D64_FMT_HIRES, 1665 D64_FMT_HIRES,
1666 C64_SCR_WIDTH , C64_SCR_HEIGHT, 1666 D64_SCR_WIDTH , D64_SCR_HEIGHT,
1667 C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT, 1667 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
1668 1, 1, 1668 1, 1,
1669 NULL, NULL, 1669 NULL, NULL,
1670 NULL, 1670 NULL,
1671 { 1671 {
1672 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL }, 1672 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL },
1682 "hir", "Plain hires (unpacked)", 0x2000, 8002, DM_FMT_RDWR, 1682 "hir", "Plain hires (unpacked)", 0x2000, 8002, DM_FMT_RDWR,
1683 NULL, 1683 NULL,
1684 NULL, NULL, 1684 NULL, NULL,
1685 { 1685 {
1686 D64_FMT_HIRES, 1686 D64_FMT_HIRES,
1687 C64_SCR_WIDTH , C64_SCR_HEIGHT, 1687 D64_SCR_WIDTH , D64_SCR_HEIGHT,
1688 C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT, 1688 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
1689 1, 1, 1689 1, 1,
1690 NULL, NULL, 1690 NULL, NULL,
1691 NULL, 1691 NULL,
1692 { 1692 {
1693 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL }, 1693 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL },
1702 "gih", "Gigapaint hires (unpacked)", 0x6000, 8002, DM_FMT_RDWR, 1702 "gih", "Gigapaint hires (unpacked)", 0x6000, 8002, DM_FMT_RDWR,
1703 fmtProbeGigapaintHires, 1703 fmtProbeGigapaintHires,
1704 NULL, NULL, 1704 NULL, NULL,
1705 { 1705 {
1706 D64_FMT_HIRES, 1706 D64_FMT_HIRES,
1707 C64_SCR_WIDTH , C64_SCR_HEIGHT, 1707 D64_SCR_WIDTH , D64_SCR_HEIGHT,
1708 C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT, 1708 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
1709 1, 1, 1709 1, 1,
1710 NULL, NULL, 1710 NULL, NULL,
1711 NULL, 1711 NULL,
1712 { 1712 {
1713 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL }, 1713 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL },
1722 "bfli", "Pu-239 Big FLI/BFLI (unpacked)", 0x3bff, 33795, DM_FMT_RD, 1722 "bfli", "Pu-239 Big FLI/BFLI (unpacked)", 0x3bff, 33795, DM_FMT_RD,
1723 NULL, 1723 NULL,
1724 NULL, NULL, 1724 NULL, NULL,
1725 { 1725 {
1726 D64_FMT_MC | D64_FMT_FLI, 1726 D64_FMT_MC | D64_FMT_FLI,
1727 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT * 2, 1727 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT * 2,
1728 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT, 1728 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
1729 2, 1, 1729 2, 1,
1730 NULL, NULL, 1730 NULL, NULL,
1731 fmtGetPixelBFLI, 1731 fmtGetPixelBFLI,
1732 { 1732 {
1733 { DO_COPY , DS_COLOR_RAM , 0x0001, 0, 0x400 , 0, NULL, NULL }, 1733 { DO_COPY , DS_COLOR_RAM , 0x0001, 0, 0x400 , 0, NULL, NULL },
1787 "fpt", "Face Painter (unpacked)", 0x4000, 10004, DM_FMT_RDWR, 1787 "fpt", "Face Painter (unpacked)", 0x4000, 10004, DM_FMT_RDWR,
1788 NULL, 1788 NULL,
1789 NULL, NULL, 1789 NULL, NULL,
1790 { // Almost same layout as Koala Painter, but FPT has D020 1790 { // Almost same layout as Koala Painter, but FPT has D020
1791 D64_FMT_MC, 1791 D64_FMT_MC,
1792 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT, 1792 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
1793 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT, 1793 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
1794 2, 1, 1794 2, 1,
1795 NULL, NULL, 1795 NULL, NULL,
1796 NULL, 1796 NULL,
1797 { 1797 {
1798 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL }, 1798 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL },
1810 "xx1", "Unknown $2000 format (unpacked)", 0x2000, 10242, DM_FMT_RDWR, 1810 "xx1", "Unknown $2000 format (unpacked)", 0x2000, 10242, DM_FMT_RDWR,
1811 NULL, 1811 NULL,
1812 NULL, NULL, 1812 NULL, NULL,
1813 { 1813 {
1814 D64_FMT_MC, 1814 D64_FMT_MC,
1815 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT, 1815 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
1816 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT, 1816 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
1817 2, 1, 1817 2, 1,
1818 NULL, NULL, 1818 NULL, NULL,
1819 NULL, 1819 NULL,
1820 { 1820 {
1821 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL }, 1821 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL },
1868 "gun", "GunPaint (unpacked)", 0x4000, 0, DM_FMT_RDWR, 1868 "gun", "GunPaint (unpacked)", 0x4000, 0, DM_FMT_RDWR,
1869 fmtProbeGunPaint, 1869 fmtProbeGunPaint,
1870 NULL, NULL, 1870 NULL, NULL,
1871 { 1871 {
1872 D64_FMT_MC | D64_FMT_FLI | D64_FMT_ILACE, 1872 D64_FMT_MC | D64_FMT_FLI | D64_FMT_ILACE,
1873 C64_SCR_WIDTH, C64_SCR_HEIGHT, 1873 D64_SCR_WIDTH, D64_SCR_HEIGHT,
1874 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT, 1874 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
1875 1, 1, 1875 1, 1,
1876 NULL, NULL, 1876 NULL, NULL,
1877 fmtGetPixelFunPaint2, // The format is essentially same as FP2 1877 fmtGetPixelFunPaint2, // The format is essentially same as FP2
1878 { 1878 {
1879 DEF_SCREEN_RAMS_8(0x0000, 0, 0x400, 0), 1879 DEF_SCREEN_RAMS_8(0x0000, 0, 0x400, 0),
1897 "hcb", "Half Char Bitmap (unpacked)", 0x5000, 12148, DM_FMT_RDWR, 1897 "hcb", "Half Char Bitmap (unpacked)", 0x5000, 12148, DM_FMT_RDWR,
1898 NULL, 1898 NULL,
1899 NULL, NULL, 1899 NULL, NULL,
1900 { 1900 {
1901 D64_FMT_MC | D64_FMT_FLI, 1901 D64_FMT_MC | D64_FMT_FLI,
1902 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT, 1902 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
1903 C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT, 1903 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
1904 2, 1, 1904 2, 1,
1905 NULL, NULL, 1905 NULL, NULL,
1906 fmtGetPixelHCB, 1906 fmtGetPixelHCB,
1907 { 1907 {
1908 { DO_COPY , DS_COLOR_RAM , 0x0000, 0, 0, 0, NULL, NULL }, 1908 { DO_COPY , DS_COLOR_RAM , 0x0000, 0, 0, 0, NULL, NULL },
1909 { DO_COPY , DS_COLOR_RAM , 0x0400, 1, 0, 0, NULL, NULL }, 1909 { DO_COPY , DS_COLOR_RAM , 0x0400, 1, 0, 0, NULL, NULL },
1910 { DO_COPY , DS_SCREEN_RAM , 0x0800, 0, 0, 0, NULL, NULL }, 1910 { DO_COPY , DS_SCREEN_RAM , 0x0800, 0, 0, 0, NULL, NULL },
1911 { DO_COPY , DS_SCREEN_RAM , 0x0c00, 1, 0, 0, NULL, NULL }, 1911 { DO_COPY , DS_SCREEN_RAM , 0x0c00, 1, 0, 0, NULL, NULL },
1912 { DO_COPY , DS_BITMAP_RAM , 0x1000, 0, 0, 0, NULL, NULL }, 1912 { DO_COPY , DS_BITMAP_RAM , 0x1000, 0, 0, 0, NULL, NULL },
1913 { DO_COPY , DS_EXTRA_DATA , 0x2f40, 0, C64_SCR_HEIGHT / 4, 0, NULL, NULL }, 1913 { DO_COPY , DS_EXTRA_DATA , 0x2f40, 0, D64_SCR_HEIGHT / 4, 0, NULL, NULL },
1914 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL }, 1914 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL },
1915 } 1915 }
1916 }, 1916 },
1917 NULL 1917 NULL
1918 }, 1918 },
1921 "pen", "Pentel Paint (unpacked)", 0x4800, 19845, DM_FMT_RD | DM_FMT_BROKEN, 1921 "pen", "Pentel Paint (unpacked)", 0x4800, 19845, DM_FMT_RD | DM_FMT_BROKEN,
1922 NULL, 1922 NULL,
1923 NULL, NULL, 1923 NULL, NULL,
1924 { 1924 {
1925 D64_FMT_HIRES | D64_FMT_FLI, 1925 D64_FMT_HIRES | D64_FMT_FLI,
1926 192, C64_SCR_HEIGHT, 1926 192, D64_SCR_HEIGHT,
1927 24, C64_SCR_CH_HEIGHT, 1927 24, D64_SCR_CH_HEIGHT,
1928 2, 1, 1928 2, 1,
1929 NULL, NULL, 1929 NULL, NULL,
1930 fmtGetPixelPentelPaint, 1930 fmtGetPixelPentelPaint,
1931 { 1931 {
1932 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL }, 1932 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL },
1933 { DO_SET_OP , DS_SCREEN_RAM , 0x10 , 0, 0, 0, NULL, NULL }, 1933 { DO_SET_OP , DS_SCREEN_RAM , 0x10 , 0, 0, 0, NULL, NULL },
1934 { DO_SET_MEM_LO , DS_BGCOL , 0x9580 - 0x4800, 0, 0, 0, NULL, NULL }, 1934 { DO_SET_MEM_LO , DS_BGCOL , 0x9580 - 0x4800, 0, 0, 0, NULL, NULL },
1935 { DO_SET_MEM_LO , DS_D022 , 0x9581 - 0x4800, 0, 0, 0, NULL, NULL }, // Sprite color 1935 { DO_SET_MEM_LO , DS_D022 , 0x9581 - 0x4800, 0, 0, 0, NULL, NULL }, // Sprite color
1936 { DO_SET_MEM_LO , DS_COLOR_RAM , 0x9582 - 0x4800, 0, 0, 0, NULL, NULL }, 1936 { DO_SET_MEM_LO , DS_COLOR_RAM , 0x9582 - 0x4800, 0, 0, 0, NULL, NULL },
1937 { DO_COPY , DS_EXTRA_DATA , 0x5ac0 - 0x4800, 0, C64_SPR_SIZE * 235, 0, NULL, NULL }, // Sprite data 1937 { DO_COPY , DS_EXTRA_DATA , 0x5ac0 - 0x4800, 0, D64_SPR_SIZE * 235, 0, NULL, NULL }, // Sprite data
1938 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL }, 1938 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL },
1939 } 1939 }
1940 }, 1940 },
1941 NULL 1941 NULL
1942 }, 1942 },
1945 "chid", "Crest Hires FLI Designer (unpacked)", 0x4000, 16386, DM_FMT_RDWR, 1945 "chid", "Crest Hires FLI Designer (unpacked)", 0x4000, 16386, DM_FMT_RDWR,
1946 NULL, 1946 NULL,
1947 NULL, NULL, 1947 NULL, NULL,
1948 { 1948 {
1949 D64_FMT_HIRES | D64_FMT_FLI, 1949 D64_FMT_HIRES | D64_FMT_FLI,
1950 C64_SCR_WIDTH, C64_SCR_HEIGHT, // Actually 296 x 112 (=14*8) 1950 D64_SCR_WIDTH, D64_SCR_HEIGHT, // Actually 296 x 112 (=14*8)
1951 C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT, 1951 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
1952 1, 1, 1952 1, 1,
1953 NULL, NULL, 1953 NULL, NULL,
1954 fmtGetPixelCrestHIFLIorCDHM, 1954 fmtGetPixelCrestHIFLIorCDHM,
1955 { 1955 {
1956 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL }, 1956 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL },