From 0cd5229fae82168f986eff59ad5af1b7a507091e Mon Sep 17 00:00:00 2001 From: red031000 Date: Fri, 10 Jul 2020 20:20:47 +0100 Subject: extract ball item sprites --- files/itemtool/itemdata/item_icon/.gitignore | 22 +++++++++++++ files/itemtool/itemdata/item_icon/narc_0002.NCGR | Bin 560 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0002.png | Bin 0 -> 297 bytes files/itemtool/itemdata/item_icon/narc_0003.NCLR | Bin 552 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0004.NCGR | Bin 560 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0004.png | Bin 0 -> 286 bytes files/itemtool/itemdata/item_icon/narc_0005.NCLR | Bin 552 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0006.NCGR | Bin 560 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0006.png | Bin 0 -> 295 bytes files/itemtool/itemdata/item_icon/narc_0007.NCLR | Bin 552 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0008.NCGR | Bin 560 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0008.png | Bin 0 -> 265 bytes files/itemtool/itemdata/item_icon/narc_0009.NCLR | Bin 552 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0010.NCGR | Bin 560 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0010.png | Bin 0 -> 300 bytes files/itemtool/itemdata/item_icon/narc_0011.NCLR | Bin 552 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0012.NCGR | Bin 560 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0012.png | Bin 0 -> 299 bytes files/itemtool/itemdata/item_icon/narc_0013.NCLR | Bin 552 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0014.NCGR | Bin 560 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0014.png | Bin 0 -> 297 bytes files/itemtool/itemdata/item_icon/narc_0015.NCLR | Bin 552 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0016.NCGR | Bin 560 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0016.png | Bin 0 -> 291 bytes files/itemtool/itemdata/item_icon/narc_0017.NCLR | Bin 552 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0018.NCGR | Bin 560 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0018.png | Bin 0 -> 292 bytes files/itemtool/itemdata/item_icon/narc_0019.NCLR | Bin 552 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0020.NCGR | Bin 560 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0020.png | Bin 0 -> 294 bytes files/itemtool/itemdata/item_icon/narc_0021.NCGR | Bin 560 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0021.png | Bin 0 -> 281 bytes files/itemtool/itemdata/item_icon/narc_0022.NCLR | Bin 552 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0022.pal | 19 +++++++++++ files/itemtool/itemdata/item_icon/narc_0023.NCGR | Bin 560 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0023.png | Bin 0 -> 258 bytes filesystem.mk | 24 ++++++++++++++ graphics_rules.mk | 40 +++++++++++++++++++++-- 38 files changed, 102 insertions(+), 3 deletions(-) create mode 100644 files/itemtool/itemdata/item_icon/.gitignore delete mode 100644 files/itemtool/itemdata/item_icon/narc_0002.NCGR create mode 100644 files/itemtool/itemdata/item_icon/narc_0002.png delete mode 100644 files/itemtool/itemdata/item_icon/narc_0003.NCLR delete mode 100644 files/itemtool/itemdata/item_icon/narc_0004.NCGR create mode 100644 files/itemtool/itemdata/item_icon/narc_0004.png delete mode 100644 files/itemtool/itemdata/item_icon/narc_0005.NCLR delete mode 100644 files/itemtool/itemdata/item_icon/narc_0006.NCGR create mode 100644 files/itemtool/itemdata/item_icon/narc_0006.png delete mode 100644 files/itemtool/itemdata/item_icon/narc_0007.NCLR delete mode 100644 files/itemtool/itemdata/item_icon/narc_0008.NCGR create mode 100644 files/itemtool/itemdata/item_icon/narc_0008.png delete mode 100644 files/itemtool/itemdata/item_icon/narc_0009.NCLR delete mode 100644 files/itemtool/itemdata/item_icon/narc_0010.NCGR create mode 100644 files/itemtool/itemdata/item_icon/narc_0010.png delete mode 100644 files/itemtool/itemdata/item_icon/narc_0011.NCLR delete mode 100644 files/itemtool/itemdata/item_icon/narc_0012.NCGR create mode 100644 files/itemtool/itemdata/item_icon/narc_0012.png delete mode 100644 files/itemtool/itemdata/item_icon/narc_0013.NCLR delete mode 100644 files/itemtool/itemdata/item_icon/narc_0014.NCGR create mode 100644 files/itemtool/itemdata/item_icon/narc_0014.png delete mode 100644 files/itemtool/itemdata/item_icon/narc_0015.NCLR delete mode 100644 files/itemtool/itemdata/item_icon/narc_0016.NCGR create mode 100644 files/itemtool/itemdata/item_icon/narc_0016.png delete mode 100644 files/itemtool/itemdata/item_icon/narc_0017.NCLR delete mode 100644 files/itemtool/itemdata/item_icon/narc_0018.NCGR create mode 100644 files/itemtool/itemdata/item_icon/narc_0018.png delete mode 100644 files/itemtool/itemdata/item_icon/narc_0019.NCLR delete mode 100644 files/itemtool/itemdata/item_icon/narc_0020.NCGR create mode 100644 files/itemtool/itemdata/item_icon/narc_0020.png delete mode 100644 files/itemtool/itemdata/item_icon/narc_0021.NCGR create mode 100644 files/itemtool/itemdata/item_icon/narc_0021.png delete mode 100644 files/itemtool/itemdata/item_icon/narc_0022.NCLR create mode 100644 files/itemtool/itemdata/item_icon/narc_0022.pal delete mode 100644 files/itemtool/itemdata/item_icon/narc_0023.NCGR create mode 100644 files/itemtool/itemdata/item_icon/narc_0023.png diff --git a/files/itemtool/itemdata/item_icon/.gitignore b/files/itemtool/itemdata/item_icon/.gitignore new file mode 100644 index 00000000..2e778c6c --- /dev/null +++ b/files/itemtool/itemdata/item_icon/.gitignore @@ -0,0 +1,22 @@ +narc_0002.NCGR +narc_0002.NCLR +narc_0004.NCGR +narc_0004.NCLR +narc_0006.NCGR +narc_0006.NCLR +narc_0008.NCGR +narc_0008.NCLR +narc_0010.NCGR +narc_0010.NCLR +narc_0012.NCGR +narc_0012.NCLR +narc_0014.NCGR +narc_0014.NCLR +narc_0016.NCGR +narc_0016.NCLR +narc_0018.NCGR +narc_0018.NCLR +narc_0020.NCGR +narc_0021.NCGR +narc_0022.NCLR +narc_0023.NCGR diff --git a/files/itemtool/itemdata/item_icon/narc_0002.NCGR b/files/itemtool/itemdata/item_icon/narc_0002.NCGR deleted file mode 100644 index 045a5e06..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0002.NCGR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0002.png b/files/itemtool/itemdata/item_icon/narc_0002.png new file mode 100644 index 00000000..bc9abe05 Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0002.png differ diff --git a/files/itemtool/itemdata/item_icon/narc_0003.NCLR b/files/itemtool/itemdata/item_icon/narc_0003.NCLR deleted file mode 100644 index 701517a8..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0003.NCLR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0004.NCGR b/files/itemtool/itemdata/item_icon/narc_0004.NCGR deleted file mode 100644 index 19b1164c..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0004.NCGR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0004.png b/files/itemtool/itemdata/item_icon/narc_0004.png new file mode 100644 index 00000000..2bebe147 Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0004.png differ diff --git a/files/itemtool/itemdata/item_icon/narc_0005.NCLR b/files/itemtool/itemdata/item_icon/narc_0005.NCLR deleted file mode 100644 index bca61e37..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0005.NCLR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0006.NCGR b/files/itemtool/itemdata/item_icon/narc_0006.NCGR deleted file mode 100644 index 2e2983c0..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0006.NCGR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0006.png b/files/itemtool/itemdata/item_icon/narc_0006.png new file mode 100644 index 00000000..723b699a Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0006.png differ diff --git a/files/itemtool/itemdata/item_icon/narc_0007.NCLR b/files/itemtool/itemdata/item_icon/narc_0007.NCLR deleted file mode 100644 index 91f0132a..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0007.NCLR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0008.NCGR b/files/itemtool/itemdata/item_icon/narc_0008.NCGR deleted file mode 100644 index 72d857a6..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0008.NCGR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0008.png b/files/itemtool/itemdata/item_icon/narc_0008.png new file mode 100644 index 00000000..fb5e215e Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0008.png differ diff --git a/files/itemtool/itemdata/item_icon/narc_0009.NCLR b/files/itemtool/itemdata/item_icon/narc_0009.NCLR deleted file mode 100644 index f728f1ae..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0009.NCLR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0010.NCGR b/files/itemtool/itemdata/item_icon/narc_0010.NCGR deleted file mode 100644 index 56d27763..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0010.NCGR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0010.png b/files/itemtool/itemdata/item_icon/narc_0010.png new file mode 100644 index 00000000..38784263 Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0010.png differ diff --git a/files/itemtool/itemdata/item_icon/narc_0011.NCLR b/files/itemtool/itemdata/item_icon/narc_0011.NCLR deleted file mode 100644 index 89c4675c..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0011.NCLR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0012.NCGR b/files/itemtool/itemdata/item_icon/narc_0012.NCGR deleted file mode 100644 index 0095fa60..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0012.NCGR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0012.png b/files/itemtool/itemdata/item_icon/narc_0012.png new file mode 100644 index 00000000..da0cf777 Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0012.png differ diff --git a/files/itemtool/itemdata/item_icon/narc_0013.NCLR b/files/itemtool/itemdata/item_icon/narc_0013.NCLR deleted file mode 100644 index 3563296b..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0013.NCLR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0014.NCGR b/files/itemtool/itemdata/item_icon/narc_0014.NCGR deleted file mode 100644 index b31b518f..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0014.NCGR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0014.png b/files/itemtool/itemdata/item_icon/narc_0014.png new file mode 100644 index 00000000..71a630d4 Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0014.png differ diff --git a/files/itemtool/itemdata/item_icon/narc_0015.NCLR b/files/itemtool/itemdata/item_icon/narc_0015.NCLR deleted file mode 100644 index 9ba135dd..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0015.NCLR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0016.NCGR b/files/itemtool/itemdata/item_icon/narc_0016.NCGR deleted file mode 100644 index 5d75c234..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0016.NCGR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0016.png b/files/itemtool/itemdata/item_icon/narc_0016.png new file mode 100644 index 00000000..9f2ccb9d Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0016.png differ diff --git a/files/itemtool/itemdata/item_icon/narc_0017.NCLR b/files/itemtool/itemdata/item_icon/narc_0017.NCLR deleted file mode 100644 index 74070d69..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0017.NCLR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0018.NCGR b/files/itemtool/itemdata/item_icon/narc_0018.NCGR deleted file mode 100644 index d580d3e4..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0018.NCGR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0018.png b/files/itemtool/itemdata/item_icon/narc_0018.png new file mode 100644 index 00000000..17e02bc4 Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0018.png differ diff --git a/files/itemtool/itemdata/item_icon/narc_0019.NCLR b/files/itemtool/itemdata/item_icon/narc_0019.NCLR deleted file mode 100644 index 3cc3439e..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0019.NCLR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0020.NCGR b/files/itemtool/itemdata/item_icon/narc_0020.NCGR deleted file mode 100644 index ddd27891..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0020.NCGR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0020.png b/files/itemtool/itemdata/item_icon/narc_0020.png new file mode 100644 index 00000000..a046a23a Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0020.png differ diff --git a/files/itemtool/itemdata/item_icon/narc_0021.NCGR b/files/itemtool/itemdata/item_icon/narc_0021.NCGR deleted file mode 100644 index 9d93568a..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0021.NCGR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0021.png b/files/itemtool/itemdata/item_icon/narc_0021.png new file mode 100644 index 00000000..ea3fed09 Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0021.png differ diff --git a/files/itemtool/itemdata/item_icon/narc_0022.NCLR b/files/itemtool/itemdata/item_icon/narc_0022.NCLR deleted file mode 100644 index 6af27f80..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0022.NCLR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0022.pal b/files/itemtool/itemdata/item_icon/narc_0022.pal new file mode 100644 index 00000000..696a4b38 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0022.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +74 82 82 +123 123 131 +164 164 197 +222 205 246 +255 255 255 +156 74 57 +180 82 57 +222 90 57 +255 148 57 +255 213 57 +230 180 106 +255 255 148 +213 156 49 +255 238 82 diff --git a/files/itemtool/itemdata/item_icon/narc_0023.NCGR b/files/itemtool/itemdata/item_icon/narc_0023.NCGR deleted file mode 100644 index c63b44d6..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0023.NCGR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0023.png b/files/itemtool/itemdata/item_icon/narc_0023.png new file mode 100644 index 00000000..66913f94 Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0023.png differ diff --git a/filesystem.mk b/filesystem.mk index 013d64a9..73f16cb0 100644 --- a/filesystem.mk +++ b/filesystem.mk @@ -1559,6 +1559,30 @@ files/poketool/pokefoot/pokefoot.narc: \ files/poketool/pokefoot/pokefoot/narc_0371.NCGR.lz \ files/poketool/pokefoot/pokefoot/narc_0359.NCGR.lz +files/itemtool/itemdata/item_icon.narc: \ + files/itemtool/itemdata/item_icon/narc_0002.NCGR \ + files/itemtool/itemdata/item_icon/narc_0002.NCLR \ + files/itemtool/itemdata/item_icon/narc_0004.NCGR \ + files/itemtool/itemdata/item_icon/narc_0004.NCLR \ + files/itemtool/itemdata/item_icon/narc_0006.NCGR \ + files/itemtool/itemdata/item_icon/narc_0006.NCLR \ + files/itemtool/itemdata/item_icon/narc_0008.NCGR \ + files/itemtool/itemdata/item_icon/narc_0008.NCLR \ + files/itemtool/itemdata/item_icon/narc_0010.NCGR \ + files/itemtool/itemdata/item_icon/narc_0010.NCLR \ + files/itemtool/itemdata/item_icon/narc_0012.NCGR \ + files/itemtool/itemdata/item_icon/narc_0012.NCLR \ + files/itemtool/itemdata/item_icon/narc_0014.NCGR \ + files/itemtool/itemdata/item_icon/narc_0014.NCLR \ + files/itemtool/itemdata/item_icon/narc_0016.NCGR \ + files/itemtool/itemdata/item_icon/narc_0016.NCLR \ + files/itemtool/itemdata/item_icon/narc_0018.NCGR \ + files/itemtool/itemdata/item_icon/narc_0018.NCLR \ + files/itemtool/itemdata/item_icon/narc_0020.NCGR \ + files/itemtool/itemdata/item_icon/narc_0021.NCGR \ + files/itemtool/itemdata/item_icon/narc_0022.NCLR \ + files/itemtool/itemdata/item_icon/narc_0023.NCGR + files/application/custom_ball/data/cb_data.narc: \ files/application/custom_ball/data/cb_data/narc_0195.NCGR.lz \ files/application/custom_ball/data/cb_data/narc_0181.NCER.lz \ diff --git a/graphics_rules.mk b/graphics_rules.mk index 0ad43bf2..0005814a 100644 --- a/graphics_rules.mk +++ b/graphics_rules.mk @@ -5,13 +5,47 @@ CLOBBER_SIZE_NCGR_FILES := files/data/cell0.NCGR CLOBBER_SIZE_VERSION101_NCGR_FILES := files/graphic/bag_gra/narc_0002.NCGR \ files/graphic/bag_gra/narc_0006.NCGR \ - files/graphic/bag_gra/narc_0034.NCGR + files/graphic/bag_gra/narc_0034.NCGR \ + files/itemtool/itemdata/item_icon/narc_0002.NCGR \ + files/itemtool/itemdata/item_icon/narc_0004.NCGR \ + files/itemtool/itemdata/item_icon/narc_0006.NCGR \ + files/itemtool/itemdata/item_icon/narc_0008.NCGR \ + files/itemtool/itemdata/item_icon/narc_0010.NCGR \ + files/itemtool/itemdata/item_icon/narc_0012.NCGR \ + files/itemtool/itemdata/item_icon/narc_0014.NCGR \ + files/itemtool/itemdata/item_icon/narc_0016.NCGR \ + files/itemtool/itemdata/item_icon/narc_0018.NCGR \ + files/itemtool/itemdata/item_icon/narc_0020.NCGR \ + files/itemtool/itemdata/item_icon/narc_0021.NCGR \ + files/itemtool/itemdata/item_icon/narc_0023.NCGR NCGR_CLEAN_LIST := files/data/cell0.NCGR \ files/graphic/bag_gra/narc_0002.NCGR \ files/graphic/bag_gra/narc_0006.NCGR \ - files/graphic/bag_gra/narc_0034.NCGR + files/graphic/bag_gra/narc_0034.NCGR \ + files/itemtool/itemdata/item_icon/narc_0002.NCGR \ + files/itemtool/itemdata/item_icon/narc_0004.NCGR \ + files/itemtool/itemdata/item_icon/narc_0006.NCGR \ + files/itemtool/itemdata/item_icon/narc_0008.NCGR \ + files/itemtool/itemdata/item_icon/narc_0010.NCGR \ + files/itemtool/itemdata/item_icon/narc_0012.NCGR \ + files/itemtool/itemdata/item_icon/narc_0014.NCGR \ + files/itemtool/itemdata/item_icon/narc_0016.NCGR \ + files/itemtool/itemdata/item_icon/narc_0018.NCGR \ + files/itemtool/itemdata/item_icon/narc_0020.NCGR \ + files/itemtool/itemdata/item_icon/narc_0021.NCGR \ + files/itemtool/itemdata/item_icon/narc_0023.NCGR NCLR_CLEAN_LIST := files/data/cell0.NCLR \ files/graphic/bag_gra/narc_0003.NCLR \ - files/graphic/bag_gra/narc_0034.NCLR + files/graphic/bag_gra/narc_0034.NCLR \ + files/itemtool/itemdata/item_icon/narc_0002.NCLR \ + files/itemtool/itemdata/item_icon/narc_0004.NCLR \ + files/itemtool/itemdata/item_icon/narc_0006.NCLR \ + files/itemtool/itemdata/item_icon/narc_0008.NCLR \ + files/itemtool/itemdata/item_icon/narc_0010.NCLR \ + files/itemtool/itemdata/item_icon/narc_0012.NCLR \ + files/itemtool/itemdata/item_icon/narc_0014.NCLR \ + files/itemtool/itemdata/item_icon/narc_0016.NCLR \ + files/itemtool/itemdata/item_icon/narc_0018.NCLR \ + files/itemtool/itemdata/item_icon/narc_0022.NCLR -- cgit v1.2.3