charmander

22 files changed, 70 insertions, 1 deletions

diff --git a/files/poketool/icongra/poke_icon/.gitignore b/files/poketool/icongra/poke_icon/.gitignore
index c7a44bcb..4fcf6cc6 100644
--- a/files/poketool/icongra/poke_icon/.gitignore
+++ b/files/poketool/icongra/poke_icon/.gitignore
@@ -3,4 +3,5 @@ narc_0007.NCGR
 narc_0008.NCGR
 narc_0009.NCGR
 narc_0010.NCGR
+narc_0011.NCGR
 narc_0402.NCGR
diff --git a/files/poketool/icongra/poke_icon/narc_0011.NCGR b/files/poketool/icongra/poke_icon/narc_0011.NCGR
deleted file mode 100644
index 9af337d7..00000000
--- a/files/poketool/icongra/poke_icon/narc_0011.NCGR
+++ /dev/null
diff --git a/files/poketool/icongra/poke_icon/narc_0011.png b/files/poketool/icongra/poke_icon/narc_0011.png
new file mode 100644
index 00000000..9b13ae77
--- /dev/null
+++ b/files/poketool/icongra/poke_icon/narc_0011.png
diff --git a/files/poketool/pokegra/pokegra/.gitignore b/files/poketool/pokegra/pokegra/.gitignore
index bc3caffd..c4c20b12 100644
--- a/files/poketool/pokegra/pokegra/.gitignore
+++ b/files/poketool/pokegra/pokegra/.gitignore
@@ -16,6 +16,12 @@ narc_0020.NCGR
 narc_0021.NCGR
 narc_0022.NCLR
 narc_0023.NCLR
+narc_0024.NCGR
+narc_0025.NCGR
+narc_0026.NCGR
+narc_0027.NCGR
+narc_0028.NCLR
+narc_0029.NCLR
 narc_2370.NCGR
 narc_2371.NCGR
 narc_2372.NCGR
