Merge pull request #241 from red031000/master

extract all trainer back sprites + palette indexes

83 files changed, 260 insertions, 19 deletions

diff --git a/Makefile b/Makefile
index f0fc0cb1..7a9b1e06 100644
--- a/Makefile
+++ b/Makefile
@@ -275,7 +275,10 @@ $(IR_NCLR_FILES): %.NCLR: %.pal
 $(4BPP_NCLR_FILES): %.NCLR: %.pal
 	$(GFX) $< $@ -bitdepth 4
 
-$(8BPP_COMP10_NOPAD_NCLR_FILES): %.NCLR: %.png
+$(8BPP_COMP10_NOPAD_NCLR_PNG_FILES): %.NCLR: %.png
+	$(GFX) $< $@ -bitdepth 8 -nopad -comp 10
+
+$(8BPP_COMP10_NOPAD_NCLR_PAL_FILES): %.NCLR: %.pal
 	$(GFX) $< $@ -bitdepth 8 -nopad -comp 10
 
 %.png: ;
diff --git a/files/itemtool/itemdata/item_icon/.gitignore b/files/itemtool/itemdata/item_icon/.gitignore
index e1591c96..5f446a70 100644
--- a/files/itemtool/itemdata/item_icon/.gitignore
+++ b/files/itemtool/itemdata/item_icon/.gitignore
@@ -136,3 +136,11 @@ narc_0136.NCGR
 narc_0136.NCLR
 narc_0138.NCGR
 narc_0138.NCLR
+narc_0140.NCGR
+narc_0140.NCLR
+narc_0142.NCGR
+narc_0142.NCLR
+narc_0144.NCGR
+narc_0144.NCLR
+narc_0146.NCGR
+narc_0146.NCLR
diff --git a/files/itemtool/itemdata/item_icon/narc_0140.NCGR b/files/itemtool/itemdata/item_icon/narc_0140.NCGR
deleted file mode 100644
index a5d9f0ce..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0140.NCGR
+++ /dev/null
diff --git a/files/itemtool/itemdata/item_icon/narc_0140.png b/files/itemtool/itemdata/item_icon/narc_0140.png
new file mode 100644
index 00000000..c625707b
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0140.png
diff --git a/files/itemtool/itemdata/item_icon/narc_0141.NCLR b/files/itemtool/itemdata/item_icon/narc_0141.NCLR
deleted file mode 100644
index 8a761e03..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0141.NCLR
+++ /dev/null
diff --git a/files/itemtool/itemdata/item_icon/narc_0142.NCGR b/files/itemtool/itemdata/item_icon/narc_0142.NCGR
deleted file mode 100644
index 0a39cd41..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0142.NCGR
+++ /dev/null
diff --git a/files/itemtool/itemdata/item_icon/narc_0142.png b/files/itemtool/itemdata/item_icon/narc_0142.png
new file mode 100644
index 00000000..67c1f879
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0142.png
diff --git a/files/itemtool/itemdata/item_icon/narc_0143.NCLR b/files/itemtool/itemdata/item_icon/narc_0143.NCLR
deleted file mode 100644
index 8942e239..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0143.NCLR
+++ /dev/null
diff --git a/files/itemtool/itemdata/item_icon/narc_0144.NCGR b/files/itemtool/itemdata/item_icon/narc_0144.NCGR
deleted file mode 100644
index 70bc184d..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0144.NCGR
+++ /dev/null
diff --git a/files/itemtool/itemdata/item_icon/narc_0144.png b/files/itemtool/itemdata/item_icon/narc_0144.png
new file mode 100644
index 00000000..0840b8c2
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0144.png
diff --git a/files/itemtool/itemdata/item_icon/narc_0145.NCLR b/files/itemtool/itemdata/item_icon/narc_0145.NCLR
deleted file mode 100644
index fc288d02..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0145.NCLR
+++ /dev/null
diff --git a/files/itemtool/itemdata/item_icon/narc_0146.NCGR b/files/itemtool/itemdata/item_icon/narc_0146.NCGR
deleted file mode 100644
index 6e38d57f..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0146.NCGR
+++ /dev/null
diff --git a/files/itemtool/itemdata/item_icon/narc_0146.png b/files/itemtool/itemdata/item_icon/narc_0146.png
new file mode 100644
index 00000000..35b63f11
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0146.png
diff --git a/files/itemtool/itemdata/item_icon/narc_0147.NCLR b/files/itemtool/itemdata/item_icon/narc_0147.NCLR
deleted file mode 100644
index 505f60a5..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0147.NCLR
+++ /dev/null
diff --git a/files/poketool/pokegra/pokegra/.gitignore b/files/poketool/pokegra/pokegra/.gitignore
new file mode 100644
index 00000000..cdabb31c
--- /dev/null
+++ b/files/poketool/pokegra/pokegra/.gitignore
@@ -0,0 +1,12 @@
+narc_0006.NCGR
+narc_0007.NCGR
+narc_0008.NCGR
+narc_0009.NCGR
+narc_0010.NCLR
+narc_0011.NCLR
+narc_0012.NCGR
+narc_0013.NCGR
+narc_0014.NCGR
+narc_0015.NCGR
+narc_0016.NCLR
+narc_0017.NCLR
diff --git a/files/poketool/pokegra/pokegra/.knarcignore b/files/poketool/pokegra/pokegra/.knarcignore
index 2856080a..e2f57de1 100644
--- a/files/poketool/pokegra/pokegra/.knarcignore
+++ b/files/poketool/pokegra/pokegra/.knarcignore
@@ -1,2 +1,3 @@
 *.png
 *.pal
