From 8e77643bb4e89a19eeb2d577145f99b1e11c8612 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Mon, 21 Jan 2013 13:12:53 -0500
Subject: [PATCH] snes: pcx_to_tiles_4bpp

clean up code, add command line argument for label name
---
 .../{sprites_pal0.pcx => level1_pal0.pcx}     | Bin
 tb_snes/tools/pcx_to_tiles_4bpp.c             |  93 +++++++-----------
 2 files changed, 36 insertions(+), 57 deletions(-)
 rename tb_snes/graphics/{sprites_pal0.pcx => level1_pal0.pcx} (100%)

diff --git a/tb_snes/graphics/sprites_pal0.pcx b/tb_snes/graphics/level1_pal0.pcx
similarity index 100%
rename from tb_snes/graphics/sprites_pal0.pcx
rename to tb_snes/graphics/level1_pal0.pcx
diff --git a/tb_snes/tools/pcx_to_tiles_4bpp.c b/tb_snes/tools/pcx_to_tiles_4bpp.c
index c1ac105..d27458c 100644
--- a/tb_snes/tools/pcx_to_tiles_4bpp.c
+++ b/tb_snes/tools/pcx_to_tiles_4bpp.c
@@ -7,22 +7,24 @@
 #include <sys/stat.h> /* for file modes */
 #include <stdlib.h>  /* exit() */
 
+char label_prefix[BUFSIZ]="tile";
+
 /* 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;
 }
 
 
-int vmwLoadPCX(int pcx_fd) {
-   
+static int vmwLoadPCX(int pcx_fd) {
+
    int debug=1,bpp;
    int x,y;
    int i,numacross,planes=0;
@@ -30,36 +32,28 @@ int vmwLoadPCX(int pcx_fd) {
    int xmin,ymin,xmax,ymax,version;
    unsigned char pcx_header[128];
    unsigned char temp_byte;
-   
-       /* Open the file */                  
-   //    pcx_fd=open(filename,O_RDONLY);
-    
-   //if (pcx_fd<0) {
-   //    printf("ERROR!  File \"%s\" not found!\n",filename);
-   //    return -1;
-   // }
-   
+
     /*************** DECODE THE HEADER *************************/
-      
+
     //    lseek(pcx_fd,0,SEEK_SET);
-    
+
     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) {
@@ -73,19 +67,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];
 
@@ -97,15 +91,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)) {
@@ -131,30 +125,30 @@ int vmwLoadPCX(int pcx_fd) {
    }
 
 #define X_CHUNKSIZE 8
-#define Y_CHUNKSIZE 8        
+#define Y_CHUNKSIZE 8
 
 
    unsigned int plane0,plane1,plane2,plane3,offset;
-   
-   printf("tile_data:\n");
+
+   printf("%s_data:\n",label_prefix);
    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;
@@ -170,14 +164,8 @@ int vmwLoadPCX(int pcx_fd) {
 	}
       }
    }
-   
-   
 
-//   for(i=0;i<1008;i++) {
-//     printf("\t.word $ffff\n");
-//   }
-
-   printf("tile_palette:\n");
+   printf("%s_palette:\n",label_prefix);
 
    /* read in palette */
    read(pcx_fd,&temp_byte,1);
@@ -185,8 +173,8 @@ int vmwLoadPCX(int pcx_fd) {
      printf("Error!  No palette found!\n");
    }
    else {
-     int r,g,b;       
-     for(i=0;i<16;i++) { 
+     int r,g,b;
+     for(i=0;i<16;i++) {
        read(pcx_fd,&temp_byte,1);
        r=temp_byte;
        read(pcx_fd,&temp_byte,1);
@@ -196,7 +184,7 @@ int vmwLoadPCX(int pcx_fd) {
        printf("\t.word $%x\t; r=%x g=%x b=%x\n",rgb2bgr(r,g,b),r,g,b);
      }
    }
-   
+
    //    close(pcx_fd);
 
     return 0;
@@ -204,25 +192,16 @@ int vmwLoadPCX(int pcx_fd) {
 
 
 int main(int argc, char **argv) {
-   
-    int result;//,x,y;
-    //    FILE *fff;
-   
-    //char filename[]="butterfinger.pcx";
-   
+
+    int result;
+
     /* read from stdin */
 
     result=vmwLoadPCX(fileno(stdin));
-     
     if (result<0) {
        fprintf(stderr,"Error reading PCX from stdin\n");
        exit(1);
     }
-   
-    //   fff=fopen("input.bin","w");
-    //if (fff==NULL) exit(1);
-   
-    //   fwrite(buffer,sizeof(unsigned int),buffer[0]*buffer[1]+2,stdout);
 
     return 0;
 }