snes: make pcx_to_tiles_8bpp take argument

Now it takes a parameter for the label names
This commit is contained in:
Vince Weaver 2013-01-17 21:46:29 -05:00
parent 3ecc15c4a0
commit d7882d311b
3 changed files with 48 additions and 41 deletions

View File

@ -9,11 +9,14 @@ tb1_snes.sfc: tb1_snes.o snes-hirom.cfg
$(LD) -o tb1_snes.sfc --config snes-hirom.cfg --obj tb1_snes.o
tb1_snes.o: tb1_snes.s snes_init.s title_screen.s \
tb1_title.tiles
tb1_title.tiles tb1_opening.tiles
$(AS) -t none -o tb1_snes.o -l tb1_snes.lst -c tb1_snes.s
tb1_opening.tiles: graphics/vmw_logo.pcx ./tools/pcx_to_tiles_8bpp
./tools/pcx_to_tiles_8bpp vmw_logo < graphics/vmw_logo.pcx > tb1_opening.tiles
tb1_title.tiles: graphics/tb1_title.pcx ./tools/pcx_to_tiles_8bpp
./tools/pcx_to_tiles_8bpp < graphics/tb1_title.pcx > tb1_title.tiles
./tools/pcx_to_tiles_8bpp title_screen < graphics/tb1_title.pcx > tb1_title.tiles
checksum.inc: ./tools/snes_checksum tb1_snes.sfc
./tools/snes_checksum < tb1_snes.sfc > checksum.inc

View File

@ -54,7 +54,7 @@ display_title:
ldx #$0000 ; pointer
copypal:
lda f:tile_palette, x ; load byte of palette
lda f:title_screen_palette, x ; load byte of palette
sta $2122 ; store to color generator
inx
dey
@ -82,7 +82,7 @@ copypal:
ldx #$0000
copy_tile_data:
lda f:tile_data, x
lda f:title_screen_tile_data, x
sta $2118 ; write the data
inx ; increment by 2 (16-bits)
inx

View File

