Add support for SM64 iQue in sm64extend

Author: queueRAM

f3d2obj.c

@@ -139,7 +139,6 @@ static void read_vertex(unsigned char *data, vertex *v, unsigned translate[])
 static void load_vertices(unsigned char *data, unsigned int offset, unsigned int index, unsigned int count, unsigned translate[])
 {
    unsigned i;
-   INFO("load: %X, %d\n", offset, count);
    for (i = 0; i < count; i++) {
       if (i + index < DIM(vertex_buffer)) {
          read_vertex(&data[offset + i*16], &vertex_buffer[i+index], translate);
@@ -321,6 +320,7 @@ static int print_f3d(FILE *fout, unsigned int *dl_addr, arg_config *config)
       sprintf(tmp, "%02X ", data[i]);
       strcat(description, tmp);
    }
+   INFO("%02X%06X: ", dl_seg, seg_offset);
    switch (data[0]) {
       case F3D_MOVEMEM:
          switch (data[1]) {
@@ -494,7 +494,7 @@ static int print_f3d(FILE *fout, unsigned int *dl_addr, arg_config *config)
          unsigned ult = w0 & 0x3FF;
          unsigned lrs = (w1 >> 12) & 0x3FF;
          unsigned dxt = w1 & 0x3FF;
-         INFO("%14s %03X %03X %03X %u", "G_LOADBLOCK", uls, ult, lrs, dxt);
+         INFO("%14s %03X %03X %03X %u\n", "G_LOADBLOCK", uls, ult, lrs, dxt);
          break;
       }
       case G_SETTILE:
@@ -545,7 +545,7 @@ static int print_f3d(FILE *fout, unsigned int *dl_addr, arg_config *config)
          seg_address = read_u32_be(&data[4]);
          bank = data[4];
          seg_offset = seg_address & 0x00FFFFFF;
-         INFO("%14s %02X %06X\n", "G_SETTIMG", bank, seg_offset);
+         INFO("%14s %08X\n", "G_SETTIMG", seg_address);
          fprintf(fout, "\ng s%08X_%08X\n", *dl_addr, seg_address);
          fprintf(fout, "usemtl M%08X\n", seg_address);
          tile.address = seg_address;

libsm64.c

@@ -292,24 +292,29 @@ rom_type sm64_rom_type(unsigned char *buf, unsigned int length)
       return ROM_SM64_LE;
    }
    if (!memcmp(buf, be, sizeof(be))) {
-      if (length == 8*MB) {
-         return ROM_SM64_BE;
-      } else if (length > 8*MB) {
+      if (length > 8*MB) {
          return ROM_SM64_BE_EXT;
+      } else if (length > 7*MB) {
+         return ROM_SM64_BE;
       }
    }
    return ROM_INVALID;
 }
 
 rom_version sm64_rom_version(unsigned char *buf)
 {
-   typedef struct {const unsigned char cksum1[4]; const rom_version version;} version_entry;
+   typedef struct
+   {
+      const unsigned char cksum1[4];
+      const rom_version version;
+   } version_entry;
    const version_entry version_table[] =
    {
       { {0x63, 0x5a, 0x2b, 0xff}, VERSION_SM64_U},
       { {0xa0, 0x3c, 0xf0, 0x36}, VERSION_SM64_E},
       { {0x4e, 0xaa, 0x3d, 0x0e}, VERSION_SM64_J},
       { {0xd6, 0xfb, 0xa4, 0xa8}, VERSION_SM64_SHINDOU},
+      { {0x00, 0x00, 0x00, 0x00}, VERSION_SM64_IQUE},
    };
    for (unsigned int i = 0; i < DIM(version_table); i++) {
       if (!memcmp(&buf[0x10], version_table[i].cksum1, 4)) {

libsm64.h

@@ -20,6 +20,7 @@ typedef enum
    VERSION_SM64_E,
    VERSION_SM64_J,
    VERSION_SM64_SHINDOU,
+   VERSION_SM64_IQUE,
 } rom_version;
 
 typedef struct