31 files changed, 56 insertions, 7 deletions
diff --git a/files/poketool/trgra/trbgra/.gitignore b/files/poketool/trgra/trbgra/.gitignore
index 849e6ea4..574e26f1 100644
--- a/files/poketool/trgra/trbgra/.gitignore
+++ b/files/poketool/trgra/trbgra/.gitignore
@@ -1,2 +1,2 @@
-narc_0000.NCGR
-narc_0000.NCLR
-\ No newline at end of file
+*.NCGR
+*.NCLR
diff --git a/files/poketool/trgra/trbgra/narc_0002.NCGR b/files/poketool/trgra/trbgra/narc_0002.NCGR
deleted file mode 100644
index bacde954..00000000
--- a/files/poketool/trgra/trbgra/narc_0002.NCGR
+++ /dev/null
diff --git a/files/poketool/trgra/trbgra/narc_0002.png b/files/poketool/trgra/trbgra/narc_0002.png
new file mode 100644
index 00000000..27e75ea2
--- /dev/null
+++ b/files/poketool/trgra/trbgra/narc_0002.png
diff --git a/files/poketool/trgra/trbgra/narc_0002.png.key b/files/poketool/trgra/trbgra/narc_0002.png.key
new file mode 100644
index 00000000..c13045ef
--- /dev/null
+++ b/files/poketool/trgra/trbgra/narc_0002.png.key
@@ -0,0 +1 @@
+!ð#
+\ No newline at end of file
diff --git a/files/poketool/trgra/trbgra/narc_0003.NCLR b/files/poketool/trgra/trbgra/narc_0003.NCLR
deleted file mode 100644
index ddc56db8..00000000
--- a/files/poketool/trgra/trbgra/narc_0003.NCLR
+++ /dev/null
diff --git a/files/poketool/trgra/trbgra/narc_0004.NCGR b/files/poketool/trgra/trbgra/narc_0004.NCGR
deleted file mode 100644
index 3372790e..00000000
--- a/files/poketool/trgra/trbgra/narc_0004.NCGR
+++ /dev/null
diff --git a/files/poketool/trgra/trbgra/narc_0004.png b/files/poketool/trgra/trbgra/narc_0004.png
new file mode 100644
index 00000000..99bf9780
--- /dev/null
+++ b/files/poketool/trgra/trbgra/narc_0004.png
diff --git a/files/poketool/trgra/trbgra/narc_0004.png.key b/files/poketool/trgra/trbgra/narc_0004.png.key
new file mode 100644
index 00000000..7a5ca01d
--- /dev/null
+++ b/files/poketool/trgra/trbgra/narc_0004.png.key
@@ -0,0 +1 @@
+ Ì¾-
+\ No newline at end of file
diff --git a/files/poketool/trgra/trbgra/narc_0005.NCLR b/files/poketool/trgra/trbgra/narc_0005.NCLR
deleted file mode 100644
index cf369085..00000000
--- a/files/poketool/trgra/trbgra/narc_0005.NCLR
+++ /dev/null
diff --git a/files/poketool/trgra/trbgra/narc_0006.NCGR b/files/poketool/trgra/trbgra/narc_0006.NCGR
deleted file mode 100644
index daebb303..00000000
--- a/files/poketool/trgra/trbgra/narc_0006.NCGR
+++ /dev/null
diff --git a/files/poketool/trgra/trbgra/narc_0006.png b/files/poketool/trgra/trbgra/narc_0006.png
new file mode 100644
index 00000000..01d527ec
--- /dev/null
+++ b/files/poketool/trgra/trbgra/narc_0006.png
diff --git a/files/poketool/trgra/trbgra/narc_0006.png.key b/files/poketool/trgra/trbgra/narc_0006.png.key
new file mode 100644
index 00000000..a7054634
--- /dev/null
+++ b/files/poketool/trgra/trbgra/narc_0006.png.key
@@ -0,0 +1 @@
+ÊŽ‘
+\ No newline at end of file
diff --git a/files/poketool/trgra/trbgra/narc_0007.NCLR b/files/poketool/trgra/trbgra/narc_0007.NCLR
deleted file mode 100644
index 20b35a8e..00000000
--- a/files/poketool/trgra/trbgra/narc_0007.NCLR
+++ /dev/null
diff --git a/files/poketool/trgra/trbgra/narc_0008.NCGR b/files/poketool/trgra/trbgra/narc_0008.NCGR
deleted file mode 100644
index 7c9ba271..00000000
--- a/files/poketool/trgra/trbgra/narc_0008.NCGR
+++ /dev/null
diff --git a/files/poketool/trgra/trbgra/narc_0008.png b/files/poketool/trgra/trbgra/narc_0008.png
new file mode 100644
index 00000000..06634311
--- /dev/null
+++ b/files/poketool/trgra/trbgra/narc_0008.png
diff --git a/files/poketool/trgra/trbgra/narc_0008.png.key b/files/poketool/trgra/trbgra/narc_0008.png.key
new file mode 100644
index 00000000..42659e6d
--- /dev/null
+++ b/files/poketool/trgra/trbgra/narc_0008.png.key
@@ -0,0 +1 @@
+=,²u
+\ No newline at end of file
diff --git a/files/poketool/trgra/trbgra/narc_0009.NCLR b/files/poketool/trgra/trbgra/narc_0009.NCLR
deleted file mode 100644
index d89d3988..00000000
--- a/files/poketool/trgra/trbgra/narc_0009.NCLR
+++ /dev/null
diff --git a/files/poketool/trgra/trbgra/narc_0010.NCGR b/files/poketool/trgra/trbgra/narc_0010.NCGR
deleted file mode 100644
index 93a39c7a..00000000
--- a/files/poketool/trgra/trbgra/narc_0010.NCGR
+++ /dev/null
diff --git a/files/poketool/trgra/trbgra/narc_0010.png b/files/poketool/trgra/trbgra/narc_0010.png
new file mode 100644
index 00000000..5f1f90e7
--- /dev/null
+++ b/files/poketool/trgra/trbgra/narc_0010.png
diff --git a/files/poketool/trgra/trbgra/narc_0010.png.key b/files/poketool/trgra/trbgra/narc_0010.png.key
new file mode 100644
index 00000000..7822b84d
--- /dev/null
+++ b/files/poketool/trgra/trbgra/narc_0010.png.key
@@ -0,0 +1 @@
+–?	
+\ No newline at end of file
diff --git a/files/poketool/trgra/trbgra/narc_0011.NCLR b/files/poketool/trgra/trbgra/narc_0011.NCLR
deleted file mode 100644
index 1b323a1d..00000000
--- a/files/poketool/trgra/trbgra/narc_0011.NCLR
+++ /dev/null
diff --git a/files/poketool/trgra/trbgra/narc_0012.NCGR b/files/poketool/trgra/trbgra/narc_0012.NCGR
deleted file mode 100644
index ae073bdc..00000000
--- a/files/poketool/trgra/trbgra/narc_0012.NCGR
+++ /dev/null
diff --git a/files/poketool/trgra/trbgra/narc_0012.png b/files/poketool/trgra/trbgra/narc_0012.png
new file mode 100644
index 00000000..116ff9b9
--- /dev/null
+++ b/files/poketool/trgra/trbgra/narc_0012.png
diff --git a/files/poketool/trgra/trbgra/narc_0012.png.key b/files/poketool/trgra/trbgra/narc_0012.png.key
new file mode 100644
index 00000000..7e331dbe
--- /dev/null
+++ b/files/poketool/trgra/trbgra/narc_0012.png.key
@@ -0,0 +1 @@
+\Þ|
+\ No newline at end of file
diff --git a/files/poketool/trgra/trbgra/narc_0013.NCLR b/files/poketool/trgra/trbgra/narc_0013.NCLR
deleted file mode 100644
index e374a023..00000000
--- a/files/poketool/trgra/trbgra/narc_0013.NCLR
+++ /dev/null
diff --git a/files/poketool/trgra/trbgra/narc_0014.NCGR b/files/poketool/trgra/trbgra/narc_0014.NCGR
deleted file mode 100644
index a24ae094..00000000
--- a/files/poketool/trgra/trbgra/narc_0014.NCGR
+++ /dev/null
diff --git a/files/poketool/trgra/trbgra/narc_0014.png b/files/poketool/trgra/trbgra/narc_0014.png
new file mode 100644
index 00000000..515df0e7
--- /dev/null
+++ b/files/poketool/trgra/trbgra/narc_0014.png
diff --git a/files/poketool/trgra/trbgra/narc_0014.png.key b/files/poketool/trgra/trbgra/narc_0014.png.key
new file mode 100644
index 00000000..905bc805
--- /dev/null
+++ b/files/poketool/trgra/trbgra/narc_0014.png.key
@@ -0,0 +1 @@
+šl†ž
+\ No newline at end of file
diff --git a/files/poketool/trgra/trbgra/narc_0015.NCLR b/files/poketool/trgra/trbgra/narc_0015.NCLR
deleted file mode 100644
index 0af3a75d..00000000
--- a/files/poketool/trgra/trbgra/narc_0015.NCLR
+++ /dev/null
diff --git a/filesystem.mk b/filesystem.mk
index d5d3cae8..f827943e 100644
--- a/filesystem.mk
+++ b/filesystem.mk
@@ -2260,7 +2260,21 @@ files/demo/title/titledemo.narc: \
 
 files/poketool/trgra/trbgra.narc: \
         files/poketool/trgra/trbgra/narc_0000.NCGR \