diff --git a/files/poketool/pokegra/pokegra/narc_0024.NCGR b/files/poketool/pokegra/pokegra/narc_0024.NCGR
deleted file mode 100644
index 9921f000..00000000
--- a/files/poketool/pokegra/pokegra/narc_0024.NCGR
+++ /dev/null
diff --git a/files/poketool/pokegra/pokegra/narc_0024.png b/files/poketool/pokegra/pokegra/narc_0024.png
new file mode 100644
index 00000000..bd471be9
--- /dev/null
+++ b/files/poketool/pokegra/pokegra/narc_0024.png
diff --git a/files/poketool/pokegra/pokegra/narc_0024.png.key b/files/poketool/pokegra/pokegra/narc_0024.png.key
new file mode 100644
index 00000000..bc66c0f7
--- /dev/null
+++ b/files/poketool/pokegra/pokegra/narc_0024.png.key
@@ -0,0 +1 @@
+`ø¶¥
\ No newline at end of file
diff --git a/files/poketool/pokegra/pokegra/narc_0025.NCGR b/files/poketool/pokegra/pokegra/narc_0025.NCGR
deleted file mode 100644
index 9921f000..00000000
--- a/files/poketool/pokegra/pokegra/narc_0025.NCGR
+++ /dev/null
diff --git a/files/poketool/pokegra/pokegra/narc_0025.png b/files/poketool/pokegra/pokegra/narc_0025.png
new file mode 100644
index 00000000..bd471be9
--- /dev/null
+++ b/files/poketool/pokegra/pokegra/narc_0025.png
diff --git a/files/poketool/pokegra/pokegra/narc_0025.png.key b/files/poketool/pokegra/pokegra/narc_0025.png.key
new file mode 100644
index 00000000..bc66c0f7
--- /dev/null
+++ b/files/poketool/pokegra/pokegra/narc_0025.png.key
@@ -0,0 +1 @@
+`ø¶¥
\ No newline at end of file
diff --git a/files/poketool/pokegra/pokegra/narc_0026.NCGR b/files/poketool/pokegra/pokegra/narc_0026.NCGR
deleted file mode 100644
index 61cd83b3..00000000
--- a/files/poketool/pokegra/pokegra/narc_0026.NCGR
+++ /dev/null
diff --git a/files/poketool/pokegra/pokegra/narc_0026.png b/files/poketool/pokegra/pokegra/narc_0026.png
new file mode 100644
index 00000000..8c245633
--- /dev/null
+++ b/files/poketool/pokegra/pokegra/narc_0026.png
diff --git a/files/poketool/pokegra/pokegra/narc_0026.png.key b/files/poketool/pokegra/pokegra/narc_0026.png.key
new file mode 100644
index 00000000..51ac6993
--- /dev/null
+++ b/files/poketool/pokegra/pokegra/narc_0026.png.key
@@ -0,0 +1 @@
+íb
\ No newline at end of file
diff --git a/files/poketool/pokegra/pokegra/narc_0027.NCGR b/files/poketool/pokegra/pokegra/narc_0027.NCGR
deleted file mode 100644
index 61cd83b3..00000000
--- a/files/poketool/pokegra/pokegra/narc_0027.NCGR
+++ /dev/null
diff --git a/files/poketool/pokegra/pokegra/narc_0027.png b/files/poketool/pokegra/pokegra/narc_0027.png
new file mode 100644
index 00000000..8c245633
--- /dev/null
+++ b/files/poketool/pokegra/pokegra/narc_0027.png
diff --git a/files/poketool/pokegra/pokegra/narc_0027.png.key b/files/poketool/pokegra/pokegra/narc_0027.png.key
new file mode 100644
index 00000000..51ac6993
--- /dev/null
+++ b/files/poketool/pokegra/pokegra/narc_0027.png.key
@@ -0,0 +1 @@
+íb
\ No newline at end of file
diff --git a/files/poketool/pokegra/pokegra/narc_0028.NCLR b/files/poketool/pokegra/pokegra/narc_0028.NCLR
deleted file mode 100644
index 2dd02349..00000000
--- a/files/poketool/pokegra/pokegra/narc_0028.NCLR
+++ /dev/null
diff --git a/files/poketool/pokegra/pokegra/narc_0028.pal b/files/poketool/pokegra/pokegra/narc_0028.pal
new file mode 100644
index 00000000..30b88364
--- /dev/null
+++ b/files/poketool/pokegra/pokegra/narc_0028.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 131 189
+16 16 16
+180 180 180
+255 255 255
+255 213 123
+230 172 90
+255 197 98
+255 148 65
+222 82 57
+139 41 0
+148 205 222
+65 164 123
+24 74 49
+255 213 8
+246 164 0
+230 57 0
diff --git a/files/poketool/pokegra/pokegra/narc_0029.NCLR b/files/poketool/pokegra/pokegra/narc_0029.NCLR
deleted file mode 100644
index fe7eb2ad..00000000
--- a/files/poketool/pokegra/pokegra/narc_0029.NCLR
+++ /dev/null
diff --git a/files/poketool/pokegra/pokegra/narc_0029.pal b/files/poketool/pokegra/pokegra/narc_0029.pal
new file mode 100644
index 00000000..4f4dd308
--- /dev/null
+++ b/files/poketool/pokegra/pokegra/narc_0029.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 131 189
+16 16 16
+180 180 180
+255 255 255
+255 246 115
+230 205 82
+255 246 164
+255 222 41
+238 156 0
+148 74 0
+148 197 230
+65 139 148
+24 49 74
+255 222 16
+255 180 16
+255 90 32
diff --git a/filesystem.mk b/filesystem.mk
index 5eeea7f0..ae9cacec 100644
--- a/filesystem.mk
+++ b/filesystem.mk
@@ -2303,6 +2303,12 @@ files/poketool/pokegra/pokegra.narc: \
         files/poketool/pokegra/pokegra/narc_0021.NCGR \
         files/poketool/pokegra/pokegra/narc_0022.NCLR \
         files/poketool/pokegra/pokegra/narc_0023.NCLR \
+        files/poketool/pokegra/pokegra/narc_0024.NCGR \
+        files/poketool/pokegra/pokegra/narc_0025.NCGR \
+        files/poketool/pokegra/pokegra/narc_0026.NCGR \
+        files/poketool/pokegra/pokegra/narc_0027.NCGR \
+        files/poketool/pokegra/pokegra/narc_0028.NCLR \
+        files/poketool/pokegra/pokegra/narc_0029.NCLR \
         files/poketool/pokegra/pokegra/narc_2370.NCGR \
         files/poketool/pokegra/pokegra/narc_2371.NCGR \
         files/poketool/pokegra/pokegra/narc_2372.NCGR \
@@ -2316,6 +2322,7 @@ files/poketool/icongra/poke_icon.narc: \
         files/poketool/icongra/poke_icon/narc_0008.NCGR \
         files/poketool/icongra/poke_icon/narc_0009.NCGR \
         files/poketool/icongra/poke_icon/narc_0010.NCGR \
+        files/poketool/icongra/poke_icon/narc_0011.NCGR \
         files/poketool/icongra/poke_icon/narc_0402.NCGR
 
 files/msgdata/msg.narc: \
diff --git a/graphics_rules.mk b/graphics_rules.mk
index 3b9f454b..1531e26c 100644
--- a/graphics_rules.mk
+++ b/graphics_rules.mk
@@ -1,6 +1,5 @@
 #todo data/dp_areawindow.NCGR (weirdness with size)
 #todo data/graphic/bag_gra/narc_0007.NCGR (SOPC section) (width 32, palette narc_0003.NCLR)