+*.key
diff --git a/files/poketool/pokegra/pokegra/narc_0006.NCGR b/files/poketool/pokegra/pokegra/narc_0006.NCGR
deleted file mode 100644
index 7f45ac31..00000000
--- a/files/poketool/pokegra/pokegra/narc_0006.NCGR
+++ /dev/null
diff --git a/files/poketool/pokegra/pokegra/narc_0006.png b/files/poketool/pokegra/pokegra/narc_0006.png
new file mode 100644
index 00000000..4c8dff0a
--- /dev/null
+++ b/files/poketool/pokegra/pokegra/narc_0006.png
diff --git a/files/poketool/pokegra/pokegra/narc_0006.png.key b/files/poketool/pokegra/pokegra/narc_0006.png.key
new file mode 100644
index 00000000..5ba0d100
--- /dev/null
+++ b/files/poketool/pokegra/pokegra/narc_0006.png.key
@@ -0,0 +1 @@
+íˆó
diff --git a/files/poketool/pokegra/pokegra/narc_0007.NCGR b/files/poketool/pokegra/pokegra/narc_0007.NCGR
deleted file mode 100644
index 7f45ac31..00000000
--- a/files/poketool/pokegra/pokegra/narc_0007.NCGR
+++ /dev/null
diff --git a/files/poketool/pokegra/pokegra/narc_0007.png b/files/poketool/pokegra/pokegra/narc_0007.png
new file mode 100644
index 00000000..4c8dff0a
--- /dev/null
+++ b/files/poketool/pokegra/pokegra/narc_0007.png
diff --git a/files/poketool/pokegra/pokegra/narc_0007.png.key b/files/poketool/pokegra/pokegra/narc_0007.png.key
new file mode 100644
index 00000000..5ba0d100
--- /dev/null
+++ b/files/poketool/pokegra/pokegra/narc_0007.png.key
@@ -0,0 +1 @@
+íˆó
diff --git a/files/poketool/pokegra/pokegra/narc_0008.NCGR b/files/poketool/pokegra/pokegra/narc_0008.NCGR
deleted file mode 100644
index 75a92927..00000000
--- a/files/poketool/pokegra/pokegra/narc_0008.NCGR
+++ /dev/null
diff --git a/files/poketool/pokegra/pokegra/narc_0008.png b/files/poketool/pokegra/pokegra/narc_0008.png
new file mode 100644
index 00000000..05866d74
--- /dev/null
+++ b/files/poketool/pokegra/pokegra/narc_0008.png
diff --git a/files/poketool/pokegra/pokegra/narc_0008.png.key b/files/poketool/pokegra/pokegra/narc_0008.png.key
new file mode 100644
index 00000000..9738ac81
--- /dev/null
+++ b/files/poketool/pokegra/pokegra/narc_0008.png.key
@@ -0,0 +1 @@
+†þ½
\ No newline at end of file
diff --git a/files/poketool/pokegra/pokegra/narc_0009.NCGR b/files/poketool/pokegra/pokegra/narc_0009.NCGR
deleted file mode 100644
index 75a92927..00000000
--- a/files/poketool/pokegra/pokegra/narc_0009.NCGR
+++ /dev/null
diff --git a/files/poketool/pokegra/pokegra/narc_0009.png b/files/poketool/pokegra/pokegra/narc_0009.png
new file mode 100644
index 00000000..05866d74
--- /dev/null
+++ b/files/poketool/pokegra/pokegra/narc_0009.png
diff --git a/files/poketool/pokegra/pokegra/narc_0009.png.key b/files/poketool/pokegra/pokegra/narc_0009.png.key
new file mode 100644
index 00000000..9738ac81
--- /dev/null
+++ b/files/poketool/pokegra/pokegra/narc_0009.png.key
@@ -0,0 +1 @@
+†þ½
\ No newline at end of file
diff --git a/files/poketool/pokegra/pokegra/narc_0010.NCLR b/files/poketool/pokegra/pokegra/narc_0010.NCLR
deleted file mode 100644
index 9148703e..00000000
--- a/files/poketool/pokegra/pokegra/narc_0010.NCLR
+++ /dev/null
diff --git a/files/poketool/pokegra/pokegra/narc_0010.pal b/files/poketool/pokegra/pokegra/narc_0010.pal
new file mode 100644
index 00000000..68bc65c7
--- /dev/null
+++ b/files/poketool/pokegra/pokegra/narc_0010.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+205 213 180
+255 255 255
+131 238 197
+98 213 180
+57 148 148
+24 74 74
+255 106 98
+222 74 65
+189 41 32
+205 205 205
+16 16 16
+189 255 115
+164 213 65
+115 172 49
+82 98 41
+255 0 255
diff --git a/files/poketool/pokegra/pokegra/narc_0011.NCLR b/files/poketool/pokegra/pokegra/narc_0011.NCLR
deleted file mode 100644
index ae1a8672..00000000
--- a/files/poketool/pokegra/pokegra/narc_0011.NCLR
+++ /dev/null
diff --git a/files/poketool/pokegra/pokegra/narc_0011.pal b/files/poketool/pokegra/pokegra/narc_0011.pal
new file mode 100644
index 00000000..fc5cd190
--- /dev/null
+++ b/files/poketool/pokegra/pokegra/narc_0011.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+205 213 180
+255 255 255
+197 246 82
+156 213 74
+115 164 49
+49 98 32
+255 106 98
+222 74 65
+189 41 32
+205 205 205
+16 16 16
+98 222 57
+41 172 16
+0 131 32
+0 90 0
+255 0 255
diff --git a/files/poketool/pokegra/pokegra/narc_0012.NCGR b/files/poketool/pokegra/pokegra/narc_0012.NCGR
deleted file mode 100644
index c876c941..00000000
--- a/files/poketool/pokegra/pokegra/narc_0012.NCGR
+++ /dev/null
diff --git a/files/poketool/pokegra/pokegra/narc_0012.png b/files/poketool/pokegra/pokegra/narc_0012.png
new file mode 100644
index 00000000..b465bf5e
--- /dev/null
+++ b/files/poketool/pokegra/pokegra/narc_0012.png
diff --git a/files/poketool/pokegra/pokegra/narc_0012.png.key b/files/poketool/pokegra/pokegra/narc_0012.png.key
new file mode 100644
index 00000000..d709c778
--- /dev/null
+++ b/files/poketool/pokegra/pokegra/narc_0012.png.key
@@ -0,0 +1 @@
+àG•%
\ No newline at end of file
diff --git a/files/poketool/pokegra/pokegra/narc_0013.NCGR b/files/poketool/pokegra/pokegra/narc_0013.NCGR
deleted file mode 100644
index c876c941..00000000
--- a/files/poketool/pokegra/pokegra/narc_0013.NCGR
+++ /dev/null
diff --git a/files/poketool/pokegra/pokegra/narc_0013.png b/files/poketool/pokegra/pokegra/narc_0013.png
new file mode 100644
index 00000000..b465bf5e
--- /dev/null
+++ b/files/poketool/pokegra/pokegra/narc_0013.png
diff --git a/files/poketool/pokegra/pokegra/narc_0013.png.key b/files/poketool/pokegra/pokegra/narc_0013.png.key
new file mode 100644
index 00000000..d709c778
--- /dev/null
+++ b/files/poketool/pokegra/pokegra/narc_0013.png.key
@@ -0,0 +1 @@
+àG•%
\ No newline at end of file
diff --git a/files/poketool/pokegra/pokegra/narc_0014.NCGR b/files/poketool/pokegra/pokegra/narc_0014.NCGR
deleted file mode 100644
index 2bb74828..00000000
--- a/files/poketool/pokegra/pokegra/narc_0014.NCGR
+++ /dev/null
diff --git a/files/poketool/pokegra/pokegra/narc_0014.png b/files/poketool/pokegra/pokegra/narc_0014.png
new file mode 100644
index 00000000..8607b9ee
--- /dev/null
+++ b/files/poketool/pokegra/pokegra/narc_0014.png
diff --git a/files/poketool/pokegra/pokegra/narc_0014.png.key b/files/poketool/pokegra/pokegra/narc_0014.png.key
new file mode 100644
index 00000000..c3ae04de
--- /dev/null
+++ b/files/poketool/pokegra/pokegra/narc_0014.png.key
@@ -0,0 +1 @@
+¤Ú€€
\ No newline at end of file
diff --git a/files/poketool/pokegra/pokegra/narc_0015.NCGR b/files/poketool/pokegra/pokegra/narc_0015.NCGR
deleted file mode 100644
index 2bb74828..00000000
--- a/files/poketool/pokegra/pokegra/narc_0015.NCGR
+++ /dev/null
diff --git a/files/poketool/pokegra/pokegra/narc_0015.png b/files/poketool/pokegra/pokegra/narc_0015.png
new file mode 100644
index 00000000..8607b9ee
--- /dev/null
+++ b/files/poketool/pokegra/pokegra/narc_0015.png
diff --git a/files/poketool/pokegra/pokegra/narc_0015.png.key b/files/poketool/pokegra/pokegra/narc_0015.png.key
new file mode 100644
index 00000000..c3ae04de
--- /dev/null
+++ b/files/poketool/pokegra/pokegra/narc_0015.png.key
@@ -0,0 +1 @@
+¤Ú€€
\ No newline at end of file
diff --git a/files/poketool/pokegra/pokegra/narc_0016.NCLR b/files/poketool/pokegra/pokegra/narc_0016.NCLR
deleted file mode 100644
index 3d460dcb..00000000
--- a/files/poketool/pokegra/pokegra/narc_0016.NCLR
+++ /dev/null
diff --git a/files/poketool/pokegra/pokegra/narc_0016.pal b/files/poketool/pokegra/pokegra/narc_0016.pal
new file mode 100644
index 00000000..1db34fcf
--- /dev/null
+++ b/files/poketool/pokegra/pokegra/narc_0016.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+205 205 172
+255 255 255
+255 172 164
+255 123 123
+213 65 90
+131 238 197
+90 205 148
+32 148 90
+16 65 74
+131 230 90
+106 180 32
+74 139 32
+16 82 32
+197 115 57
+123 49 41
+16 16 16
diff --git a/files/poketool/pokegra/pokegra/narc_0017.NCLR b/files/poketool/pokegra/pokegra/narc_0017.NCLR
deleted file mode 100644
index e27047dd..00000000
--- a/files/poketool/pokegra/pokegra/narc_0017.NCLR
+++ /dev/null
diff --git a/files/poketool/pokegra/pokegra/narc_0017.pal b/files/poketool/pokegra/pokegra/narc_0017.pal
new file mode 100644
index 00000000..c4cfa8d7
--- /dev/null
+++ b/files/poketool/pokegra/pokegra/narc_0017.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+205 205 172
+255 255 255
+255 255 156
+255 213 0
+205 139 16
+205 246 82
+164 213 74
+123 164 49
+57 98 32
+139 222 74
+90 172 32
+49 131 49
+49 90 16
+213 98 57
+139 32 41
+16 16 16
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..cb5ea2a1 100644
--- a/filesystem.mk
+++ b/filesystem.mk
@@ -1697,7 +1697,15 @@ files/itemtool/itemdata/item_icon.narc: \
         files/itemtool/itemdata/item_icon/narc_0136.NCGR \
         files/itemtool/itemdata/item_icon/narc_0136.NCLR \
         files/itemtool/itemdata/item_icon/narc_0138.NCGR \