-        files/poketool/trgra/trbgra/narc_0000.NCLR
+        files/poketool/trgra/trbgra/narc_0000.NCLR \
+        files/poketool/trgra/trbgra/narc_0002.NCGR \
+        files/poketool/trgra/trbgra/narc_0002.NCLR \
+        files/poketool/trgra/trbgra/narc_0004.NCGR \
+        files/poketool/trgra/trbgra/narc_0004.NCLR \
+        files/poketool/trgra/trbgra/narc_0006.NCGR \
+        files/poketool/trgra/trbgra/narc_0006.NCLR \
+        files/poketool/trgra/trbgra/narc_0008.NCGR \
+        files/poketool/trgra/trbgra/narc_0008.NCLR \
+        files/poketool/trgra/trbgra/narc_0010.NCGR \
+        files/poketool/trgra/trbgra/narc_0010.NCLR \
+        files/poketool/trgra/trbgra/narc_0012.NCGR \
+        files/poketool/trgra/trbgra/narc_0012.NCLR \
+        files/poketool/trgra/trbgra/narc_0014.NCGR \
+        files/poketool/trgra/trbgra/narc_0014.NCLR
 
 .PHONY: filesystem
 
diff --git a/graphics_rules.mk b/graphics_rules.mk
index 95b55503..73294e1d 100644
--- a/graphics_rules.mk
+++ b/graphics_rules.mk
@@ -105,9 +105,23 @@ VERSION101_SOPC_NCGR_FILES := files/demo/title/titledemo/narc_0007.NCGR \
                               files/demo/title/titledemo/narc_0011.NCGR \
                               files/demo/title/titledemo/narc_0015.NCGR
 