-#todo poketool/trgra/trbgra (unknown compression)
 
 CLOBBER_SIZE_NCGR_FILES := files/data/cell0.NCGR
 
@@ -72,6 +71,7 @@ CLOBBER_SIZE_VERSION101_NCGR_FILES := files/graphic/bag_gra/narc_0002.NCGR \
                                       files/poketool/icongra/poke_icon/narc_0008.NCGR \
                                       files/poketool/icongra/poke_icon/narc_0009.NCGR \
                                       files/poketool/icongra/poke_icon/narc_0010.NCGR \
+                                      files/poketool/icongra/poke_icon/narc_0011.NCGR \
                                       files/poketool/icongra/poke_icon/narc_0402.NCGR
 
 4BPP_NCLR_FILES := files/demo/title/titledemo/narc_0016.NCLR \
@@ -130,6 +130,8 @@ VERSION101_SOPC_NCGR_FILES := files/demo/title/titledemo/narc_0007.NCGR \
                                     files/poketool/pokegra/pokegra/narc_0017.NCLR \
                                     files/poketool/pokegra/pokegra/narc_0022.NCLR \
                                     files/poketool/pokegra/pokegra/narc_0023.NCLR \
+                                    files/poketool/pokegra/pokegra/narc_0028.NCLR \
+                                    files/poketool/pokegra/pokegra/narc_0029.NCLR \
                                     files/poketool/pokegra/pokegra/narc_2374.NCLR \
                                     files/poketool/pokegra/pokegra/narc_2375.NCLR
 
@@ -145,6 +147,10 @@ SCANNED_NCGR_FILES := files/poketool/pokegra/pokegra/narc_0006.NCGR \
                       files/poketool/pokegra/pokegra/narc_0019.NCGR \
                       files/poketool/pokegra/pokegra/narc_0020.NCGR \
                       files/poketool/pokegra/pokegra/narc_0021.NCGR \
+                      files/poketool/pokegra/pokegra/narc_0024.NCGR \
+                      files/poketool/pokegra/pokegra/narc_0025.NCGR \
+                      files/poketool/pokegra/pokegra/narc_0026.NCGR \
+                      files/poketool/pokegra/pokegra/narc_0027.NCGR \
                       files/poketool/pokegra/pokegra/narc_2370.NCGR \
                       files/poketool/pokegra/pokegra/narc_2371.NCGR \
                       files/poketool/pokegra/pokegra/narc_2372.NCGR \
@@ -232,6 +238,7 @@ NCGR_CLEAN_LIST := files/data/cell0.NCGR \
                    files/poketool/icongra/poke_icon/narc_0008.NCGR \
                    files/poketool/icongra/poke_icon/narc_0009.NCGR \
                    files/poketool/icongra/poke_icon/narc_0010.NCGR \
+                   files/poketool/icongra/poke_icon/narc_0011.NCGR \
                    files/poketool/icongra/poke_icon/narc_0402.NCGR \
                    files/poketool/pokegra/pokegra/narc_0006.NCGR \
                    files/poketool/pokegra/pokegra/narc_0007.NCGR \
@@ -245,6 +252,10 @@ NCGR_CLEAN_LIST := files/data/cell0.NCGR \
                    files/poketool/pokegra/pokegra/narc_0019.NCGR \
                    files/poketool/pokegra/pokegra/narc_0020.NCGR \
                    files/poketool/pokegra/pokegra/narc_0021.NCGR \
+                   files/poketool/pokegra/pokegra/narc_0024.NCGR \
+                   files/poketool/pokegra/pokegra/narc_0025.NCGR \
+                   files/poketool/pokegra/pokegra/narc_0026.NCGR \
+                   files/poketool/pokegra/pokegra/narc_0027.NCGR \
                    files/poketool/pokegra/pokegra/narc_2370.NCGR \
                    files/poketool/pokegra/pokegra/narc_2371.NCGR \
                    files/poketool/pokegra/pokegra/narc_2372.NCGR \
@@ -361,6 +372,8 @@ NCLR_CLEAN_LIST := files/data/cell0.NCLR \
                    files/poketool/pokegra/pokegra/narc_0017.NCLR \
                    files/poketool/pokegra/pokegra/narc_0022.NCLR \
                    files/poketool/pokegra/pokegra/narc_0023.NCLR \
+                   files/poketool/pokegra/pokegra/narc_0028.NCLR \
+                   files/poketool/pokegra/pokegra/narc_0029.NCLR \
                    files/poketool/pokegra/pokegra/narc_2374.NCLR \
                    files/poketool/pokegra/pokegra/narc_2375.NCLR \
                    files/poketool/trgra/trbgra/narc_0000.NCLR \