Add a new data table (0x3fd5000).

5 files changed, 311 insertions, 5 deletions

diff --git a/.gitmodules b/.gitmodules
index 77869d7..185b999 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,3 +19,6 @@
 [submodule "stadiumgs/faces"]
 	path = stadiumgs/faces
 	url = https://github.com/iimarckus/stadiumgs-faces
+[submodule "stadiumgs/0x3fd5000"]
+	path = stadiumgs/0x3fd5000
+	url = https://github.com/iimarckus/stadiumgs-0x3fd5000
diff --git a/stadiumgs/0x3fd5000 b/stadiumgs/0x3fd5000
new file mode 160000
+Subproject 9affd33ac51a96565cead6f69ccea59c14572f5
diff --git a/stadiumgs/Makefile b/stadiumgs/Makefile
index 473bdbe..7b52313 100644
--- a/stadiumgs/Makefile
+++ b/stadiumgs/Makefile
@@ -15,6 +15,290 @@ TABLES = \
 tables.bin: ${TABLES}
 	cat ${TABLES} > $@
 
+X0x3fd5000 = \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/0x3fd6a70.pers.szp \
+	0x3fd5000/0x3fd8db0.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/0x3fdaa70.pers.szp \
+	0x3fd5000/0x3fdbde0.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/0x3fdeb70.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty2.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/0x3fe4420.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/0x3fe6d40.pers.szp \
+	0x3fd5000/0x3fe8d60.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty2.pers.szp \
+	0x3fd5000/empty1.pers.szp \
+	0x3fd5000/empty1.pers.szp
+
 FACES = \
 	faces/whitney.bin \
 	faces/janine.bin \
@@ -1816,7 +2100,7 @@ BACKGROUNDS = \
 
 # md5 of rosters.tbl: afa0dc919e83d6803a404f08c1517f4c
 rosters.tbl: ${ROSTERS}
-	../utils/cattbl 0x10000 ${ROSTERS} > $@
+	../utils/cattbl -x 0x10000 ${ROSTERS} > $@
 
 # md5 of 0x1718000.tbl: a26e3f0f8e6c5db866799c6a6525f4be
 0x1718000.tbl: ${X0x1718000}
@@ -1850,6 +2134,10 @@ presjpegs.tbl: ${PRESJPEGS}
 faces.tbl: ${FACES}
 	../utils/cattbl -f 0x13d000 ${FACES} > $@
 
+# md5 of 0x3fd5000.tbl: 
+0x3fd5000.tbl: ${X0x3fd5000}
+	../utils/cattbl -f 0x18000 ${X0x3fd5000} > $@
+
 clean:
 	rm -f text.tbl ${STRTBLS} rosters.tbl ${ROSTERS} backgrounds.tbl
 	rm -f 0x1e40000.tbl presjpegs.tbl faces.tbl 0x2000000.tbl 0x1898000.tbl
diff --git a/stadiumgs/faces b/stadiumgs/faces
-Subproject 30e4fb18f5b3f9d4dc4966202bedf4ab6eb1553
+Subproject 465b64eb323a091ed25b1148335f53b59019cb1
diff --git a/utils/cattbl.c b/utils/cattbl.c
index d7505ed..a9a8cf4 100644
--- a/utils/cattbl.c
+++ b/utils/cattbl.c
@@ -35,7 +35,7 @@ putuint32BE(uint32_t n, FILE *f)
 int
 main(int argc, char *argv[])
 {
-	bool efflag;
+	bool efflag, sameptrflag;
 	int i, runsum, numptrs;
 	long size;
 	uint32_t *ptrs, *runsums;
@@ -44,7 +44,7 @@ main(int argc, char *argv[])
 	char *ep;
 
 	if (argc < 3) {
-		errx(1, "Usage: cattbl [-f] size file ...");
+		errx(1, "Usage: cattbl [-fx] size file ...");
 	}
 
 	if (strcmp(argv[1], "-f") == 0) {
@@ -55,6 +55,19 @@ main(int argc, char *argv[])
 		efflag = false;
 	}
 
+	if (strcmp(argv[1], "-x") == 0) {
+		sameptrflag = true;
+		argv += 1;
+		argc -= 1;
+	} else {
+		sameptrflag = false;
+	}
+
+	if (strcmp(argv[1], "-fx") == 0) {
+		sameptrflag = true;
+		efflag = true;
+	}
+
 	size = strtol(argv[1], &ep, 0);
 	if (argv[1][0] == '\0' || *ep != '\0') {
 		errx(1, "invalid size '%s'", argv[1]);
@@ -80,7 +93,8 @@ main(int argc, char *argv[])
 
 	runsum = 16 + 16 * (argc);
 	for (i = 0; i < argc; ++i) {
-		if (i > 0 && strcmp(argv[i], argv[i - 1]) == 0) {
+		if (sameptrflag && i > 0 && strcmp(argv[i], argv[i - 1]) == 0)
+		    {
 			runsums[i] = runsums[i - 1];
 			ptrs[i] = ptrs[i - 1];
 			continue;
@@ -111,7 +125,8 @@ main(int argc, char *argv[])
 	}
 
 	for (i = 0; i < argc; ++i) {
-		if (i > 0 && strcmp(argv[i], argv[i - 1]) == 0) {
+		if (sameptrflag && i > 0 && strcmp(argv[i], argv[i - 1]) == 0)
+		    {
 			continue;
 		}
 		size_t n;