diff options
21 files changed, 83 insertions, 10 deletions
@@ -275,7 +275,10 @@ $(IR_NCLR_FILES): %.NCLR: %.pal $(4BPP_NCLR_FILES): %.NCLR: %.pal $(GFX) $< $@ -bitdepth 4 -$(8BPP_COMP10_NOPAD_NCLR_FILES): %.NCLR: %.png +$(8BPP_COMP10_NOPAD_NCLR_PNG_FILES): %.NCLR: %.png + $(GFX) $< $@ -bitdepth 8 -nopad -comp 10 + +$(8BPP_COMP10_NOPAD_NCLR_PAL_FILES): %.NCLR: %.pal $(GFX) $< $@ -bitdepth 8 -nopad -comp 10 %.png: ; diff --git a/files/poketool/pokegra/pokegra/.gitignore b/files/poketool/pokegra/pokegra/.gitignore new file mode 100644 index 00000000..125c2ffb --- /dev/null +++ b/files/poketool/pokegra/pokegra/.gitignore @@ -0,0 +1,6 @@ +narc_0006.NCGR +narc_0007.NCGR +narc_0008.NCGR +narc_0009.NCGR +narc_0010.NCLR +narc_0011.NCLR diff --git a/files/poketool/pokegra/pokegra/.knarcignore b/files/poketool/pokegra/pokegra/.knarcignore index 2856080a..e2f57de1 100644 --- a/files/poketool/pokegra/pokegra/.knarcignore +++ b/files/poketool/pokegra/pokegra/.knarcignore @@ -1,2 +1,3 @@ *.png *.pal +*.key diff --git a/files/poketool/pokegra/pokegra/narc_0006.NCGR b/files/poketool/pokegra/pokegra/narc_0006.NCGR Binary files differdeleted file mode 100644 index 7f45ac31..00000000 --- a/files/poketool/pokegra/pokegra/narc_0006.NCGR +++ /dev/null diff --git a/files/poketool/pokegra/pokegra/narc_0006.png b/files/poketool/pokegra/pokegra/narc_0006.png Binary files differnew file mode 100644 index 00000000..4c8dff0a --- /dev/null +++ b/files/poketool/pokegra/pokegra/narc_0006.png diff --git a/files/poketool/pokegra/pokegra/narc_0006.png.key b/files/poketool/pokegra/pokegra/narc_0006.png.key new file mode 100644 index 00000000..5ba0d100 --- /dev/null +++ b/files/poketool/pokegra/pokegra/narc_0006.png.key @@ -0,0 +1 @@ +íˆó diff --git a/files/poketool/pokegra/pokegra/narc_0007.NCGR b/files/poketool/pokegra/pokegra/narc_0007.NCGR Binary files differdeleted file mode 100644 index 7f45ac31..00000000 --- a/files/poketool/pokegra/pokegra/narc_0007.NCGR +++ /dev/null diff --git a/files/poketool/pokegra/pokegra/narc_0007.png b/files/poketool/pokegra/pokegra/narc_0007.png Binary files differnew file mode 100644 index 00000000..4c8dff0a --- /dev/null +++ b/files/poketool/pokegra/pokegra/narc_0007.png diff --git a/files/poketool/pokegra/pokegra/narc_0007.png.key b/files/poketool/pokegra/pokegra/narc_0007.png.key new file mode 100644 index 00000000..5ba0d100 --- /dev/null +++ b/files/poketool/pokegra/pokegra/narc_0007.png.key @@ -0,0 +1 @@ +íˆó diff --git a/files/poketool/pokegra/pokegra/narc_0008.NCGR b/files/poketool/pokegra/pokegra/narc_0008.NCGR Binary files differdeleted file mode 100644 index 75a92927..00000000 --- a/files/poketool/pokegra/pokegra/narc_0008.NCGR +++ /dev/null diff --git a/files/poketool/pokegra/pokegra/narc_0008.png b/files/poketool/pokegra/pokegra/narc_0008.png Binary files differnew file mode 100644 index 00000000..05866d74 --- /dev/null +++ b/files/poketool/pokegra/pokegra/narc_0008.png diff --git a/files/poketool/pokegra/pokegra/narc_0008.png.key b/files/poketool/pokegra/pokegra/narc_0008.png.key new file mode 100644 index 00000000..9738ac81 --- /dev/null +++ b/files/poketool/pokegra/pokegra/narc_0008.png.key @@ -0,0 +1 @@ +†þ½
\ No newline at end of file diff --git a/files/poketool/pokegra/pokegra/narc_0009.NCGR b/files/poketool/pokegra/pokegra/narc_0009.NCGR Binary files differdeleted file mode 100644 index 75a92927..00000000 --- a/files/poketool/pokegra/pokegra/narc_0009.NCGR +++ /dev/null diff --git a/files/poketool/pokegra/pokegra/narc_0009.png b/files/poketool/pokegra/pokegra/narc_0009.png Binary files differnew file mode 100644 index 00000000..05866d74 --- /dev/null +++ b/files/poketool/pokegra/pokegra/narc_0009.png diff --git a/files/poketool/pokegra/pokegra/narc_0009.png.key b/files/poketool/pokegra/pokegra/narc_0009.png.key new file mode 100644 index 00000000..9738ac81 --- /dev/null +++ b/files/poketool/pokegra/pokegra/narc_0009.png.key @@ -0,0 +1 @@ +†þ½
\ No newline at end of file diff --git a/files/poketool/pokegra/pokegra/narc_0010.NCLR b/files/poketool/pokegra/pokegra/narc_0010.NCLR Binary files differdeleted file mode 100644 index 9148703e..00000000 --- a/files/poketool/pokegra/pokegra/narc_0010.NCLR +++ /dev/null diff --git a/files/poketool/pokegra/pokegra/narc_0010.pal b/files/poketool/pokegra/pokegra/narc_0010.pal new file mode 100644 index 00000000..68bc65c7 --- /dev/null +++ b/files/poketool/pokegra/pokegra/narc_0010.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 213 180 +255 255 255 +131 238 197 +98 213 180 +57 148 148 +24 74 74 +255 106 98 +222 74 65 +189 41 32 +205 205 205 +16 16 16 +189 255 115 +164 213 65 +115 172 49 +82 98 41 +255 0 255 diff --git a/files/poketool/pokegra/pokegra/narc_0011.NCLR b/files/poketool/pokegra/pokegra/narc_0011.NCLR Binary files differdeleted file mode 100644 index ae1a8672..00000000 --- a/files/poketool/pokegra/pokegra/narc_0011.NCLR +++ /dev/null diff --git a/files/poketool/pokegra/pokegra/narc_0011.pal b/files/poketool/pokegra/pokegra/narc_0011.pal new file mode 100644 index 00000000..fc5cd190 --- /dev/null +++ b/files/poketool/pokegra/pokegra/narc_0011.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 213 180 +255 255 255 +197 246 82 +156 213 74 +115 164 49 +49 98 32 +255 106 98 +222 74 65 +189 41 32 +205 205 205 +16 16 16 +98 222 57 +41 172 16 +0 131 32 +0 90 0 +255 0 255 diff --git a/filesystem.mk b/filesystem.mk index 2fb01e81..0f5b8bcd 100644 --- a/filesystem.mk +++ b/filesystem.mk @@ -2284,6 +2284,14 @@ files/poketool/trgra/trbgra.narc: \ files/poketool/trgra/trbgra/narc_0014.NCGR \ files/poketool/trgra/trbgra/narc_0014.NCLR +files/poketool/pokegra/pokegra.narc: \ + 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_0010.NCLR \ + files/poketool/pokegra/pokegra/narc_0011.NCLR + .PHONY: filesystem filesystem: $(HOSTFS_FILES) diff --git a/graphics_rules.mk b/graphics_rules.mk index 993f9e4b..a5b3bb70 100644 --- a/graphics_rules.mk +++ b/graphics_rules.mk @@ -109,16 +109,23 @@ VERSION101_SOPC_NCGR_FILES := files/demo/title/titledemo/narc_0007.NCGR \ files/demo/title/titledemo/narc_0011.NCGR \ files/demo/title/titledemo/narc_0015.NCGR -8BPP_COMP10_NOPAD_NCLR_FILES := files/poketool/trgra/trbgra/narc_0000.NCLR \ - files/poketool/trgra/trbgra/narc_0002.NCLR \ - files/poketool/trgra/trbgra/narc_0004.NCLR \ - files/poketool/trgra/trbgra/narc_0006.NCLR \ - files/poketool/trgra/trbgra/narc_0008.NCLR \ - files/poketool/trgra/trbgra/narc_0010.NCLR \ - files/poketool/trgra/trbgra/narc_0012.NCLR \ - files/poketool/trgra/trbgra/narc_0014.NCLR +8BPP_COMP10_NOPAD_NCLR_PNG_FILES := files/poketool/trgra/trbgra/narc_0000.NCLR \ + files/poketool/trgra/trbgra/narc_0002.NCLR \ + files/poketool/trgra/trbgra/narc_0004.NCLR \ + files/poketool/trgra/trbgra/narc_0006.NCLR \ + files/poketool/trgra/trbgra/narc_0008.NCLR \ + files/poketool/trgra/trbgra/narc_0010.NCLR \ + files/poketool/trgra/trbgra/narc_0012.NCLR \ + files/poketool/trgra/trbgra/narc_0014.NCLR -SCANNED_NCGR_FILES := files/poketool/trgra/trbgra/narc_0000.NCGR \ +8BPP_COMP10_NOPAD_NCLR_PAL_FILES := files/poketool/pokegra/pokegra/narc_0010.NCLR \ + files/poketool/pokegra/pokegra/narc_0011.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/trgra/trbgra/narc_0000.NCGR \ files/poketool/trgra/trbgra/narc_0002.NCGR \ files/poketool/trgra/trbgra/narc_0004.NCGR \ files/poketool/trgra/trbgra/narc_0006.NCGR \ @@ -197,6 +204,10 @@ NCGR_CLEAN_LIST := files/data/cell0.NCGR \ files/itemtool/itemdata/item_icon/narc_0142.NCGR \ files/itemtool/itemdata/item_icon/narc_0144.NCGR \ files/itemtool/itemdata/item_icon/narc_0146.NCGR \ + 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/trgra/trbgra/narc_0000.NCGR \ files/poketool/trgra/trbgra/narc_0002.NCGR \ files/poketool/trgra/trbgra/narc_0004.NCGR \ @@ -302,6 +313,8 @@ NCLR_CLEAN_LIST := files/data/cell0.NCLR \ files/itemtool/itemdata/item_icon/narc_0142.NCLR \ files/itemtool/itemdata/item_icon/narc_0144.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/trgra/trbgra/narc_0000.NCLR \ files/poketool/trgra/trbgra/narc_0002.NCLR \ files/poketool/trgra/trbgra/narc_0004.NCLR \ |
