From 757e10e5087a3552719021058d0bd2428c441e8a Mon Sep 17 00:00:00 2001 From: red031000 Date: Sat, 18 Jul 2020 18:57:14 +0100 Subject: some more items --- files/itemtool/itemdata/item_icon/.gitignore | 14 ++++++++++++++ files/itemtool/itemdata/item_icon/narc_0119.NCGR | Bin 560 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0119.png | Bin 0 -> 332 bytes files/itemtool/itemdata/item_icon/narc_0120.NCLR | Bin 552 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0121.NCGR | Bin 560 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0121.png | Bin 0 -> 309 bytes files/itemtool/itemdata/item_icon/narc_0122.NCLR | Bin 552 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0123.NCGR | Bin 560 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0123.png | Bin 0 -> 309 bytes files/itemtool/itemdata/item_icon/narc_0124.NCLR | Bin 552 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0125.NCGR | Bin 560 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0125.png | Bin 0 -> 329 bytes files/itemtool/itemdata/item_icon/narc_0126.NCLR | Bin 552 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0127.NCGR | Bin 560 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0127.png | Bin 0 -> 227 bytes files/itemtool/itemdata/item_icon/narc_0128.NCGR | Bin 560 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0128.png | Bin 0 -> 270 bytes files/itemtool/itemdata/item_icon/narc_0129.NCLR | Bin 552 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0129.pal | 19 +++++++++++++++++++ files/itemtool/itemdata/item_icon/narc_0130.NCGR | Bin 560 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0130.png | Bin 0 -> 225 bytes files/itemtool/itemdata/item_icon/narc_0131.NCLR | Bin 552 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0131.pal | 19 +++++++++++++++++++ files/itemtool/itemdata/item_icon/narc_0132.NCGR | Bin 560 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0132.png | Bin 0 -> 272 bytes 25 files changed, 52 insertions(+) delete mode 100644 files/itemtool/itemdata/item_icon/narc_0119.NCGR create mode 100644 files/itemtool/itemdata/item_icon/narc_0119.png delete mode 100644 files/itemtool/itemdata/item_icon/narc_0120.NCLR delete mode 100644 files/itemtool/itemdata/item_icon/narc_0121.NCGR create mode 100644 files/itemtool/itemdata/item_icon/narc_0121.png delete mode 100644 files/itemtool/itemdata/item_icon/narc_0122.NCLR delete mode 100644 files/itemtool/itemdata/item_icon/narc_0123.NCGR create mode 100644 files/itemtool/itemdata/item_icon/narc_0123.png delete mode 100644 files/itemtool/itemdata/item_icon/narc_0124.NCLR delete mode 100644 files/itemtool/itemdata/item_icon/narc_0125.NCGR create mode 100644 files/itemtool/itemdata/item_icon/narc_0125.png delete mode 100644 files/itemtool/itemdata/item_icon/narc_0126.NCLR delete mode 100644 files/itemtool/itemdata/item_icon/narc_0127.NCGR create mode 100644 files/itemtool/itemdata/item_icon/narc_0127.png delete mode 100644 files/itemtool/itemdata/item_icon/narc_0128.NCGR create mode 100644 files/itemtool/itemdata/item_icon/narc_0128.png delete mode 100644 files/itemtool/itemdata/item_icon/narc_0129.NCLR create mode 100644 files/itemtool/itemdata/item_icon/narc_0129.pal delete mode 100644 files/itemtool/itemdata/item_icon/narc_0130.NCGR create mode 100644 files/itemtool/itemdata/item_icon/narc_0130.png delete mode 100644 files/itemtool/itemdata/item_icon/narc_0131.NCLR create mode 100644 files/itemtool/itemdata/item_icon/narc_0131.pal delete mode 100644 files/itemtool/itemdata/item_icon/narc_0132.NCGR create mode 100644 files/itemtool/itemdata/item_icon/narc_0132.png (limited to 'files') diff --git a/files/itemtool/itemdata/item_icon/.gitignore b/files/itemtool/itemdata/item_icon/.gitignore index c19031bc..244dbad0 100644 --- a/files/itemtool/itemdata/item_icon/.gitignore +++ b/files/itemtool/itemdata/item_icon/.gitignore @@ -115,3 +115,17 @@ narc_0115.NCGR narc_0115.NCLR narc_0117.NCGR narc_0117.NCLR +narc_0119.NCGR +narc_0119.NCLR +narc_0121.NCGR +narc_0121.NCLR +narc_0123.NCGR +narc_0123.NCLR +narc_0125.NCGR +narc_0125.NCLR +narc_0127.NCGR +narc_0128.NCGR +narc_0129.NCLR +narc_0130.NCGR +narc_0131.NCLR +narc_0132.NCGR diff --git a/files/itemtool/itemdata/item_icon/narc_0119.NCGR b/files/itemtool/itemdata/item_icon/narc_0119.NCGR deleted file mode 100644 index 84467e88..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0119.NCGR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0119.png b/files/itemtool/itemdata/item_icon/narc_0119.png new file mode 100644 index 00000000..be2696b5 Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0119.png differ diff --git a/files/itemtool/itemdata/item_icon/narc_0120.NCLR b/files/itemtool/itemdata/item_icon/narc_0120.NCLR deleted file mode 100644 index 079428a8..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0120.NCLR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0121.NCGR b/files/itemtool/itemdata/item_icon/narc_0121.NCGR deleted file mode 100644 index 24a8c74e..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0121.NCGR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0121.png b/files/itemtool/itemdata/item_icon/narc_0121.png new file mode 100644 index 00000000..72e9de9f Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0121.png differ diff --git a/files/itemtool/itemdata/item_icon/narc_0122.NCLR b/files/itemtool/itemdata/item_icon/narc_0122.NCLR deleted file mode 100644 index adeb4483..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0122.NCLR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0123.NCGR b/files/itemtool/itemdata/item_icon/narc_0123.NCGR deleted file mode 100644 index 46367b2b..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0123.NCGR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0123.png b/files/itemtool/itemdata/item_icon/narc_0123.png new file mode 100644 index 00000000..9e5fc734 Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0123.png differ diff --git a/files/itemtool/itemdata/item_icon/narc_0124.NCLR b/files/itemtool/itemdata/item_icon/narc_0124.NCLR deleted file mode 100644 index d28ea92a..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0124.NCLR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0125.NCGR b/files/itemtool/itemdata/item_icon/narc_0125.NCGR deleted file mode 100644 index 798b594c..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0125.NCGR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0125.png b/files/itemtool/itemdata/item_icon/narc_0125.png new file mode 100644 index 00000000..06c3a482 Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0125.png differ diff --git a/files/itemtool/itemdata/item_icon/narc_0126.NCLR b/files/itemtool/itemdata/item_icon/narc_0126.NCLR deleted file mode 100644 index d343c899..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0126.NCLR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0127.NCGR b/files/itemtool/itemdata/item_icon/narc_0127.NCGR deleted file mode 100644 index e23ed8c8..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0127.NCGR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0127.png b/files/itemtool/itemdata/item_icon/narc_0127.png new file mode 100644 index 00000000..76f70a18 Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0127.png differ diff --git a/files/itemtool/itemdata/item_icon/narc_0128.NCGR b/files/itemtool/itemdata/item_icon/narc_0128.NCGR deleted file mode 100644 index 05f2f725..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0128.NCGR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0128.png b/files/itemtool/itemdata/item_icon/narc_0128.png new file mode 100644 index 00000000..7dcf6528 Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0128.png differ diff --git a/files/itemtool/itemdata/item_icon/narc_0129.NCLR b/files/itemtool/itemdata/item_icon/narc_0129.NCLR deleted file mode 100644 index 6eb6e10a..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0129.NCLR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0129.pal b/files/itemtool/itemdata/item_icon/narc_0129.pal new file mode 100644 index 00000000..25e42a1d --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0129.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +213 57 32 +255 115 90 +255 164 131 +238 213 74 +246 230 98 +238 222 222 +222 205 205 +180 164 164 +139 123 123 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0130.NCGR b/files/itemtool/itemdata/item_icon/narc_0130.NCGR deleted file mode 100644 index 934d57c1..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0130.NCGR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0130.png b/files/itemtool/itemdata/item_icon/narc_0130.png new file mode 100644 index 00000000..64e57f5a Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0130.png differ diff --git a/files/itemtool/itemdata/item_icon/narc_0131.NCLR b/files/itemtool/itemdata/item_icon/narc_0131.NCLR deleted file mode 100644 index 6439f1d3..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0131.NCLR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0131.pal b/files/itemtool/itemdata/item_icon/narc_0131.pal new file mode 100644 index 00000000..2525be88 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0131.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +238 197 197 +180 230 222 +189 189 189 +238 238 189 +255 255 255 +230 230 230 +148 164 164 +74 74 74 +213 172 172 +156 205 197 +164 164 164 +123 139 139 +255 255 205 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0132.NCGR b/files/itemtool/itemdata/item_icon/narc_0132.NCGR deleted file mode 100644 index 1533ac1a..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0132.NCGR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0132.png b/files/itemtool/itemdata/item_icon/narc_0132.png new file mode 100644 index 00000000..d2f704f5 Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0132.png differ -- cgit v1.2.3 From 68ed9752b3c1bd75f7200bb971dfc4c2b268d27a Mon Sep 17 00:00:00 2001 From: red031000 Date: Sat, 18 Jul 2020 19:07:58 +0100 Subject: even more items --- files/itemtool/itemdata/item_icon/.gitignore | 7 +++++++ files/itemtool/itemdata/item_icon/narc_0133.NCGR | Bin 560 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0133.png | Bin 0 -> 288 bytes files/itemtool/itemdata/item_icon/narc_0134.NCLR | Bin 552 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0134.pal | 19 +++++++++++++++++++ files/itemtool/itemdata/item_icon/narc_0135.NCGR | Bin 560 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0135.png | Bin 0 -> 239 bytes files/itemtool/itemdata/item_icon/narc_0136.NCGR | Bin 560 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0136.png | Bin 0 -> 237 bytes files/itemtool/itemdata/item_icon/narc_0137.NCLR | Bin 552 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0138.NCGR | Bin 560 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0138.png | Bin 0 -> 246 bytes files/itemtool/itemdata/item_icon/narc_0139.NCLR | Bin 552 -> 0 bytes 13 files changed, 26 insertions(+) delete mode 100644 files/itemtool/itemdata/item_icon/narc_0133.NCGR create mode 100644 files/itemtool/itemdata/item_icon/narc_0133.png delete mode 100644 files/itemtool/itemdata/item_icon/narc_0134.NCLR create mode 100644 files/itemtool/itemdata/item_icon/narc_0134.pal delete mode 100644 files/itemtool/itemdata/item_icon/narc_0135.NCGR create mode 100644 files/itemtool/itemdata/item_icon/narc_0135.png delete mode 100644 files/itemtool/itemdata/item_icon/narc_0136.NCGR create mode 100644 files/itemtool/itemdata/item_icon/narc_0136.png delete mode 100644 files/itemtool/itemdata/item_icon/narc_0137.NCLR delete mode 100644 files/itemtool/itemdata/item_icon/narc_0138.NCGR create mode 100644 files/itemtool/itemdata/item_icon/narc_0138.png delete mode 100644 files/itemtool/itemdata/item_icon/narc_0139.NCLR (limited to 'files') diff --git a/files/itemtool/itemdata/item_icon/.gitignore b/files/itemtool/itemdata/item_icon/.gitignore index 244dbad0..e1591c96 100644 --- a/files/itemtool/itemdata/item_icon/.gitignore +++ b/files/itemtool/itemdata/item_icon/.gitignore @@ -129,3 +129,10 @@ narc_0129.NCLR narc_0130.NCGR narc_0131.NCLR narc_0132.NCGR +narc_0133.NCGR +narc_0134.NCLR +narc_0135.NCGR +narc_0136.NCGR +narc_0136.NCLR +narc_0138.NCGR +narc_0138.NCLR diff --git a/files/itemtool/itemdata/item_icon/narc_0133.NCGR b/files/itemtool/itemdata/item_icon/narc_0133.NCGR deleted file mode 100644 index 6a5a6952..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0133.NCGR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0133.png b/files/itemtool/itemdata/item_icon/narc_0133.png new file mode 100644 index 00000000..32a2ece6 Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0133.png differ diff --git a/files/itemtool/itemdata/item_icon/narc_0134.NCLR b/files/itemtool/itemdata/item_icon/narc_0134.NCLR deleted file mode 100644 index 9dfb92f0..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0134.NCLR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0134.pal b/files/itemtool/itemdata/item_icon/narc_0134.pal new file mode 100644 index 00000000..d37358e9 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0134.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +98 156 213 +41 98 156 +24 57 115 +123 180 238 +246 164 164 +222 115 115 +255 222 222 +156 74 74 +255 255 255 +131 49 49 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0135.NCGR b/files/itemtool/itemdata/item_icon/narc_0135.NCGR deleted file mode 100644 index 506c03bf..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0135.NCGR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0135.png b/files/itemtool/itemdata/item_icon/narc_0135.png new file mode 100644 index 00000000..6b6ba082 Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0135.png differ diff --git a/files/itemtool/itemdata/item_icon/narc_0136.NCGR b/files/itemtool/itemdata/item_icon/narc_0136.NCGR deleted file mode 100644 index 25f32dc6..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0136.NCGR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0136.png b/files/itemtool/itemdata/item_icon/narc_0136.png new file mode 100644 index 00000000..56feb189 Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0136.png differ diff --git a/files/itemtool/itemdata/item_icon/narc_0137.NCLR b/files/itemtool/itemdata/item_icon/narc_0137.NCLR deleted file mode 100644 index 4684bf7f..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0137.NCLR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0138.NCGR b/files/itemtool/itemdata/item_icon/narc_0138.NCGR deleted file mode 100644 index f98c3043..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0138.NCGR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0138.png b/files/itemtool/itemdata/item_icon/narc_0138.png new file mode 100644 index 00000000..7f810421 Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0138.png differ diff --git a/files/itemtool/itemdata/item_icon/narc_0139.NCLR b/files/itemtool/itemdata/item_icon/narc_0139.NCLR deleted file mode 100644 index 20afc404..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0139.NCLR and /dev/null differ -- cgit v1.2.3 From 8e915f8e654af9d9ea5dc94fde7012c6944ae825 Mon Sep 17 00:00:00 2001 From: red031000 Date: Sat, 18 Jul 2020 19:29:06 +0100 Subject: trainer back sprite proof of concept + fix NCLR from png --- files/poketool/trgra/trbgra/.gitignore | 2 ++ files/poketool/trgra/trbgra/.knarcignore | 1 + files/poketool/trgra/trbgra/narc_0000.NCGR | Bin 6448 -> 0 bytes files/poketool/trgra/trbgra/narc_0000.png | Bin 0 -> 1560 bytes files/poketool/trgra/trbgra/narc_0000.png.key | 1 + files/poketool/trgra/trbgra/narc_0001.NCLR | Bin 72 -> 0 bytes 6 files changed, 4 insertions(+) create mode 100644 files/poketool/trgra/trbgra/.gitignore delete mode 100644 files/poketool/trgra/trbgra/narc_0000.NCGR create mode 100644 files/poketool/trgra/trbgra/narc_0000.png create mode 100644 files/poketool/trgra/trbgra/narc_0000.png.key delete mode 100644 files/poketool/trgra/trbgra/narc_0001.NCLR (limited to 'files') diff --git a/files/poketool/trgra/trbgra/.gitignore b/files/poketool/trgra/trbgra/.gitignore new file mode 100644 index 00000000..849e6ea4 --- /dev/null +++ b/files/poketool/trgra/trbgra/.gitignore @@ -0,0 +1,2 @@ +narc_0000.NCGR +narc_0000.NCLR \ No newline at end of file diff --git a/files/poketool/trgra/trbgra/.knarcignore b/files/poketool/trgra/trbgra/.knarcignore index 2856080a..e2f57de1 100644 --- a/files/poketool/trgra/trbgra/.knarcignore +++ b/files/poketool/trgra/trbgra/.knarcignore @@ -1,2 +1,3 @@ *.png *.pal +*.key diff --git a/files/poketool/trgra/trbgra/narc_0000.NCGR b/files/poketool/trgra/trbgra/narc_0000.NCGR deleted file mode 100644 index 131ae9be..00000000 Binary files a/files/poketool/trgra/trbgra/narc_0000.NCGR and /dev/null differ diff --git a/files/poketool/trgra/trbgra/narc_0000.png b/files/poketool/trgra/trbgra/narc_0000.png new file mode 100644 index 00000000..d7ba9767 Binary files /dev/null and b/files/poketool/trgra/trbgra/narc_0000.png differ diff --git a/files/poketool/trgra/trbgra/narc_0000.png.key b/files/poketool/trgra/trbgra/narc_0000.png.key new file mode 100644 index 00000000..44d8ba26 --- /dev/null +++ b/files/poketool/trgra/trbgra/narc_0000.png.key @@ -0,0 +1 @@ +[ü \ No newline at end of file diff --git a/files/poketool/trgra/trbgra/narc_0001.NCLR b/files/poketool/trgra/trbgra/narc_0001.NCLR deleted file mode 100644 index 39767f84..00000000 Binary files a/files/poketool/trgra/trbgra/narc_0001.NCLR and /dev/null differ -- cgit v1.2.3 From fbd71239b903711e84f325f78f5bab89bc9629db Mon Sep 17 00:00:00 2001 From: red031000 Date: Sat, 18 Jul 2020 19:32:32 +0100 Subject: mark .key as binary --- files/.gitattributes | 1 + 1 file changed, 1 insertion(+) (limited to 'files') diff --git a/files/.gitattributes b/files/.gitattributes index cc0c2f17..747f17c5 100644 --- a/files/.gitattributes +++ b/files/.gitattributes @@ -3,3 +3,4 @@ .knarcignore eol=lf .knarckeep eol=lf *.pal eol=crlf +*.key binary -- cgit v1.2.3