From 67ca148d44f5b627b5878bb7931caddd989dc1ba Mon Sep 17 00:00:00 2001 From: red031000 Date: Mon, 3 Aug 2020 17:33:07 +0100 Subject: charmeleon --- files/poketool/icongra/poke_icon/.gitignore | 1 + files/poketool/icongra/poke_icon/narc_0012.NCGR | Bin 1072 -> 0 bytes files/poketool/icongra/poke_icon/narc_0012.png | Bin 0 -> 412 bytes files/poketool/pokegra/pokegra/.gitignore | 6 ++++++ files/poketool/pokegra/pokegra/narc_0030.NCGR | Bin 6448 -> 0 bytes files/poketool/pokegra/pokegra/narc_0030.png | Bin 0 -> 809 bytes files/poketool/pokegra/pokegra/narc_0030.png.key | 1 + files/poketool/pokegra/pokegra/narc_0031.NCGR | Bin 6448 -> 0 bytes files/poketool/pokegra/pokegra/narc_0031.png | Bin 0 -> 809 bytes files/poketool/pokegra/pokegra/narc_0031.png.key | 1 + files/poketool/pokegra/pokegra/narc_0032.NCGR | Bin 6448 -> 0 bytes files/poketool/pokegra/pokegra/narc_0032.png | Bin 0 -> 1410 bytes files/poketool/pokegra/pokegra/narc_0032.png.key | 1 + files/poketool/pokegra/pokegra/narc_0033.NCGR | Bin 6448 -> 0 bytes files/poketool/pokegra/pokegra/narc_0033.png | Bin 0 -> 1410 bytes files/poketool/pokegra/pokegra/narc_0033.png.key | 1 + files/poketool/pokegra/pokegra/narc_0034.NCLR | Bin 72 -> 0 bytes files/poketool/pokegra/pokegra/narc_0034.pal | 19 +++++++++++++++++++ files/poketool/pokegra/pokegra/narc_0035.NCLR | Bin 72 -> 0 bytes files/poketool/pokegra/pokegra/narc_0035.pal | 19 +++++++++++++++++++ filesystem.mk | 7 +++++++ graphics_rules.mk | 14 ++++++++++++++ 22 files changed, 70 insertions(+) delete mode 100644 files/poketool/icongra/poke_icon/narc_0012.NCGR create mode 100644 files/poketool/icongra/poke_icon/narc_0012.png delete mode 100644 files/poketool/pokegra/pokegra/narc_0030.NCGR create mode 100644 files/poketool/pokegra/pokegra/narc_0030.png create mode 100644 files/poketool/pokegra/pokegra/narc_0030.png.key delete mode 100644 files/poketool/pokegra/pokegra/narc_0031.NCGR create mode 100644 files/poketool/pokegra/pokegra/narc_0031.png create mode 100644 files/poketool/pokegra/pokegra/narc_0031.png.key delete mode 100644 files/poketool/pokegra/pokegra/narc_0032.NCGR create mode 100644 files/poketool/pokegra/pokegra/narc_0032.png create mode 100644 files/poketool/pokegra/pokegra/narc_0032.png.key delete mode 100644 files/poketool/pokegra/pokegra/narc_0033.NCGR create mode 100644 files/poketool/pokegra/pokegra/narc_0033.png create mode 100644 files/poketool/pokegra/pokegra/narc_0033.png.key delete mode 100644 files/poketool/pokegra/pokegra/narc_0034.NCLR create mode 100644 files/poketool/pokegra/pokegra/narc_0034.pal delete mode 100644 files/poketool/pokegra/pokegra/narc_0035.NCLR create mode 100644 files/poketool/pokegra/pokegra/narc_0035.pal diff --git a/files/poketool/icongra/poke_icon/.gitignore b/files/poketool/icongra/poke_icon/.gitignore index 4fcf6cc6..c51d6333 100644 --- a/files/poketool/icongra/poke_icon/.gitignore +++ b/files/poketool/icongra/poke_icon/.gitignore @@ -4,4 +4,5 @@ narc_0008.NCGR narc_0009.NCGR narc_0010.NCGR narc_0011.NCGR +narc_0012.NCGR narc_0402.NCGR diff --git a/files/poketool/icongra/poke_icon/narc_0012.NCGR b/files/poketool/icongra/poke_icon/narc_0012.NCGR deleted file mode 100644 index 37a7fe93..00000000 Binary files a/files/poketool/icongra/poke_icon/narc_0012.NCGR and /dev/null differ diff --git a/files/poketool/icongra/poke_icon/narc_0012.png b/files/poketool/icongra/poke_icon/narc_0012.png new file mode 100644 index 00000000..a2fb8440 Binary files /dev/null and b/files/poketool/icongra/poke_icon/narc_0012.png differ diff --git a/files/poketool/pokegra/pokegra/.gitignore b/files/poketool/pokegra/pokegra/.gitignore index c4c20b12..0d0e68a8 100644 --- a/files/poketool/pokegra/pokegra/.gitignore +++ b/files/poketool/pokegra/pokegra/.gitignore @@ -22,6 +22,12 @@ narc_0026.NCGR narc_0027.NCGR narc_0028.NCLR narc_0029.NCLR +narc_0030.NCGR +narc_0031.NCGR +narc_0032.NCGR +narc_0033.NCGR +narc_0034.NCLR +narc_0035.NCLR narc_2370.NCGR narc_2371.NCGR narc_2372.NCGR diff --git a/files/poketool/pokegra/pokegra/narc_0030.NCGR b/files/poketool/pokegra/pokegra/narc_0030.NCGR deleted file mode 100644 index bb06d3e8..00000000 Binary files a/files/poketool/pokegra/pokegra/narc_0030.NCGR and /dev/null differ diff --git a/files/poketool/pokegra/pokegra/narc_0030.png b/files/poketool/pokegra/pokegra/narc_0030.png new file mode 100644 index 00000000..b10f8304 Binary files /dev/null and b/files/poketool/pokegra/pokegra/narc_0030.png differ diff --git a/files/poketool/pokegra/pokegra/narc_0030.png.key b/files/poketool/pokegra/pokegra/narc_0030.png.key new file mode 100644 index 00000000..d77afa27 --- /dev/null +++ b/files/poketool/pokegra/pokegra/narc_0030.png.key @@ -0,0 +1 @@ +;jZ \ No newline at end of file diff --git a/files/poketool/pokegra/pokegra/narc_0031.NCGR b/files/poketool/pokegra/pokegra/narc_0031.NCGR deleted file mode 100644 index bb06d3e8..00000000 Binary files a/files/poketool/pokegra/pokegra/narc_0031.NCGR and /dev/null differ diff --git a/files/poketool/pokegra/pokegra/narc_0031.png b/files/poketool/pokegra/pokegra/narc_0031.png new file mode 100644 index 00000000..b10f8304 Binary files /dev/null and b/files/poketool/pokegra/pokegra/narc_0031.png differ diff --git a/files/poketool/pokegra/pokegra/narc_0031.png.key b/files/poketool/pokegra/pokegra/narc_0031.png.key new file mode 100644 index 00000000..d77afa27 --- /dev/null +++ b/files/poketool/pokegra/pokegra/narc_0031.png.key @@ -0,0 +1 @@ +;jZ \ No newline at end of file diff --git a/files/poketool/pokegra/pokegra/narc_0032.NCGR b/files/poketool/pokegra/pokegra/narc_0032.NCGR deleted file mode 100644 index 39acb8a9..00000000 Binary files a/files/poketool/pokegra/pokegra/narc_0032.NCGR and /dev/null differ diff --git a/files/poketool/pokegra/pokegra/narc_0032.png b/files/poketool/pokegra/pokegra/narc_0032.png new file mode 100644 index 00000000..f8110f99 Binary files /dev/null and b/files/poketool/pokegra/pokegra/narc_0032.png differ diff --git a/files/poketool/pokegra/pokegra/narc_0032.png.key b/files/poketool/pokegra/pokegra/narc_0032.png.key new file mode 100644 index 00000000..8b7cd2cd --- /dev/null +++ b/files/poketool/pokegra/pokegra/narc_0032.png.key @@ -0,0 +1 @@ +s \ No newline at end of file diff --git a/files/poketool/pokegra/pokegra/narc_0033.NCGR b/files/poketool/pokegra/pokegra/narc_0033.NCGR deleted file mode 100644 index 39acb8a9..00000000 Binary files a/files/poketool/pokegra/pokegra/narc_0033.NCGR and /dev/null differ diff --git a/files/poketool/pokegra/pokegra/narc_0033.png b/files/poketool/pokegra/pokegra/narc_0033.png new file mode 100644 index 00000000..f8110f99 Binary files /dev/null and b/files/poketool/pokegra/pokegra/narc_0033.png differ diff --git a/files/poketool/pokegra/pokegra/narc_0033.png.key b/files/poketool/pokegra/pokegra/narc_0033.png.key new file mode 100644 index 00000000..8b7cd2cd --- /dev/null +++ b/files/poketool/pokegra/pokegra/narc_0033.png.key @@ -0,0 +1 @@ +s \ No newline at end of file diff --git a/files/poketool/pokegra/pokegra/narc_0034.NCLR b/files/poketool/pokegra/pokegra/narc_0034.NCLR deleted file mode 100644 index 9d161f5b..00000000 Binary files a/files/poketool/pokegra/pokegra/narc_0034.NCLR and /dev/null differ diff --git a/files/poketool/pokegra/pokegra/narc_0034.pal b/files/poketool/pokegra/pokegra/narc_0034.pal new file mode 100644 index 00000000..e02227e0 --- /dev/null +++ b/files/poketool/pokegra/pokegra/narc_0034.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 123 222 +255 255 255 +180 180 180 +106 106 106 +255 148 123 +255 82 74 +213 41 82 +148 32 16 +255 213 106 +230 172 90 +16 16 16 +0 255 0 +0 255 0 +255 222 41 +255 164 0 +255 65 0 diff --git a/files/poketool/pokegra/pokegra/narc_0035.NCLR b/files/poketool/pokegra/pokegra/narc_0035.NCLR deleted file mode 100644 index baf92136..00000000 Binary files a/files/poketool/pokegra/pokegra/narc_0035.NCLR and /dev/null differ diff --git a/files/poketool/pokegra/pokegra/narc_0035.pal b/files/poketool/pokegra/pokegra/narc_0035.pal new file mode 100644 index 00000000..4e9bec37 --- /dev/null +++ b/files/poketool/pokegra/pokegra/narc_0035.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 123 222 +255 255 255 +180 180 180 +106 106 106 +255 238 139 +255 230 0 +222 164 41 +148 82 0 +255 246 172 +238 222 90 +16 16 16 +0 255 0 +0 255 0 +255 230 49 +255 180 16 +255 98 32 diff --git a/filesystem.mk b/filesystem.mk index ae9cacec..1ee8dde7 100644 --- a/filesystem.mk +++ b/filesystem.mk @@ -2309,6 +2309,12 @@ files/poketool/pokegra/pokegra.narc: \ 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_0030.NCGR \ + files/poketool/pokegra/pokegra/narc_0031.NCGR \ + files/poketool/pokegra/pokegra/narc_0032.NCGR \ + files/poketool/pokegra/pokegra/narc_0033.NCGR \ + files/poketool/pokegra/pokegra/narc_0034.NCLR \ + files/poketool/pokegra/pokegra/narc_0035.NCLR \ files/poketool/pokegra/pokegra/narc_2370.NCGR \ files/poketool/pokegra/pokegra/narc_2371.NCGR \ files/poketool/pokegra/pokegra/narc_2372.NCGR \ @@ -2323,6 +2329,7 @@ files/poketool/icongra/poke_icon.narc: \ 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_0012.NCGR \ files/poketool/icongra/poke_icon/narc_0402.NCGR files/msgdata/msg.narc: \ diff --git a/graphics_rules.mk b/graphics_rules.mk index 1531e26c..3dfef9b1 100644 --- a/graphics_rules.mk +++ b/graphics_rules.mk @@ -72,6 +72,7 @@ CLOBBER_SIZE_VERSION101_NCGR_FILES := files/graphic/bag_gra/narc_0002.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_0012.NCGR \ files/poketool/icongra/poke_icon/narc_0402.NCGR 4BPP_NCLR_FILES := files/demo/title/titledemo/narc_0016.NCLR \ @@ -132,6 +133,8 @@ VERSION101_SOPC_NCGR_FILES := files/demo/title/titledemo/narc_0007.NCGR \ 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_0034.NCLR \ + files/poketool/pokegra/pokegra/narc_0035.NCLR \ files/poketool/pokegra/pokegra/narc_2374.NCLR \ files/poketool/pokegra/pokegra/narc_2375.NCLR @@ -151,6 +154,10 @@ SCANNED_NCGR_FILES := files/poketool/pokegra/pokegra/narc_0006.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_0030.NCGR \ + files/poketool/pokegra/pokegra/narc_0031.NCGR \ + files/poketool/pokegra/pokegra/narc_0032.NCGR \ + files/poketool/pokegra/pokegra/narc_0033.NCGR \ files/poketool/pokegra/pokegra/narc_2370.NCGR \ files/poketool/pokegra/pokegra/narc_2371.NCGR \ files/poketool/pokegra/pokegra/narc_2372.NCGR \ @@ -239,6 +246,7 @@ NCGR_CLEAN_LIST := files/data/cell0.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_0012.NCGR \ files/poketool/icongra/poke_icon/narc_0402.NCGR \ files/poketool/pokegra/pokegra/narc_0006.NCGR \ files/poketool/pokegra/pokegra/narc_0007.NCGR \ @@ -256,6 +264,10 @@ NCGR_CLEAN_LIST := files/data/cell0.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_0030.NCGR \ + files/poketool/pokegra/pokegra/narc_0031.NCGR \ + files/poketool/pokegra/pokegra/narc_0032.NCGR \ + files/poketool/pokegra/pokegra/narc_0033.NCGR \ files/poketool/pokegra/pokegra/narc_2370.NCGR \ files/poketool/pokegra/pokegra/narc_2371.NCGR \ files/poketool/pokegra/pokegra/narc_2372.NCGR \ @@ -374,6 +386,8 @@ NCLR_CLEAN_LIST := files/data/cell0.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_0034.NCLR \ + files/poketool/pokegra/pokegra/narc_0035.NCLR \ files/poketool/pokegra/pokegra/narc_2374.NCLR \ files/poketool/pokegra/pokegra/narc_2375.NCLR \ files/poketool/trgra/trbgra/narc_0000.NCLR \ -- cgit v1.2.3