Add a new data table (0x3fd5000).

This commit is contained in:
IIMarckus
2014-11-18 02:11:03 -07:00
parent 7d963a2f7a
commit e5f8f11070
5 changed files with 313 additions and 6 deletions

3
.gitmodules vendored
View File

@@ -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

1
stadiumgs/0x3fd5000 Submodule

Submodule stadiumgs/0x3fd5000 added at 9affd33ac5

View File

@@ -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

View File

@@ -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;