Merge pull request #380 from red031000/master

some box sprites + nitrogfx NCER mapping type

50 files changed, 159 insertions, 5 deletions

diff --git a/files/poketool/icongra/poke_icon/.gitignore b/files/poketool/icongra/poke_icon/.gitignore
index 8f4afa7f..fccab7c8 100644
--- a/files/poketool/icongra/poke_icon/.gitignore
+++ b/files/poketool/icongra/poke_icon/.gitignore
@@ -1,6 +1,5 @@
 narc_0000.NCLR
-narc_0002.NCER
-narc_0004.NCER
+*.NCER
 narc_0007.NCGR
 narc_0008.NCGR
 narc_0009.NCGR
@@ -11,4 +10,24 @@ narc_0013.NCGR
 narc_0014.NCGR
 narc_0015.NCGR
 narc_0016.NCGR
+narc_0017.NCGR
+narc_0018.NCGR
+narc_0019.NCGR
+narc_0020.NCGR
+narc_0021.NCGR
+narc_0022.NCGR
+narc_0023.NCGR
+narc_0024.NCGR
+narc_0025.NCGR
+narc_0026.NCGR
+narc_0027.NCGR
+narc_0028.NCGR
+narc_0029.NCGR
+narc_0030.NCGR
+narc_0031.NCGR
+narc_0032.NCGR
+narc_0033.NCGR
+narc_0034.NCGR
+narc_0035.NCGR
+narc_0036.NCGR
 narc_0402.NCGR
diff --git a/files/poketool/icongra/poke_icon/narc_0002.json b/files/poketool/icongra/poke_icon/narc_0002.json
index defb5b41..1750fa55 100644
--- a/files/poketool/icongra/poke_icon/narc_0002.json
+++ b/files/poketool/icongra/poke_icon/narc_0002.json
@@ -4,6 +4,7 @@
 	"imageHeight": 32,
 	"imageWidth": 32,
 	"cellCount": 2,
