ivysaur

19 files changed, 68 insertions, 2 deletions

diff --git a/files/poketool/pokegra/pokegra/.gitignore b/files/poketool/pokegra/pokegra/.gitignore
index 125c2ffb..cdabb31c 100644
--- a/files/poketool/pokegra/pokegra/.gitignore
+++ b/files/poketool/pokegra/pokegra/.gitignore
@@ -4,3 +4,9 @@ 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/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/filesystem.mk b/filesystem.mk
index 0f5b8bcd..cb5ea2a1 100644
--- a/filesystem.mk
+++ b/filesystem.mk
@@ -2290,7 +2290,13 @@ files/poketool/pokegra/pokegra.narc: \
         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_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 a5b3bb70..5e498cfd 100644
--- a/graphics_rules.mk
+++ b/graphics_rules.mk
@@ -119,12 +119,18 @@ VERSION101_SOPC_NCGR_FILES := files/demo/title/titledemo/narc_0007.NCGR \
                                     files/poketool/trgra/trbgra/narc_0014.NCLR
 
 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_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 \
@@ -208,6 +214,10 @@ NCGR_CLEAN_LIST := files/data/cell0.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 \
@@ -315,6 +325,8 @@ NCLR_CLEAN_LIST := files/data/cell0.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 \