@ -8,22 +8,23 @@
#include <stdlib.h> /* exit() */
/* Convert to 15-bpp bgr */
int rgb2bgr(int r,int g, int b) {
static int rgb2bgr(int r,int g, int b) {
int r2,g2,b2,bgr;
r2=(r>>3)&0x1f;
g2=(g>>3)&0x1f;
b2=(b>>3)&0x1f;
bgr=(b2<<10)|(g2<<5)|r2;
return bgr;
}
static char symbol_name[BUFSIZ]="temp";
/* File already open */
int vmwLoadPCX(int pcx_fd) {
static int vmwLoadPCX(int pcx_fd) {
int debug=1,bpp;
int x,y;
int i,numacross,planes=0;
@ -31,26 +32,26 @@ int vmwLoadPCX(int pcx_fd) {
int xmin,ymin,xmax,ymax,version;
unsigned char pcx_header[128];
unsigned char temp_byte;
/*************** DECODE THE HEADER *************************/
read(pcx_fd,&pcx_header,128);
xmin=(pcx_header[5]<<8)+pcx_header[4];
ymin=(pcx_header[7]<<8)+pcx_header[6];
xmax=(pcx_header[9]<<8)+pcx_header[8];
ymax=(pcx_header[11]<<8)+pcx_header[10];
version=pcx_header[1];
bpp=pcx_header[3];
if (debug) {
fprintf(stderr,"Manufacturer: ");
if (pcx_header[0]==10) fprintf(stderr,"Zsoft\n");
else fprintf(stderr,"Unknown %i\n",pcx_header[0]);
fprintf(stderr,"Version: ");
switch(version) {
@ -64,19 +65,19 @@ int vmwLoadPCX(int pcx_fd) {
fprintf(stderr,"Encoding: ");
if (pcx_header[2]==1) fprintf(stderr,"RLE\n");
else fprintf(stderr,"Unknown %i\n",pcx_header[2]);
fprintf(stderr,"BitsPerPixelPerPlane: %i\n",bpp);
fprintf(stderr,"File goes from %i,%i to %i,%i\n",xmin,ymin,xmax,ymax);
fprintf(stderr,"Horizontal DPI: %i\n",(pcx_header[13]<<8)+pcx_header[12]);
fprintf(stderr,"Vertical DPI: %i\n",(pcx_header[15]<<8)+pcx_header[14]);
fprintf(stderr,"Number of colored planes: %i\n",pcx_header[65]);
fprintf(stderr,"Bytes per line: %i\n",(pcx_header[67]<<8)+pcx_header[66]);
fprintf(stderr,"Palette Type: %i\n",(pcx_header[69]<<8)+pcx_header[68]);
fprintf(stderr,"Hscreen Size: %i\n",(pcx_header[71]<<8)+pcx_header[70]);
fprintf(stderr,"Vscreen Size: %i\n",(pcx_header[73]<<8)+pcx_header[72]);
}
planes=pcx_header[65];
@ -84,15 +85,15 @@ int vmwLoadPCX(int pcx_fd) {
ysize=((ymax-ymin)+1);
char *output;
output=calloc((xsize*ysize),sizeof(unsigned int));
if (output==NULL) return -1;
x=0; y=0;
while(y<ysize) {
while(y<ysize) {
for(plane=0;plane<planes;plane++) {
x=0;
x=0;
while (x<xsize) {
read(pcx_fd,&temp_byte,1);
if (0xc0 == (temp_byte&0xc0)) {
@ -118,32 +119,31 @@ int vmwLoadPCX(int pcx_fd) {
}
#define X_CHUNKSIZE 8
#define Y_CHUNKSIZE 8
#define Y_CHUNKSIZE 8
unsigned int plane0,plane1,plane2,plane3;
unsigned int plane4,plane5,plane6,plane7,offset;
printf("tile_data:\n");
printf("%s_tile_data:\n",symbol_name);
int ychunk,xchunk;
for(ychunk=0;ychunk<ysize/Y_CHUNKSIZE;ychunk++) {
for(xchunk=0;xchunk<xsize/X_CHUNKSIZE;xchunk++) {
for(xchunk=0;xchunk<xsize/X_CHUNKSIZE;xchunk++) {
printf("\t; Tile %d %d, Plane 0 Plane 1\n",xchunk,ychunk);
for(y=0;y<Y_CHUNKSIZE;y++){
plane0=0;plane1=0;
for(x=0;x<X_CHUNKSIZE;x++) {
plane0<<=1;
plane1<<=1;
offset=((ychunk*Y_CHUNKSIZE+y)*xsize)+(xchunk*X_CHUNKSIZE)+x;
plane0|=(output[offset])&1;
plane1|=(((output[offset])&2)>>1);
}
printf("\t.word $%02x%02x\n",plane1,plane0);
}
printf("\t; Plane 2 Plane 3\n");
for(y=0;y<Y_CHUNKSIZE;y++){
plane2=0;plane3=0;
@ -164,14 +164,14 @@ int vmwLoadPCX(int pcx_fd) {
for(x=0;x<X_CHUNKSIZE;x++) {
plane4<<=1;
plane5<<=1;
offset=((ychunk*Y_CHUNKSIZE+y)*xsize)+(xchunk*X_CHUNKSIZE)+x;
plane4|=(((output[offset])&16)>>4);
plane5|=(((output[offset])&32)>>5);
}
printf("\t.word $%02x%02x\n",plane5,plane4);
}
printf("\t; Plane 6 Plane 7\n");
for(y=0;y<Y_CHUNKSIZE;y++){
plane6=0;plane7=0;
@ -188,8 +188,8 @@ int vmwLoadPCX(int pcx_fd) {
}
}
printf("tile_palette:\n");
printf("%s_palette:\n",symbol_name);
/* read in palette */
read(pcx_fd,&temp_byte,1);
@ -197,8 +197,8 @@ int vmwLoadPCX(int pcx_fd) {
fprintf(stderr,"Error! No palette found!\n");
}
else {
int r,g,b;
for(i=0;i<256;i++) {
int r,g,b;
for(i=0;i<256;i++) {
read(pcx_fd,&temp_byte,1);
r=temp_byte;
read(pcx_fd,&temp_byte,1);
@ -208,23 +208,27 @@ int vmwLoadPCX(int pcx_fd) {
printf("\t.word $%x\t; r=%x g=%x b=%x\n",rgb2bgr(r,g,b),r,g,b);
}
}
return 0;
}
int main(int argc, char **argv) {
int result;
if (argc>1) {
strncpy(symbol_name,argv[1],BUFSIZ);
}
/* read from stdin */
result=vmwLoadPCX(fileno(stdin));
if (result<0) {
fprintf(stderr,"Error reading PCX from stdin\n");
exit(1);
}
return 0;
}