-8BPP_COMP10_NOPAD_NCLR_FILES := files/poketool/trgra/trbgra/narc_0000.NCLR
+8BPP_COMP10_NOPAD_NCLR_FILES := files/poketool/trgra/trbgra/narc_0000.NCLR \
+                                files/poketool/trgra/trbgra/narc_0002.NCLR \
+                                files/poketool/trgra/trbgra/narc_0004.NCLR \
+                                files/poketool/trgra/trbgra/narc_0006.NCLR \
+                                files/poketool/trgra/trbgra/narc_0008.NCLR \
+                                files/poketool/trgra/trbgra/narc_0010.NCLR \
+                                files/poketool/trgra/trbgra/narc_0012.NCLR \
+                                files/poketool/trgra/trbgra/narc_0014.NCLR
 
-SCANNED_NCGR_FILES := files/poketool/trgra/trbgra/narc_0000.NCGR
+SCANNED_NCGR_FILES := files/poketool/trgra/trbgra/narc_0000.NCGR \
+                      files/poketool/trgra/trbgra/narc_0002.NCGR \
+                      files/poketool/trgra/trbgra/narc_0004.NCGR \
+                      files/poketool/trgra/trbgra/narc_0006.NCGR \
+                      files/poketool/trgra/trbgra/narc_0008.NCGR \
+                      files/poketool/trgra/trbgra/narc_0010.NCGR \
+                      files/poketool/trgra/trbgra/narc_0012.NCGR \
+                      files/poketool/trgra/trbgra/narc_0014.NCGR
 
 NCGR_CLEAN_LIST := files/data/cell0.NCGR \
                    files/demo/title/titledemo/narc_0001.NCGR \
@@ -175,7 +189,14 @@ NCGR_CLEAN_LIST := files/data/cell0.NCGR \
                    files/itemtool/itemdata/item_icon/narc_0135.NCGR \
                    files/itemtool/itemdata/item_icon/narc_0136.NCGR \
                    files/itemtool/itemdata/item_icon/narc_0138.NCGR \
-                   files/poketool/trgra/trbgra/narc_0000.NCGR
+                   files/poketool/trgra/trbgra/narc_0000.NCGR \
+                   files/poketool/trgra/trbgra/narc_0002.NCGR \
+                   files/poketool/trgra/trbgra/narc_0004.NCGR \
+                   files/poketool/trgra/trbgra/narc_0006.NCGR \
+                   files/poketool/trgra/trbgra/narc_0008.NCGR \
+                   files/poketool/trgra/trbgra/narc_0010.NCGR \
+                   files/poketool/trgra/trbgra/narc_0012.NCGR \
+                   files/poketool/trgra/trbgra/narc_0014.NCGR
 
 
 NCLR_CLEAN_LIST := files/data/cell0.NCLR \
@@ -269,4 +290,11 @@ NCLR_CLEAN_LIST := files/data/cell0.NCLR \
                    files/itemtool/itemdata/item_icon/narc_0134.NCLR \
                    files/itemtool/itemdata/item_icon/narc_0136.NCLR \
                    files/itemtool/itemdata/item_icon/narc_0138.NCLR \
-                   files/poketool/trgra/trbgra/narc_0000.NCLR
+                   files/poketool/trgra/trbgra/narc_0000.NCLR \
+                   files/poketool/trgra/trbgra/narc_0002.NCLR \
+                   files/poketool/trgra/trbgra/narc_0004.NCLR \
+                   files/poketool/trgra/trbgra/narc_0006.NCLR \
+                   files/poketool/trgra/trbgra/narc_0008.NCLR \
+                   files/poketool/trgra/trbgra/narc_0010.NCLR \
+                   files/poketool/trgra/trbgra/narc_0012.NCLR \
+                   files/poketool/trgra/trbgra/narc_0014.NCLR