-        files/itemtool/itemdata/item_icon/narc_0138.NCLR
+        files/itemtool/itemdata/item_icon/narc_0138.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0140.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0140.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0142.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0142.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0144.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0144.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0146.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0146.NCLR
 
 
 files/application/custom_ball/data/cb_data.narc: \
@@ -2260,7 +2268,35 @@ 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
+
+files/poketool/pokegra/pokegra.narc: \
+        files/poketool/pokegra/pokegra/narc_0006.NCGR \
+        files/poketool/pokegra/pokegra/narc_0007.NCGR \
+        files/poketool/pokegra/pokegra/narc_0008.NCGR \
+        files/poketool/pokegra/pokegra/narc_0009.NCGR \
+        files/poketool/pokegra/pokegra/narc_0010.NCLR \
+        files/poketool/pokegra/pokegra/narc_0011.NCLR \
+        files/poketool/pokegra/pokegra/narc_0012.NCGR \
+        files/poketool/pokegra/pokegra/narc_0013.NCGR \
+        files/poketool/pokegra/pokegra/narc_0014.NCGR \
+        files/poketool/pokegra/pokegra/narc_0015.NCGR \
+        files/poketool/pokegra/pokegra/narc_0016.NCLR \
+        files/poketool/pokegra/pokegra/narc_0017.NCLR
 
 .PHONY: filesystem
 
