From 7762fa4d5454be7be0e89b09986f31bbdff79a83 Mon Sep 17 00:00:00 2001
From: red031000 <rubenru09@aol.com>
Date: Fri, 10 Jul 2020 17:25:12 +0100
Subject: [PATCH] bit of work on graphics, mostly setup

---
 Makefile                             |  17 +++++++++++++++++
 files/data/.gitignore                |   2 ++
 files/data/cell0.NCGR                | Bin 8240 -> 0 bytes
 files/data/cell0.NCLR                | Bin 552 -> 0 bytes
 files/data/cell0.png                 | Bin 0 -> 572 bytes
 files/graphic/bag_gra/.gitignore     |   6 ++++++
 files/graphic/bag_gra/narc_0002.NCGR | Bin 16432 -> 0 bytes
 files/graphic/bag_gra/narc_0002.png  | Bin 0 -> 2024 bytes
 files/graphic/bag_gra/narc_0003.NCLR | Bin 552 -> 0 bytes
 files/graphic/bag_gra/narc_0003.pal  |  19 +++++++++++++++++++
 files/graphic/bag_gra/narc_0006.NCGR | Bin 304 -> 0 bytes
 files/graphic/bag_gra/narc_0006.png  | Bin 0 -> 188 bytes
 files/graphic/bag_gra/narc_0034.NCGR | Bin 16432 -> 0 bytes
 files/graphic/bag_gra/narc_0034.png  | Bin 0 -> 2048 bytes
 files/graphic/bag_gra/narc_0035.NCLR | Bin 552 -> 0 bytes
 filesystem.mk                        |   7 +++++++
 graphics_rules.mk                    |  17 +++++++++++++++++
 tools/nitrogfx/gfx.c                 |   6 +++---
 tools/nitrogfx/gfx.h                 |   2 +-
 tools/nitrogfx/main.c                |   7 ++++++-
 tools/nitrogfx/options.h             |   1 +
 tools/nitrogfx/util.c                |   7 ++++++-
 tools/nitrogfx/util.h                |   2 +-
 23 files changed, 86 insertions(+), 7 deletions(-)
 create mode 100644 files/data/.gitignore
 delete mode 100644 files/data/cell0.NCGR
 delete mode 100644 files/data/cell0.NCLR
 create mode 100644 files/data/cell0.png
 create mode 100644 files/graphic/bag_gra/.gitignore
 delete mode 100644 files/graphic/bag_gra/narc_0002.NCGR
 create mode 100644 files/graphic/bag_gra/narc_0002.png
 delete mode 100644 files/graphic/bag_gra/narc_0003.NCLR
 create mode 100644 files/graphic/bag_gra/narc_0003.pal
 delete mode 100644 files/graphic/bag_gra/narc_0006.NCGR
 create mode 100644 files/graphic/bag_gra/narc_0006.png
 delete mode 100644 files/graphic/bag_gra/narc_0034.NCGR
 create mode 100644 files/graphic/bag_gra/narc_0034.png
 delete mode 100644 files/graphic/bag_gra/narc_0035.NCLR
 create mode 100644 graphics_rules.mk

diff --git a/Makefile b/Makefile
index 9b8b430e4..2e7fe1a7e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 # Makefile to build Pokemon Diamond image
 
 include config.mk
+include graphics_rules.mk
 
 HOSTCC = $(CC)
 HOSTCXX = $(CXX)
@@ -156,6 +157,7 @@ clean: mostlyclean clean-fs
 
 clean-fs:
 	$(RM) $(filter %.narc %.arc,$(HOSTFS_FILES))
+	$(RM) $(NCGR_CLEAN_LIST) $(NCLR_CLEAN_LIST)
 	find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' \) -exec $(RM) {} +
 
 mostlyclean: tidy