+	"mappingType": 0,
 	"cells": [
 		{
 			"readOnly": 2054,
diff --git a/files/poketool/icongra/poke_icon/narc_0004.json b/files/poketool/icongra/poke_icon/narc_0004.json
index 3d8b8b80..b8cae63a 100644
--- a/files/poketool/icongra/poke_icon/narc_0004.json
+++ b/files/poketool/icongra/poke_icon/narc_0004.json
@@ -4,6 +4,7 @@
 	"imageHeight": 32,
 	"imageWidth": 32,
 	"cellCount": 2,
+	"mappingType": 0,
 	"cells": [
 		{
 			"readOnly": 2054,
diff --git a/files/poketool/icongra/poke_icon/narc_0006.NCER b/files/poketool/icongra/poke_icon/narc_0006.NCER
deleted file mode 100644
index 19e6e054..00000000
--- a/files/poketool/icongra/poke_icon/narc_0006.NCER
+++ /dev/null
diff --git a/files/poketool/icongra/poke_icon/narc_0006.json b/files/poketool/icongra/poke_icon/narc_0006.json
new file mode 100644
index 00000000..ce7f1d83
--- /dev/null
+++ b/files/poketool/icongra/poke_icon/narc_0006.json
@@ -0,0 +1,68 @@
+{
+	"labelEnabled": true,
+	"extended": true,
+	"imageHeight": 32,
+	"imageWidth": 32,
+	"cellCount": 2,
+	"mappingType": 1,
+	"cells": [
+		{
+			"readOnly": 2054,
+			"maxX": 15,
+			"maxY": 15,
+			"minX": 65520,
+			"minY": 65520,
+			"OAM": {
+				"Attr0": {
+					"YCoordinate": 240,
+					"Rotation": false,
+					"SizeDisable": false,
+					"Mode": 0,
+					"Mosaic": false,
+					"Colours": 16,
+					"Shape": 0
+				},
+				"Attr1": {
+					"XCoordinate": 496,
+					"RotationScaling": 0,
+					"Size": 2
+				},
+				"Attr2": {
+					"CharName": 0,
+					"Priority": 0,
+					"Palette": 0
+				}
+			}
+		},
+		{
+			"readOnly": 2054,
+			"maxX": 15,
+			"maxY": 15,
+			"minX": 65520,
+			"minY": 65520,
+			"OAM": {
+				"Attr0": {
+					"YCoordinate": 240,
+					"Rotation": false,
+					"SizeDisable": false,
+					"Mode": 0,
+					"Mosaic": false,
+					"Colours": 16,
+					"Shape": 0
+				},
+				"Attr1": {
+					"XCoordinate": 496,
+					"RotationScaling": 0,
+					"Size": 2
+				},
+				"Attr2": {
+					"CharName": 8,
+					"Priority": 0,
+					"Palette": 0
+				}
+			}
+		}
+	],
+	"labels": ["CellAnime0", "CellAnime1", "CellAnime2", "CellAnime3", "CellAnime4", "CellAnime5"],
+	"labelCount": 6
+}
diff --git a/files/poketool/icongra/poke_icon/narc_0017.NCGR b/files/poketool/icongra/poke_icon/narc_0017.NCGR
deleted file mode 100644
index 8676315a..00000000
--- a/files/poketool/icongra/poke_icon/narc_0017.NCGR
+++ /dev/null
diff --git a/files/poketool/icongra/poke_icon/narc_0017.png b/files/poketool/icongra/poke_icon/narc_0017.png
new file mode 100644
index 00000000..2b8dbd37
--- /dev/null
+++ b/files/poketool/icongra/poke_icon/narc_0017.png
diff --git a/files/poketool/icongra/poke_icon/narc_0018.NCGR b/files/poketool/icongra/poke_icon/narc_0018.NCGR
deleted file mode 100644
index 6401655c..00000000
--- a/files/poketool/icongra/poke_icon/narc_0018.NCGR
+++ /dev/null
diff --git a/files/poketool/icongra/poke_icon/narc_0018.png b/files/poketool/icongra/poke_icon/narc_0018.png
new file mode 100644
index 00000000..fe17c1e7
--- /dev/null
+++ b/files/poketool/icongra/poke_icon/narc_0018.png
diff --git a/files/poketool/icongra/poke_icon/narc_0019.NCGR b/files/poketool/icongra/poke_icon/narc_0019.NCGR
deleted file mode 100644
index 46d342ae..00000000
--- a/files/poketool/icongra/poke_icon/narc_0019.NCGR
+++ /dev/null
diff --git a/files/poketool/icongra/poke_icon/narc_0019.png b/files/poketool/icongra/poke_icon/narc_0019.png
new file mode 100644
index 00000000..11ad963d
--- /dev/null
+++ b/files/poketool/icongra/poke_icon/narc_0019.png
diff --git a/files/poketool/icongra/poke_icon/narc_0020.NCGR b/files/poketool/icongra/poke_icon/narc_0020.NCGR
deleted file mode 100644
index db6cb323..00000000
--- a/files/poketool/icongra/poke_icon/narc_0020.NCGR
+++ /dev/null
diff --git a/files/poketool/icongra/poke_icon/narc_0020.png b/files/poketool/icongra/poke_icon/narc_0020.png
new file mode 100644
index 00000000..6efbd041
--- /dev/null
+++ b/files/poketool/icongra/poke_icon/narc_0020.png
diff --git a/files/poketool/icongra/poke_icon/narc_0021.NCGR b/files/poketool/icongra/poke_icon/narc_0021.NCGR
deleted file mode 100644
index f0e4eb2b..00000000
--- a/files/poketool/icongra/poke_icon/narc_0021.NCGR
+++ /dev/null
diff --git a/files/poketool/icongra/poke_icon/narc_0021.png b/files/poketool/icongra/poke_icon/narc_0021.png
new file mode 100644
index 00000000..1c857d44
--- /dev/null
+++ b/files/poketool/icongra/poke_icon/narc_0021.png
diff --git a/files/poketool/icongra/poke_icon/narc_0022.NCGR b/files/poketool/icongra/poke_icon/narc_0022.NCGR
deleted file mode 100644
index 3d83aea4..00000000
--- a/files/poketool/icongra/poke_icon/narc_0022.NCGR
+++ /dev/null
diff --git a/files/poketool/icongra/poke_icon/narc_0022.png b/files/poketool/icongra/poke_icon/narc_0022.png
new file mode 100644
index 00000000..d5e6471a
--- /dev/null
+++ b/files/poketool/icongra/poke_icon/narc_0022.png
diff --git a/files/poketool/icongra/poke_icon/narc_0023.NCGR b/files/poketool/icongra/poke_icon/narc_0023.NCGR
deleted file mode 100644
index b84b867e..00000000
--- a/files/poketool/icongra/poke_icon/narc_0023.NCGR
+++ /dev/null
diff --git a/files/poketool/icongra/poke_icon/narc_0023.png b/files/poketool/icongra/poke_icon/narc_0023.png
new file mode 100644
index 00000000..c3c8f5d8
--- /dev/null
+++ b/files/poketool/icongra/poke_icon/narc_0023.png
diff --git a/files/poketool/icongra/poke_icon/narc_0024.NCGR b/files/poketool/icongra/poke_icon/narc_0024.NCGR
deleted file mode 100644
index a0bb2fad..00000000
--- a/files/poketool/icongra/poke_icon/narc_0024.NCGR
+++ /dev/null
diff --git a/files/poketool/icongra/poke_icon/narc_0024.png b/files/poketool/icongra/poke_icon/narc_0024.png
new file mode 100644
index 00000000..c0348df5
--- /dev/null
+++ b/files/poketool/icongra/poke_icon/narc_0024.png
diff --git a/files/poketool/icongra/poke_icon/narc_0025.NCGR b/files/poketool/icongra/poke_icon/narc_0025.NCGR
deleted file mode 100644
index e3945760..00000000
--- a/files/poketool/icongra/poke_icon/narc_0025.NCGR
+++ /dev/null
diff --git a/files/poketool/icongra/poke_icon/narc_0025.png b/files/poketool/icongra/poke_icon/narc_0025.png
new file mode 100644
index 00000000..fc77716e
--- /dev/null
+++ b/files/poketool/icongra/poke_icon/narc_0025.png
diff --git a/files/poketool/icongra/poke_icon/narc_0026.NCGR b/files/poketool/icongra/poke_icon/narc_0026.NCGR
deleted file mode 100644
index f40adfe7..00000000
--- a/files/poketool/icongra/poke_icon/narc_0026.NCGR
+++ /dev/null
diff --git a/files/poketool/icongra/poke_icon/narc_0026.png b/files/poketool/icongra/poke_icon/narc_0026.png
new file mode 100644
index 00000000..ae7b2225
--- /dev/null
+++ b/files/poketool/icongra/poke_icon/narc_0026.png
diff --git a/files/poketool/icongra/poke_icon/narc_0027.NCGR b/files/poketool/icongra/poke_icon/narc_0027.NCGR
deleted file mode 100644
index 690c7ab2..00000000
--- a/files/poketool/icongra/poke_icon/narc_0027.NCGR
+++ /dev/null
diff --git a/files/poketool/icongra/poke_icon/narc_0027.png b/files/poketool/icongra/poke_icon/narc_0027.png
new file mode 100644
index 00000000..b9959d1c
--- /dev/null
+++ b/files/poketool/icongra/poke_icon/narc_0027.png
diff --git a/files/poketool/icongra/poke_icon/narc_0028.NCGR b/files/poketool/icongra/poke_icon/narc_0028.NCGR
deleted file mode 100644
index 4adf4b97..00000000
--- a/files/poketool/icongra/poke_icon/narc_0028.NCGR
+++ /dev/null
diff --git a/files/poketool/icongra/poke_icon/narc_0028.png b/files/poketool/icongra/poke_icon/narc_0028.png
new file mode 100644
index 00000000..b7f3a1eb
--- /dev/null
+++ b/files/poketool/icongra/poke_icon/narc_0028.png
diff --git a/files/poketool/icongra/poke_icon/narc_0029.NCGR b/files/poketool/icongra/poke_icon/narc_0029.NCGR
deleted file mode 100644
index 7db15dcf..00000000
--- a/files/poketool/icongra/poke_icon/narc_0029.NCGR
+++ /dev/null
diff --git a/files/poketool/icongra/poke_icon/narc_0029.png b/files/poketool/icongra/poke_icon/narc_0029.png
new file mode 100644
index 00000000..a52ea031
--- /dev/null
+++ b/files/poketool/icongra/poke_icon/narc_0029.png
diff --git a/files/poketool/icongra/poke_icon/narc_0030.NCGR b/files/poketool/icongra/poke_icon/narc_0030.NCGR
deleted file mode 100644
index 9eba4fa4..00000000
--- a/files/poketool/icongra/poke_icon/narc_0030.NCGR
+++ /dev/null
diff --git a/files/poketool/icongra/poke_icon/narc_0030.png b/files/poketool/icongra/poke_icon/narc_0030.png
new file mode 100644
index 00000000..3c81efd6
--- /dev/null
+++ b/files/poketool/icongra/poke_icon/narc_0030.png
diff --git a/files/poketool/icongra/poke_icon/narc_0031.NCGR b/files/poketool/icongra/poke_icon/narc_0031.NCGR
deleted file mode 100644
index ed436770..00000000
--- a/files/poketool/icongra/poke_icon/narc_0031.NCGR
+++ /dev/null
diff --git a/files/poketool/icongra/poke_icon/narc_0031.png b/files/poketool/icongra/poke_icon/narc_0031.png
new file mode 100644
index 00000000..8967d44a
--- /dev/null
+++ b/files/poketool/icongra/poke_icon/narc_0031.png
diff --git a/files/poketool/icongra/poke_icon/narc_0032.NCGR b/files/poketool/icongra/poke_icon/narc_0032.NCGR
deleted file mode 100644
index 3424a464..00000000
--- a/files/poketool/icongra/poke_icon/narc_0032.NCGR
+++ /dev/null
diff --git a/files/poketool/icongra/poke_icon/narc_0032.png b/files/poketool/icongra/poke_icon/narc_0032.png
new file mode 100644
index 00000000..feb77f7d
--- /dev/null
+++ b/files/poketool/icongra/poke_icon/narc_0032.png
diff --git a/files/poketool/icongra/poke_icon/narc_0033.NCGR b/files/poketool/icongra/poke_icon/narc_0033.NCGR
deleted file mode 100644
index ca90981b..00000000
--- a/files/poketool/icongra/poke_icon/narc_0033.NCGR
+++ /dev/null
diff --git a/files/poketool/icongra/poke_icon/narc_0033.png b/files/poketool/icongra/poke_icon/narc_0033.png
new file mode 100644
index 00000000..67543933
--- /dev/null
+++ b/files/poketool/icongra/poke_icon/narc_0033.png
diff --git a/files/poketool/icongra/poke_icon/narc_0034.NCGR b/files/poketool/icongra/poke_icon/narc_0034.NCGR
deleted file mode 100644
index 9fa16d27..00000000
--- a/files/poketool/icongra/poke_icon/narc_0034.NCGR
+++ /dev/null
diff --git a/files/poketool/icongra/poke_icon/narc_0034.png b/files/poketool/icongra/poke_icon/narc_0034.png
new file mode 100644
index 00000000..5919f109
--- /dev/null
+++ b/files/poketool/icongra/poke_icon/narc_0034.png
diff --git a/files/poketool/icongra/poke_icon/narc_0035.NCGR b/files/poketool/icongra/poke_icon/narc_0035.NCGR
deleted file mode 100644
index 0fbd78f8..00000000
--- a/files/poketool/icongra/poke_icon/narc_0035.NCGR
+++ /dev/null
diff --git a/files/poketool/icongra/poke_icon/narc_0035.png b/files/poketool/icongra/poke_icon/narc_0035.png
new file mode 100644
index 00000000..08198e6b
--- /dev/null
+++ b/files/poketool/icongra/poke_icon/narc_0035.png
diff --git a/files/poketool/icongra/poke_icon/narc_0036.NCGR b/files/poketool/icongra/poke_icon/narc_0036.NCGR
deleted file mode 100644
index 109becc0..00000000
--- a/files/poketool/icongra/poke_icon/narc_0036.NCGR
+++ /dev/null
diff --git a/files/poketool/icongra/poke_icon/narc_0036.png b/files/poketool/icongra/poke_icon/narc_0036.png
new file mode 100644
index 00000000..a2483ae6
--- /dev/null
+++ b/files/poketool/icongra/poke_icon/narc_0036.png
diff --git a/filesystem.mk b/filesystem.mk
index 4264c367..f06a5429 100644
--- a/filesystem.mk
+++ b/filesystem.mk
@@ -2589,6 +2589,7 @@ files/poketool/icongra/poke_icon.narc: \
         files/poketool/icongra/poke_icon/narc_0000.NCLR \
         files/poketool/icongra/poke_icon/narc_0002.NCER \
         files/poketool/icongra/poke_icon/narc_0004.NCER \
+        files/poketool/icongra/poke_icon/narc_0006.NCER \
         files/poketool/icongra/poke_icon/narc_0007.NCGR \
         files/poketool/icongra/poke_icon/narc_0008.NCGR \
         files/poketool/icongra/poke_icon/narc_0009.NCGR \
@@ -2599,6 +2600,26 @@ files/poketool/icongra/poke_icon.narc: \
         files/poketool/icongra/poke_icon/narc_0014.NCGR \
         files/poketool/icongra/poke_icon/narc_0015.NCGR \
         files/poketool/icongra/poke_icon/narc_0016.NCGR \
+        files/poketool/icongra/poke_icon/narc_0017.NCGR \
+        files/poketool/icongra/poke_icon/narc_0018.NCGR \
+        files/poketool/icongra/poke_icon/narc_0019.NCGR \
+        files/poketool/icongra/poke_icon/narc_0020.NCGR \
+        files/poketool/icongra/poke_icon/narc_0021.NCGR \
+        files/poketool/icongra/poke_icon/narc_0022.NCGR \
+        files/poketool/icongra/poke_icon/narc_0023.NCGR \
+        files/poketool/icongra/poke_icon/narc_0024.NCGR \
+        files/poketool/icongra/poke_icon/narc_0025.NCGR \
+        files/poketool/icongra/poke_icon/narc_0026.NCGR \
+        files/poketool/icongra/poke_icon/narc_0027.NCGR \
+        files/poketool/icongra/poke_icon/narc_0028.NCGR \
+        files/poketool/icongra/poke_icon/narc_0029.NCGR \
+        files/poketool/icongra/poke_icon/narc_0030.NCGR \
+        files/poketool/icongra/poke_icon/narc_0031.NCGR \
+        files/poketool/icongra/poke_icon/narc_0032.NCGR \
+        files/poketool/icongra/poke_icon/narc_0033.NCGR \
+        files/poketool/icongra/poke_icon/narc_0034.NCGR \
+        files/poketool/icongra/poke_icon/narc_0035.NCGR \
+        files/poketool/icongra/poke_icon/narc_0036.NCGR \
         files/poketool/icongra/poke_icon/narc_0402.NCGR
 
 files/msgdata/msg.narc: \
diff --git a/graphics_rules.mk b/graphics_rules.mk
index 8abbbbaa..d20020cd 100644
--- a/graphics_rules.mk
+++ b/graphics_rules.mk
@@ -86,6 +86,26 @@ CLOBBER_SIZE_VERSION101_NCGR_FILES := files/graphic/bag_gra/narc_0002.NCGR \
                                       files/poketool/icongra/poke_icon/narc_0014.NCGR \
                                       files/poketool/icongra/poke_icon/narc_0015.NCGR \
                                       files/poketool/icongra/poke_icon/narc_0016.NCGR \
+                                      files/poketool/icongra/poke_icon/narc_0017.NCGR \
+                                      files/poketool/icongra/poke_icon/narc_0018.NCGR \
+                                      files/poketool/icongra/poke_icon/narc_0019.NCGR \
+                                      files/poketool/icongra/poke_icon/narc_0020.NCGR \
+                                      files/poketool/icongra/poke_icon/narc_0021.NCGR \
+                                      files/poketool/icongra/poke_icon/narc_0022.NCGR \
+                                      files/poketool/icongra/poke_icon/narc_0023.NCGR \
+                                      files/poketool/icongra/poke_icon/narc_0024.NCGR \
+                                      files/poketool/icongra/poke_icon/narc_0025.NCGR \
+                                      files/poketool/icongra/poke_icon/narc_0026.NCGR \
+                                      files/poketool/icongra/poke_icon/narc_0027.NCGR \
+                                      files/poketool/icongra/poke_icon/narc_0028.NCGR \
+                                      files/poketool/icongra/poke_icon/narc_0029.NCGR \
+                                      files/poketool/icongra/poke_icon/narc_0030.NCGR \
+                                      files/poketool/icongra/poke_icon/narc_0031.NCGR \
+                                      files/poketool/icongra/poke_icon/narc_0032.NCGR \
+                                      files/poketool/icongra/poke_icon/narc_0033.NCGR \
+                                      files/poketool/icongra/poke_icon/narc_0034.NCGR \
+                                      files/poketool/icongra/poke_icon/narc_0035.NCGR \
+                                      files/poketool/icongra/poke_icon/narc_0036.NCGR \
                                       files/poketool/icongra/poke_icon/narc_0402.NCGR
 
 4BPP_NCLR_FILES := files/application/wifi_earth/wifi_earth/narc_0006.NCLR \
@@ -498,6 +518,26 @@ NCGR_CLEAN_LIST := files/application/wifi_earth/wifi_earth/narc_0005.NCGR \
                    files/poketool/icongra/poke_icon/narc_0014.NCGR \
                    files/poketool/icongra/poke_icon/narc_0015.NCGR \
                    files/poketool/icongra/poke_icon/narc_0016.NCGR \
+                   files/poketool/icongra/poke_icon/narc_0017.NCGR \
+                   files/poketool/icongra/poke_icon/narc_0018.NCGR \
+                   files/poketool/icongra/poke_icon/narc_0019.NCGR \
+                   files/poketool/icongra/poke_icon/narc_0020.NCGR \
+                   files/poketool/icongra/poke_icon/narc_0021.NCGR \
+                   files/poketool/icongra/poke_icon/narc_0022.NCGR \
+                   files/poketool/icongra/poke_icon/narc_0023.NCGR \
+                   files/poketool/icongra/poke_icon/narc_0024.NCGR \
+                   files/poketool/icongra/poke_icon/narc_0025.NCGR \
+                   files/poketool/icongra/poke_icon/narc_0026.NCGR \
+                   files/poketool/icongra/poke_icon/narc_0027.NCGR \
+                   files/poketool/icongra/poke_icon/narc_0028.NCGR \
+                   files/poketool/icongra/poke_icon/narc_0029.NCGR \
+                   files/poketool/icongra/poke_icon/narc_0030.NCGR \
+                   files/poketool/icongra/poke_icon/narc_0031.NCGR \
+                   files/poketool/icongra/poke_icon/narc_0032.NCGR \
+                   files/poketool/icongra/poke_icon/narc_0033.NCGR \
+                   files/poketool/icongra/poke_icon/narc_0034.NCGR \
+                   files/poketool/icongra/poke_icon/narc_0035.NCGR \
+                   files/poketool/icongra/poke_icon/narc_0036.NCGR \
                    files/poketool/icongra/poke_icon/narc_0402.NCGR \
                    files/poketool/pokegra/pokegra/narc_0006.NCGR \
                    files/poketool/pokegra/pokegra/narc_0007.NCGR \
@@ -881,7 +921,8 @@ NCLR_CLEAN_LIST := files/application/wifi_earth/wifi_earth/narc_0006.NCLR \
                    files/poketool/trgra/trfgra/narc_0194.NCLR \
 
 NCER_CLEAN_LIST := files/poketool/icongra/poke_icon/narc_0002.NCER \
-                   files/poketool/icongra/poke_icon/narc_0004.NCER
+                   files/poketool/icongra/poke_icon/narc_0004.NCER \
+                   files/poketool/icongra/poke_icon/narc_0006.NCER
 
 NSCR_CLEAN_LIST := files/demo/title/titledemo/narc_0000.NSCR \
                    files/demo/title/titledemo/narc_0008.NSCR \
diff --git a/tools/nitrogfx/gfx.c b/tools/nitrogfx/gfx.c
index 305fbeb2..f5ff30e7 100644
--- a/tools/nitrogfx/gfx.c
+++ b/tools/nitrogfx/gfx.c
@@ -774,8 +774,9 @@ void WriteNtrCell(char *path, struct JsonToCellOptions *options)
 	KBECHeader[4] = (size + 0x20) & 0xFF; //size
 	KBECHeader[5] = (size + 0x20) >> 8; //unlikely to be more than 16 bits, but there are 32 allocated, change if necessary
 
-	fwrite(KBECHeader, 1, 0x20, fp);
+	KBECHeader[16] = (options->mappingType & 0xFF); //not possible to be more than 8 bits, though 32 are allocated
 
+	fwrite(KBECHeader, 1, 0x20, fp);
 
 	unsigned char *KBECContents = malloc(size);
 
diff --git a/tools/nitrogfx/json.c b/tools/nitrogfx/json.c
index aad325be..b825c363 100644
--- a/tools/nitrogfx/json.c
+++ b/tools/nitrogfx/json.c
@@ -51,16 +51,17 @@ struct JsonToCellOptions *ParseNCERJson(char *path)
     cJSON *imageHeight = cJSON_GetObjectItemCaseSensitive(json, "imageHeight");
     cJSON *imageWidth = cJSON_GetObjectItemCaseSensitive(json, "imageWidth");
     cJSON *cellCount = cJSON_GetObjectItemCaseSensitive(json, "cellCount");
+    cJSON *mappingType = cJSON_GetObjectItemCaseSensitive(json, "mappingType");
 
     options->labelEnabled = GetBool(labelBool);
     options->extended = GetBool(extended);
     options->imageHeight = GetInt(imageHeight);
     options->imageWidth = GetInt(imageWidth);
     options->cellCount = GetInt(cellCount);
+    options->mappingType = GetInt(mappingType);
 
     options->cells = malloc(sizeof(struct Cell *) * options->cellCount);
 
-
     if (options->labelEnabled)
     {
         cJSON *labelCount = cJSON_GetObjectItemCaseSensitive(json, "labelCount");
diff --git a/tools/nitrogfx/options.h b/tools/nitrogfx/options.h
index 780c83e6..66e9895d 100644
--- a/tools/nitrogfx/options.h
+++ b/tools/nitrogfx/options.h
@@ -74,6 +74,7 @@ struct Cell {
 struct JsonToCellOptions {
     bool labelEnabled;
     bool extended;
+    int mappingType;
     int imageHeight;
     int imageWidth;
     int cellCount;