diff --git a/graphics_rules.mk b/graphics_rules.mk
index 95b55503..5e498cfd 100644
--- a/graphics_rules.mk
+++ b/graphics_rules.mk
@@ -63,7 +63,11 @@ CLOBBER_SIZE_VERSION101_NCGR_FILES := files/graphic/bag_gra/narc_0002.NCGR \
                                       files/itemtool/itemdata/item_icon/narc_0133.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/itemtool/itemdata/item_icon/narc_0138.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0140.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0142.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0144.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0146.NCGR
 
 4BPP_NCLR_FILES := files/demo/title/titledemo/narc_0016.NCLR
 
@@ -105,9 +109,36 @@ 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_PNG_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
+8BPP_COMP10_NOPAD_NCLR_PAL_FILES := files/poketool/pokegra/pokegra/narc_0010.NCLR \
+                                    files/poketool/pokegra/pokegra/narc_0011.NCLR \
+                                    files/poketool/pokegra/pokegra/narc_0016.NCLR \
+                                    files/poketool/pokegra/pokegra/narc_0017.NCLR
+
+SCANNED_NCGR_FILES := files/poketool/pokegra/pokegra/narc_0006.NCGR \
+                      files/poketool/pokegra/pokegra/narc_0007.NCGR \
+                      files/poketool/pokegra/pokegra/narc_0008.NCGR \
+                      files/poketool/pokegra/pokegra/narc_0009.NCGR \
+                      files/poketool/pokegra/pokegra/narc_0012.NCGR \
+                      files/poketool/pokegra/pokegra/narc_0013.NCGR \
+                      files/poketool/pokegra/pokegra/narc_0014.NCGR \
+                      files/poketool/pokegra/pokegra/narc_0015.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
 
 NCGR_CLEAN_LIST := files/data/cell0.NCGR \
                    files/demo/title/titledemo/narc_0001.NCGR \