@@ -240,6 +242,21 @@ PADDED_LZ_FILES := $(addsuffix .lz,$(wildcard \
 $(PADDED_LZ_FILES): %.lz: %
 	$(NTRCOMP) -l2 -s -A4 -o $@ $<
 
+%.NCGR: %.png
+	$(GFX) $< $@
+
+$(CLOBBER_SIZE_NCGR_FILES): %.NCGR: %.png
+	$(GFX) $< $@ -clobbersize
+
+$(CLOBBER_SIZE_VERSION101_NCGR_FILES): %.NCGR: %.png
+	$(GFX) $< $@ -clobbersize -version101
+
+%.NCLR: %.png
+	$(GFX) $< $@
+
+%.NCLR: %.pal
+	$(GFX) $< $@
+
 %.png: ;
 %.pal: ;
 
diff --git a/files/data/.gitignore b/files/data/.gitignore
new file mode 100644
index 000000000..e405595ae
--- /dev/null
+++ b/files/data/.gitignore
@@ -0,0 +1,2 @@
+cell0.NCGR
+cell0.NCLR
diff --git a/files/data/cell0.NCGR b/files/data/cell0.NCGR
deleted file mode 100644
index 76a112b3a8db704f9844596b2e1eaa2b0f03631e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8240
zcmdUzTW;Gh5Jl<70^+}Z3SNN$Z$L!^v|s(m{@2p<o*_qkSPq<|BCG)>d<;d-Jsc)L
z-hRFQdH)-Bmm!3gunTWLf4>guzsnARxn!FA;r&(Gms5B-oo=^2Ro2E84CR70&X`S4
zryc8dOYxQFK&PXnODCJQHrX=qPJOf*50QX&;$mz_;R`I#>28;yYuv1%pCU0vv~Y5d
zbmmaJTkbdeW`)m*QxopInc7ROxu0>(+ibQ|>y7%I2i0L(z20dnyC<7B!6SQqlR&R`
zTB*a;eas{<{vM}_co#D-`~D;S9r^4?bH3Z8^D%+nTxEabjLYIiB_E-KUu9(+4XtTT
z+El}B;OWQ1ISl9XZJOuG+PH$DT+qfDv+4P~XWf1&zS7*lu|c9Z-L$pImWg-jqt$qb
z1hf+uV?zqWKWT&3yW3?9owTfR4BCYzGNOf(d!)n9<lJrTYvj~-Pl=PNTpPTb?5*B7
zb{<-~dCOX}Zs(z!k9R+)byqjrJ^6zI+n^(X`@$uSV%OAThE9pqS90EleLncd_xLd1
zk<UIJ$6Y6_p5WT8u`w=-C&9rjGOU+*EVXq|BhBxvZf_#bK5@B*%k_Gj<+ZXlu3#t^
zv~k94dc7W4$G<ds*+mEGXz9|)rmao3OuSPc@y0_Wpq;oF8&dcJ9CW(dW#}3=Yv`v)
zj1euI+#{Vi6z`V%&AwUTbK=y5J8!1;QfuyKT=O=Y?bLdse&<1Tm{zZM+RE<9=1uU(
zp5G+U>z!8WaCILu35>tTsUqIR%*($2NPkB@2hyDHHtBp!;5S#<-#Fv4xKYVR=-^jb
z8An5Fnv*uwa2t5~@i>KXnr_paDr@5khH^n0XUwM4bY$IeDZbL&$gx49INh|h$(D(C
z>Z8?ohy=6~7h^*T#6M}H*1OwfjGeTsaSYmpCNiRhlY6AY&*a=~?Q7)JcTb6vs$3hq
zo9wOLICdUdx_Qf5vu@|1n~!%ts&!X4+dcWC0^6V?fycrnjbhi-V}?$N)mL)fhJ8Nz
v$M^U!-;vKT9>-lLt)Af8t+6pKizmUsEi$Z^c`UVcP$SJBt!{53|7YSKUCllu

diff --git a/files/data/cell0.NCLR b/files/data/cell0.NCLR
deleted file mode 100644
index 680c004b0fec8e11c3b10e3115bff19fca55dfd3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 552
zcmWIYarXQFkAYExiGe|Yfsr93#3w)k$Yy4M0<buU{lEU4Wp(~@nJGaqsZo05ga82K
CiV8FU

diff --git a/files/data/cell0.png b/files/data/cell0.png
new file mode 100644
index 0000000000000000000000000000000000000000..bfd49d699506dcd671bf5bb6ee7c30428a312d4b
GIT binary patch
literal 572
zcmeAS@N?(olHy`uVBq!ia0vp^4h#&83@pq**2j!oQy^s!;1l8sr2qf_UtC;#@7_I2
zOUoromH<WYfUV8*fO;5@d%8G=WHi2=dVA$z2Obymex^x$P1+ng8f$j^pQXq4-dVdd
zS>W5(<LBPXxG`0`YsUJ$4^8-e;%)3#ru!=Qf}UtUTGk-WQX*)zpxdBEFp;%`<8r<-
z#|Cv1W10PK0uOvOj2|_;ey-Zb{zrDZF8c=I9fz*lJYL?rU#D)*$GQhxhlCzW9Z`C!
zb<F5_@d0*L|DZ#Q!vyZjothQa_*VJ*%2&+$JbgfxtZU$>fhFNUOZs=d;@;<Z24u;?
y27T&V5(V<f`K7Pe_j&4oELqtgPi;&7ssCkk={NbdwkzEo6yu(*elF{r5}E-1Rp`3_

literal 0
HcmV?d00001

diff --git a/files/graphic/bag_gra/.gitignore b/files/graphic/bag_gra/.gitignore
new file mode 100644
index 000000000..6fc1835db
--- /dev/null
+++ b/files/graphic/bag_gra/.gitignore
@@ -0,0 +1,6 @@
+narc_0002.NCGR
+narc_0006.NCGR
+narc_0035.NCLR
+narc_0034.NCGR
+narc_0003.NCLR
+narc_0034.NCLR
diff --git a/files/graphic/bag_gra/narc_0002.NCGR b/files/graphic/bag_gra/narc_0002.NCGR
deleted file mode 100644
index a33c847cc480fe550554c0110dd2b2747a7869da..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16432
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
TFaZzA|M&Ud=YRcQ&Hw)$cd^1_

diff --git a/files/graphic/bag_gra/narc_0002.png b/files/graphic/bag_gra/narc_0002.png
new file mode 100644
index 0000000000000000000000000000000000000000..9152a7e1c6dcae6e92f171c326a4504d881668cb
GIT binary patch
literal 2024
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
GLSTZ1<Ir{h

literal 0
HcmV?d00001

diff --git a/files/graphic/bag_gra/narc_0003.NCLR b/files/graphic/bag_gra/narc_0003.NCLR
deleted file mode 100644
index 4e6b57e1b9315572e7640a72835938a0e64a923d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 552
zcmWIYarXQFkAYExiGe|Yfsr93#3w)k$Yy4M0<bs(!}j#KW_L|%bR!f$%ZMp@Y5uQ2
ZXDK2VYko&>hSEjZJV}`HQF?fW003jO5k3F_

diff --git a/files/graphic/bag_gra/narc_0003.pal b/files/graphic/bag_gra/narc_0003.pal
new file mode 100644
index 000000000..45483a1e6
--- /dev/null
+++ b/files/graphic/bag_gra/narc_0003.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+189 238 205
+238 164 106
+238 115 106
+230 90 90
+197 82 65
+156 57 57
+180 65 65
+82 82 82
+255 255 255
+115 115 115
+164 131 57
+238 213 106
+230 180 90
+197 164 65
+139 115 57
+115 90 49
diff --git a/files/graphic/bag_gra/narc_0006.NCGR b/files/graphic/bag_gra/narc_0006.NCGR
deleted file mode 100644
index 3517cd0116f835d9a93f7c4fe333e5f672858fff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 304
zcma)!K@LDL6hx;ufTg8`0|*XKX%ki!z5iJ-qX-LPlKFo!ef?o{^ST(*7$Ap17$#RT
zuT%<khu9TojyvP>bWQg+Gd?9Sp<S%+tp4hTkX>TLUPY|`Obgid4b;6#!?qo~_itQB
H=;Ik1!($HV

diff --git a/files/graphic/bag_gra/narc_0006.png b/files/graphic/bag_gra/narc_0006.png
new file mode 100644
index 0000000000000000000000000000000000000000..a9982600fa20d3d56ce122b0b5a629efb23d059f
GIT binary patch
literal 188
zcmeAS@N?(olHy`uVBq!ia0vp^0zj<5!VDx|E`RzTNErn9gt%V4`VPnzDE=?d{huKS
zB#a+epM3NMsDiO1$S;_|;n|HeAjitn#W6%;YI4E>Hkkw-af!p6#|qj`T52DVP?O+c
zEje27wt)FzSOE712j7%Hv!aFz$BrdT<Cd6^sm0K!#J;;PJRlZisi&)-%Q~loCIBs-
BG4lWb

literal 0
HcmV?d00001

diff --git a/files/graphic/bag_gra/narc_0034.NCGR b/files/graphic/bag_gra/narc_0034.NCGR
deleted file mode 100644
index 55f4282bb0ea6d34e404b561944f6cba7e378bac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16432
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
Q{J+2c|6iQ{d&TwtKNrT#IRF3v

diff --git a/files/graphic/bag_gra/narc_0034.png b/files/graphic/bag_gra/narc_0034.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba296b4c51395d38170f9d32fb7ca99249c6a260
GIT binary patch
literal 2048
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

literal 0
HcmV?d00001

diff --git a/files/graphic/bag_gra/narc_0035.NCLR b/files/graphic/bag_gra/narc_0035.NCLR
deleted file mode 100644
index 4e6b57e1b9315572e7640a72835938a0e64a923d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 552
zcmWIYarXQFkAYExiGe|Yfsr93#3w)k$Yy4M0<bs(!}j#KW_L|%bR!f$%ZMp@Y5uQ2
ZXDK2VYko&>hSEjZJV}`HQF?fW003jO5k3F_

diff --git a/filesystem.mk b/filesystem.mk
index 180845ac4..013d64a92 100644
--- a/filesystem.mk
+++ b/filesystem.mk
@@ -794,6 +794,13 @@ files/wazaeffect/effectclact/wecellanm.narc: \
         files/wazaeffect/effectclact/wecellanm/narc_0013.NANR.lz \
         files/wazaeffect/effectclact/wecellanm/narc_0007.NANR.lz
 
+files/graphic/bag_gra.narc: \
+        files/graphic/bag_gra/narc_0002.NCGR \
+        files/graphic/bag_gra/narc_0003.NCLR \
+        files/graphic/bag_gra/narc_0006.NCGR \
+        files/graphic/bag_gra/narc_0034.NCGR \
+        files/graphic/bag_gra/narc_0034.NCLR
+
 files/graphic/box.narc: \
         files/graphic/box/narc_0022.NANR.lz \
         files/graphic/box/narc_0036.NSCR.lz \
diff --git a/graphics_rules.mk b/graphics_rules.mk
new file mode 100644
index 000000000..0ad43bf24
--- /dev/null
+++ b/graphics_rules.mk
@@ -0,0 +1,17 @@
+#todo data/dp_areawindow.NCGR (weirdness with size)
+#todo data/graphic/bag_gra/narc_0007.NCGR (SOPC section) (width 32, palette narc_0003.NCLR)
+
+CLOBBER_SIZE_NCGR_FILES := files/data/cell0.NCGR
+
+CLOBBER_SIZE_VERSION101_NCGR_FILES := files/graphic/bag_gra/narc_0002.NCGR \
+                                      files/graphic/bag_gra/narc_0006.NCGR \
+                                      files/graphic/bag_gra/narc_0034.NCGR
+
+NCGR_CLEAN_LIST := files/data/cell0.NCGR \
+                   files/graphic/bag_gra/narc_0002.NCGR \
+                   files/graphic/bag_gra/narc_0006.NCGR \
+                   files/graphic/bag_gra/narc_0034.NCGR
+
+NCLR_CLEAN_LIST := files/data/cell0.NCLR \
+                   files/graphic/bag_gra/narc_0003.NCLR \
+                   files/graphic/bag_gra/narc_0034.NCLR
diff --git a/tools/nitrogfx/gfx.c b/tools/nitrogfx/gfx.c
index 3315e00ec..a80d341b7 100644
--- a/tools/nitrogfx/gfx.c
+++ b/tools/nitrogfx/gfx.c
@@ -359,7 +359,7 @@ void WriteImage(char *path, int numTiles, int bitDepth, int metatileWidth, int m
 	free(buffer);
 }
 
-void WriteNtrImage(char *path, int numTiles, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors, bool clobberSize, bool byteOrder)
+void WriteNtrImage(char *path, int numTiles, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors, bool clobberSize, bool byteOrder, bool version101)
 {
     FILE *fp = fopen(path, "wb");
 
@@ -407,7 +407,7 @@ void WriteNtrImage(char *path, int numTiles, int bitDepth, int metatileWidth, in
             break;
     }
 
-    WriteGenericNtrHeader(fp, "RGCN", bufferSize + 0x20, byteOrder);
+    WriteGenericNtrHeader(fp, "RGCN", bufferSize + 0x20, byteOrder, version101);
 
     unsigned char charHeader[0x20] = { 0x52, 0x41, 0x48, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00 };
@@ -545,7 +545,7 @@ void WriteNtrPalette(char *path, struct Palette *palette, bool ncpr)
     uint32_t extSize = size + (ncpr ? 0x10 : 0x18);
 
     //NCLR header
-    WriteGenericNtrHeader(fp, (ncpr ? "RPCN" : "RLCN"), extSize, !ncpr);
+    WriteGenericNtrHeader(fp, (ncpr ? "RPCN" : "RLCN"), extSize, !ncpr, false);
 
     unsigned char palHeader[0x18] =
             {
diff --git a/tools/nitrogfx/gfx.h b/tools/nitrogfx/gfx.h
index da56c5c51..1b0973362 100644
--- a/tools/nitrogfx/gfx.h
+++ b/tools/nitrogfx/gfx.h
@@ -31,7 +31,7 @@ struct Image {
 void ReadImage(char *path, int tilesWidth, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors);
 void ReadNtrImage(char *path, int tilesWidth, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors);
 void WriteImage(char *path, int numTiles, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors);
-void WriteNtrImage(char *path, int numTiles, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors, bool clobberSize, bool byteOrder);
+void WriteNtrImage(char *path, int numTiles, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors, bool clobberSize, bool byteOrder, bool version101);
 void FreeImage(struct Image *image);
 void ReadGbaPalette(char *path, struct Palette *palette);
 void ReadNtrPalette(char *path, struct Palette *palette);
diff --git a/tools/nitrogfx/main.c b/tools/nitrogfx/main.c
index 2f5b2735e..076e70761 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);
+    WriteNtrImage(outputPath, options->numTiles, options->bitDepth, options->metatileWidth, options->metatileHeight, &image, !image.hasPalette, options->clobberSize, options->byteOrder, options->version101);
 
     FreeImage(&image);
 }
@@ -320,6 +320,7 @@ void HandlePngToNtrCommand(char *inputPath, char *outputPath, int argc, char **a
     options.metatileHeight = 1;
     options.clobberSize = false;
     options.byteOrder = true;
+    options.version101 = false;
 
     for (int i = 3; i < argc; i++)
     {
@@ -385,6 +386,10 @@ void HandlePngToNtrCommand(char *inputPath, char *outputPath, int argc, char **a
         {
             options.byteOrder = false;
         }
+        else if (strcmp(option, "-version101") == 0)
+        {
+            options.version101 = true;
+        }
         else
         {
             FATAL_ERROR("Unrecognized option \"%s\".\n", option);
diff --git a/tools/nitrogfx/options.h b/tools/nitrogfx/options.h
index 8376348ff..77006f21f 100644
--- a/tools/nitrogfx/options.h
+++ b/tools/nitrogfx/options.h
@@ -28,6 +28,7 @@ struct PngToNtrOptions {
     int metatileHeight;
     bool clobberSize;
     bool byteOrder;
+    bool version101;
 };
 
 
diff --git a/tools/nitrogfx/util.c b/tools/nitrogfx/util.c
index 73a128a1a..304a23195 100644
--- a/tools/nitrogfx/util.c
+++ b/tools/nitrogfx/util.c
@@ -124,13 +124,18 @@ void WriteWholeFile(char *path, void *buffer, int bufferSize)
 	fclose(fp);
 }
 
-void WriteGenericNtrHeader(FILE* fp, const char* magicNumber, uint32_t size, bool byteorder)
+void WriteGenericNtrHeader(FILE* fp, const char* magicNumber, uint32_t size, bool byteorder, bool version101)
 {
     unsigned char header[0x10] =
             { 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFE, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x01, 0x00 };
     //magic number
     memcpy(header, magicNumber, 4);
 
+    if (version101)
+    {
+        header[6] = 0x01;
+    }
+
     //byte order
     if (!byteorder)
     {
diff --git a/tools/nitrogfx/util.h b/tools/nitrogfx/util.h
index f181b66e2..bb1cd4ad9 100644
--- a/tools/nitrogfx/util.h
+++ b/tools/nitrogfx/util.h
@@ -11,6 +11,6 @@ char *GetFileExtension(char *path);
 unsigned char *ReadWholeFile(char *path, int *size);
 unsigned char *ReadWholeFileZeroPadded(char *path, int *size, int padAmount);
 void WriteWholeFile(char *path, void *buffer, int bufferSize);
-void WriteGenericNtrHeader(FILE* fp, const char* magicNumber, uint32_t size, bool byteorder);
+void WriteGenericNtrHeader(FILE* fp, const char* magicNumber, uint32_t size, bool byteorder, bool version101);
 
 #endif // UTIL_H