diff options
40 files changed, 140 insertions, 1 deletions
diff --git a/files/poketool/icongra/poke_icon/.gitignore b/files/poketool/icongra/poke_icon/.gitignore index c7a44bcb..c51d6333 100644 --- a/files/poketool/icongra/poke_icon/.gitignore +++ b/files/poketool/icongra/poke_icon/.gitignore @@ -3,4 +3,6 @@ narc_0007.NCGR 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_0011.NCGR b/files/poketool/icongra/poke_icon/narc_0011.NCGR Binary files differdeleted 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 Binary files differnew file mode 100644 index 00000000..9b13ae77 --- /dev/null +++ b/files/poketool/icongra/poke_icon/narc_0011.png diff --git a/files/poketool/icongra/poke_icon/narc_0012.NCGR b/files/poketool/icongra/poke_icon/narc_0012.NCGR Binary files differdeleted file mode 100644 index 37a7fe93..00000000 --- a/files/poketool/icongra/poke_icon/narc_0012.NCGR +++ /dev/null diff --git a/files/poketool/icongra/poke_icon/narc_0012.png b/files/poketool/icongra/poke_icon/narc_0012.png Binary files differnew file mode 100644 index 00000000..a2fb8440 --- /dev/null +++ b/files/poketool/icongra/poke_icon/narc_0012.png diff --git a/files/poketool/pokegra/pokegra/.gitignore b/files/poketool/pokegra/pokegra/.gitignore index bc3caffd..0d0e68a8 100644 --- a/files/poketool/pokegra/pokegra/.gitignore +++ b/files/poketool/pokegra/pokegra/.gitignore @@ -16,6 +16,18 @@ 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_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_0024.NCGR b/files/poketool/pokegra/pokegra/narc_0024.NCGR Binary files differdeleted 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 Binary files differnew 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 Binary files differdeleted 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 Binary files differnew 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 Binary files differdeleted 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 Binary files differnew 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 Binary files differdeleted 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 Binary files differnew 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 Binary files differdeleted 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 Binary files differdeleted 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/files/poketool/pokegra/pokegra/narc_0030.NCGR b/files/poketool/pokegra/pokegra/narc_0030.NCGR Binary files differdeleted file mode 100644 index bb06d3e8..00000000 --- a/files/poketool/pokegra/pokegra/narc_0030.NCGR +++ /dev/null diff --git a/files/poketool/pokegra/pokegra/narc_0030.png b/files/poketool/pokegra/pokegra/narc_0030.png Binary files differnew file mode 100644 index 00000000..b10f8304 --- /dev/null +++ b/files/poketool/pokegra/pokegra/narc_0030.png 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 Binary files differdeleted file mode 100644 index bb06d3e8..00000000 --- a/files/poketool/pokegra/pokegra/narc_0031.NCGR +++ /dev/null diff --git a/files/poketool/pokegra/pokegra/narc_0031.png b/files/poketool/pokegra/pokegra/narc_0031.png Binary files differnew file mode 100644 index 00000000..b10f8304 --- /dev/null +++ b/files/poketool/pokegra/pokegra/narc_0031.png 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 Binary files differdeleted file mode 100644 index 39acb8a9..00000000 --- a/files/poketool/pokegra/pokegra/narc_0032.NCGR +++ /dev/null diff --git a/files/poketool/pokegra/pokegra/narc_0032.png b/files/poketool/pokegra/pokegra/narc_0032.png Binary files differnew file mode 100644 index 00000000..f8110f99 --- /dev/null +++ b/files/poketool/pokegra/pokegra/narc_0032.png 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 Binary files differdeleted file mode 100644 index 39acb8a9..00000000 --- a/files/poketool/pokegra/pokegra/narc_0033.NCGR +++ /dev/null diff --git a/files/poketool/pokegra/pokegra/narc_0033.png b/files/poketool/pokegra/pokegra/narc_0033.png Binary files differnew file mode 100644 index 00000000..f8110f99 --- /dev/null +++ b/files/poketool/pokegra/pokegra/narc_0033.png 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 Binary files differdeleted file mode 100644 index 9d161f5b..00000000 --- a/files/poketool/pokegra/pokegra/narc_0034.NCLR +++ /dev/null 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 Binary files differdeleted file mode 100644 index baf92136..00000000 --- a/files/poketool/pokegra/pokegra/narc_0035.NCLR +++ /dev/null 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 5eeea7f0..1ee8dde7 100644 --- a/filesystem.mk +++ b/filesystem.mk @@ -2303,6 +2303,18 @@ 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_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 \ @@ -2316,6 +2328,8 @@ 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_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 3b9f454b..3dfef9b1 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,8 @@ 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_0012.NCGR \ files/poketool/icongra/poke_icon/narc_0402.NCGR 4BPP_NCLR_FILES := files/demo/title/titledemo/narc_0016.NCLR \ @@ -130,6 +131,10 @@ 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_0034.NCLR \ + files/poketool/pokegra/pokegra/narc_0035.NCLR \ files/poketool/pokegra/pokegra/narc_2374.NCLR \ files/poketool/pokegra/pokegra/narc_2375.NCLR @@ -145,6 +150,14 @@ 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_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 \ @@ -232,6 +245,8 @@ 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_0012.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 +260,14 @@ 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_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 \ @@ -361,6 +384,10 @@ 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_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 \ |