@@ -175,7 +206,26 @@ 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/itemtool/itemdata/item_icon/narc_0140.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0142.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0144.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0146.NCGR \
+                   files/poketool/pokegra/pokegra/narc_0006.NCGR \
+                   files/poketool/pokegra/pokegra/narc_0007.NCGR \
+                   files/poketool/pokegra/pokegra/narc_0008.NCGR \
+                   files/poketool/pokegra/pokegra/narc_0009.NCGR \
+                   files/poketool/pokegra/pokegra/narc_0012.NCGR \
+                   files/poketool/pokegra/pokegra/narc_0013.NCGR \
+                   files/poketool/pokegra/pokegra/narc_0014.NCGR \
+                   files/poketool/pokegra/pokegra/narc_0015.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 +319,19 @@ 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/itemtool/itemdata/item_icon/narc_0140.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0142.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0144.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0146.NCLR \
+                   files/poketool/pokegra/pokegra/narc_0010.NCLR \
+                   files/poketool/pokegra/pokegra/narc_0011.NCLR \
+                   files/poketool/pokegra/pokegra/narc_0016.NCLR \
+                   files/poketool/pokegra/pokegra/narc_0017.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
diff --git a/tools/nitrogfx/gfx.c b/tools/nitrogfx/gfx.c
index c1be2a36..1f414ad7 100644
--- a/tools/nitrogfx/gfx.c
+++ b/tools/nitrogfx/gfx.c
@@ -586,7 +586,7 @@ void ReadGbaPalette(char *path, struct Palette *palette)
 	free(data);
 }
 
