From f76e211631b6b86ce7000c16acc5368d78b14f42 Mon Sep 17 00:00:00 2001 From: red031000 Date: Sat, 11 Jul 2020 21:50:56 +0100 Subject: bit of title work, maths is still wrong --- Makefile | 3 +++ files/demo/title/titledemo/.gitignore | 4 ++++ files/demo/title/titledemo/narc_0001.NCGR | Bin 32832 -> 0 bytes files/demo/title/titledemo/narc_0001.png | Bin 0 -> 10975 bytes files/demo/title/titledemo/narc_0002.NCLR | Bin 552 -> 0 bytes files/demo/title/titledemo/narc_0003.NCGR | Bin 32832 -> 0 bytes files/demo/title/titledemo/narc_0003.png | Bin 0 -> 10254 bytes files/demo/title/titledemo/narc_0004.NCLR | Bin 552 -> 0 bytes filesystem.mk | 6 ++++++ graphics_rules.mk | 8 ++++++++ tools/nitrogfx/gfx.c | 17 ++++++++++------- tools/nitrogfx/main.c | 2 +- 12 files changed, 32 insertions(+), 8 deletions(-) create mode 100644 files/demo/title/titledemo/.gitignore delete mode 100644 files/demo/title/titledemo/narc_0001.NCGR create mode 100644 files/demo/title/titledemo/narc_0001.png delete mode 100644 files/demo/title/titledemo/narc_0002.NCLR delete mode 100644 files/demo/title/titledemo/narc_0003.NCGR create mode 100644 files/demo/title/titledemo/narc_0003.png delete mode 100644 files/demo/title/titledemo/narc_0004.NCLR diff --git a/Makefile b/Makefile index 48ac1ab8..eec4fdbf 100644 --- a/Makefile +++ b/Makefile @@ -251,6 +251,9 @@ $(CLOBBER_SIZE_NCGR_FILES): %.NCGR: %.png $(CLOBBER_SIZE_VERSION101_NCGR_FILES): %.NCGR: %.png $(GFX) $< $@ -clobbersize -version101 +$(VERSION101_SOPC_8BPP_NCGR_FILES): %.NCGR: %.png + $(GFX) $< $@ -version101 -sopc -bitdepth 8 + %.NCLR: %.png $(GFX) $< $@ diff --git a/files/demo/title/titledemo/.gitignore b/files/demo/title/titledemo/.gitignore new file mode 100644 index 00000000..b49b5cb3 --- /dev/null +++ b/files/demo/title/titledemo/.gitignore @@ -0,0 +1,4 @@ +narc_0001.NCGR +narc_0001.NCLR +narc_0003.NCGR +narc_0003.NCLR diff --git a/files/demo/title/titledemo/narc_0001.NCGR b/files/demo/title/titledemo/narc_0001.NCGR deleted file mode 100644 index b40573ef..00000000 Binary files a/files/demo/title/titledemo/narc_0001.NCGR and /dev/null differ diff --git a/files/demo/title/titledemo/narc_0001.png b/files/demo/title/titledemo/narc_0001.png new file mode 100644 index 00000000..09c9cd17 Binary files /dev/null and b/files/demo/title/titledemo/narc_0001.png differ diff --git a/files/demo/title/titledemo/narc_0002.NCLR b/files/demo/title/titledemo/narc_0002.NCLR deleted file mode 100644 index f38c8aef..00000000 Binary files a/files/demo/title/titledemo/narc_0002.NCLR and /dev/null differ diff --git a/files/demo/title/titledemo/narc_0003.NCGR b/files/demo/title/titledemo/narc_0003.NCGR deleted file mode 100644 index 007b734c..00000000 Binary files a/files/demo/title/titledemo/narc_0003.NCGR and /dev/null differ diff --git a/files/demo/title/titledemo/narc_0003.png b/files/demo/title/titledemo/narc_0003.png new file mode 100644 index 00000000..34db01e9 Binary files /dev/null and b/files/demo/title/titledemo/narc_0003.png differ diff --git a/files/demo/title/titledemo/narc_0004.NCLR b/files/demo/title/titledemo/narc_0004.NCLR deleted file mode 100644 index bf289579..00000000 Binary files a/files/demo/title/titledemo/narc_0004.NCLR and /dev/null differ diff --git a/filesystem.mk b/filesystem.mk index 63b120fd..1be7b682 100644 --- a/filesystem.mk +++ b/filesystem.mk @@ -2219,6 +2219,12 @@ files/data/namein.narc: \ files/data/namein/narc_0013.NCER.lz \ files/data/namein/narc_0007.NSCR.lz +files/demo/title/titledemo.narc: \ + files/demo/title/titledemo/narc_0001.NCGR \ + files/demo/title/titledemo/narc_0001.NCLR \ + files/demo/title/titledemo/narc_0003.NCGR \ + files/demo/title/titledemo/narc_0003.NCLR + .PHONY: filesystem filesystem: $(HOSTFS_FILES) diff --git a/graphics_rules.mk b/graphics_rules.mk index a5f3adc3..fba3be06 100644 --- a/graphics_rules.mk +++ b/graphics_rules.mk @@ -1,5 +1,6 @@ #todo data/dp_areawindow.NCGR (weirdness with size) #todo data/graphic/bag_gra/narc_0007.NCGR (SOPC section) (width 32, palette narc_0003.NCLR) +#todo data/demo/title/titledemo/narc_0007.NCGR (weidness with size, needs investigating) CLOBBER_SIZE_NCGR_FILES := files/data/cell0.NCGR @@ -81,7 +82,12 @@ IR_NCLR_FILES := files/itemtool/itemdata/item_icon/narc_0028.NCLR \ files/itemtool/itemdata/item_icon/narc_0111.NCLR \ files/itemtool/itemdata/item_icon/narc_0114.NCLR +VERSION101_SOPC_8BPP_NCGR_FILES := files/demo/title/titledemo/narc_0001.NCGR \ + files/demo/title/titledemo/narc_0003.NCGR + NCGR_CLEAN_LIST := files/data/cell0.NCGR \ + files/demo/title/titledemo/narc_0001.NCGR \ + files/demo/title/titledemo/narc_0003.NCGR \ files/graphic/bag_gra/narc_0002.NCGR \ files/graphic/bag_gra/narc_0006.NCGR \ files/graphic/bag_gra/narc_0034.NCGR \ @@ -131,6 +137,8 @@ NCGR_CLEAN_LIST := files/data/cell0.NCGR \ NCLR_CLEAN_LIST := files/data/cell0.NCLR \ + files/demo/title/titledemo/narc_0001.NCLR \ + files/demo/title/titledemo/narc_0003.NCLR \ files/graphic/bag_gra/narc_0003.NCLR \ files/graphic/bag_gra/narc_0034.NCLR \ files/itemtool/itemdata/item_icon/narc_0002.NCLR \ diff --git a/tools/nitrogfx/gfx.c b/tools/nitrogfx/gfx.c index 7bbc7ddf..c62a25f8 100644 --- a/tools/nitrogfx/gfx.c +++ b/tools/nitrogfx/gfx.c @@ -419,11 +419,14 @@ void WriteNtrImage(char *path, int numTiles, int bitDepth, int metatileWidth, in if (!clobberSize) { - charHeader[8] = numTiles & 0xFF; - charHeader[9] = (numTiles >> 8) & 0xFF; - - charHeader[10] = tileSize & 0xFF; - charHeader[11] = (tileSize >> 8) & 0xFF; + //charHeader[8] = numTiles & 0xFF; + //charHeader[9] = (numTiles >> 8) & 0xFF; + charHeader[8] = (bufferSize / (256 * bitDepth)) & 0xFF; + charHeader[9] = ((bufferSize / (256 * bitDepth)) >> 8) & 0xFF; + + //charHeader[10] = tileSize & 0xFF; + //charHeader[11] = (tileSize >> 8) & 0xFF; + charHeader[10] = 0x20; //todo figure out if this changes } else { @@ -449,8 +452,8 @@ void WriteNtrImage(char *path, int numTiles, int bitDepth, int metatileWidth, in if (sopc) { unsigned char sopcBuffer[0x10] = { 0x53, 0x4F, 0x50, 0x43, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00 }; - sopcBuffer[14] = numTiles & 0xFF; - sopcBuffer[15] = (numTiles >> 8) & 0xFF; + sopcBuffer[14] = (bufferSize / (256 * bitDepth)) & 0xFF; + sopcBuffer[15] = ((bufferSize / (256 * bitDepth)) >> 8) & 0xFF; fwrite(sopcBuffer, 1, 0x10, fp); } diff --git a/tools/nitrogfx/main.c b/tools/nitrogfx/main.c index 13eeb749..0aaad201 100644 --- a/tools/nitrogfx/main.c +++ b/tools/nitrogfx/main.c @@ -88,7 +88,7 @@ void ConvertPngToNtr(char *inputPath, char *outputPath, struct PngToNtrOptions * ReadPng(inputPath, &image); - WriteNtrImage(outputPath, options->numTiles, options->bitDepth, options->metatileWidth, options->metatileHeight, &image, !image.hasPalette, options->clobberSize, options->byteOrder, options->version101, options->sopc); + WriteNtrImage(outputPath, options->numTiles, image.bitDepth, options->metatileWidth, options->metatileHeight, &image, !image.hasPalette, options->clobberSize, options->byteOrder, options->version101, options->sopc); FreeImage(&image); } -- cgit v1.2.3