-void ReadNtrPalette(char *path, struct Palette *palette, int bitdepth)
+void ReadNtrPalette(char *path, struct Palette *palette, int bitdepth, int palIndex)
 {
     int fileSize;
     unsigned char *data = ReadWholeFile(path, &fileSize);
@@ -613,13 +613,23 @@ void ReadNtrPalette(char *path, struct Palette *palette, int bitdepth)
     palette->numColors = bitdepth == 4 ? 16 : 256; //remove header and divide by 2
 
     unsigned char *paletteData = paletteHeader + 0x18;
+    palIndex = palIndex - 1;
 
-    for (int i = 0; i < palette->numColors; i++)
+    for (int i = 0; i < 256; i++)
     {
-        uint16_t paletteEntry = (paletteData[i * 2 + 1] << 8) | paletteData[i * 2];
-        palette->colors[i].red = UPCONVERT_BIT_DEPTH(GET_GBA_PAL_RED(paletteEntry));
-        palette->colors[i].green = UPCONVERT_BIT_DEPTH(GET_GBA_PAL_GREEN(paletteEntry));
-        palette->colors[i].blue = UPCONVERT_BIT_DEPTH(GET_GBA_PAL_BLUE(paletteEntry));
+		if (i < palette->numColors)
+		{
+			uint16_t paletteEntry = (paletteData[(32 * palIndex) + i * 2 + 1] << 8) | paletteData[(32 * palIndex) + i * 2];
+			palette->colors[i].red = UPCONVERT_BIT_DEPTH(GET_GBA_PAL_RED(paletteEntry));
+			palette->colors[i].green = UPCONVERT_BIT_DEPTH(GET_GBA_PAL_GREEN(paletteEntry));
+			palette->colors[i].blue = UPCONVERT_BIT_DEPTH(GET_GBA_PAL_BLUE(paletteEntry));
+		}
+		else
+		{
+			palette->colors[i].red = 0;
+			palette->colors[i].green = 0;
+			palette->colors[i].blue = 0;
+		}
     }
 
     free(data);
diff --git a/tools/nitrogfx/gfx.h b/tools/nitrogfx/gfx.h
index ef1f493d..e04a781a 100644
--- a/tools/nitrogfx/gfx.h
+++ b/tools/nitrogfx/gfx.h
@@ -34,7 +34,7 @@ void WriteImage(char *path, int numTiles, int bitDepth, int metatileWidth, int m
 void WriteNtrImage(char *path, int numTiles, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors, bool clobberSize, bool byteOrder, bool version101, bool sopc, bool scanned, uint32_t key);
 void FreeImage(struct Image *image);
 void ReadGbaPalette(char *path, struct Palette *palette);
-void ReadNtrPalette(char *path, struct Palette *palette, int bitdepth);
+void ReadNtrPalette(char *path, struct Palette *palette, int bitdepth, int palIndex);
 void WriteGbaPalette(char *path, struct Palette *palette);
 void WriteNtrPalette(char *path, struct Palette *palette, bool ncpr, bool ir, int bitdepth, bool pad, int compNum);
 
diff --git a/tools/nitrogfx/main.c b/tools/nitrogfx/main.c
index 942b0d90..35f59d0b 100644
--- a/tools/nitrogfx/main.c
+++ b/tools/nitrogfx/main.c
@@ -50,7 +50,7 @@ void ConvertNtrToPng(char *inputPath, char *outputPath, struct GbaToPngOptions *
 
     if (options->paletteFilePath != NULL)
     {
-        ReadNtrPalette(options->paletteFilePath, &image.palette, options->bitDepth);
+        ReadNtrPalette(options->paletteFilePath, &image.palette, options->bitDepth, options->palIndex);
         image.hasPalette = true;
     }
     else
@@ -205,6 +205,7 @@ void HandleNtrToPngCommand(char *inputPath, char *outputPath, int argc, char **a
     options.width = 1;
     options.metatileWidth = 1;
     options.metatileHeight = 1;
+    options.palIndex = 1;
 
     for (int i = 3; i < argc; i++)
     {
@@ -223,6 +224,19 @@ void HandleNtrToPngCommand(char *inputPath, char *outputPath, int argc, char **a
         {
             options.hasTransparency = true;
         }
+        else if (strcmp(option, "-palindex") == 0)
+        {
+            if (i + 1 >= argc)
+                FATAL_ERROR("No palette index following \"-palindex\".\n");
+
+            i++;
+
+            if (!ParseNumber(argv[i], NULL, 10, &options.palIndex))
+                FATAL_ERROR("Failed to parse palette index.\n");
+
+            if (options.width < 1)
+                FATAL_ERROR("Palette index must be positive.\n");
+        }
         else if (strcmp(option, "-width") == 0)
         {
             if (i + 1 >= argc)
@@ -539,7 +553,7 @@ void HandleNtrToJascPaletteCommand(char *inputPath, char *outputPath, int argc,
         }
     }
 
-    ReadNtrPalette(inputPath, &palette, bitdepth);
+    ReadNtrPalette(inputPath, &palette, bitdepth, 1);
     WriteJascPalette(outputPath, &palette);
 }
 
diff --git a/tools/nitrogfx/options.h b/tools/nitrogfx/options.h
index b03bd561..8c1e7a0e 100644
--- a/tools/nitrogfx/options.h
+++ b/tools/nitrogfx/options.h
@@ -12,6 +12,7 @@ struct GbaToPngOptions {
     int width;
     int metatileWidth;
     int metatileHeight;
+    int palIndex;
 };
 
 struct PngToGbaOptions {