diff options
| author | paul <nintendo6496@googlemail.com> | 2018-10-10 22:54:23 +0200 |
|---|---|---|
| committer | paul <nintendo6496@googlemail.com> | 2018-10-10 22:54:23 +0200 |
| commit | 3f0827128a6ba39577dbaa1ea28f8641e4a20780 (patch) | |
| tree | bb4cb2804a27325561a65e133f31a1e4d2671fbe /graphics | |
| parent | 1ee1ebe23a49bbbc040a43e0e6fb81badc588f22 (diff) | |
| parent | 10fff9c6f2d29899952d1751d3de827e7e98bb60 (diff) | |
resolve merge conflict about graphics_file_rules.mk and prepare for adding pokemon graphics
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/pokemon/palettes/circled_question_mark_palette.pal | 19 | ||||
| -rw-r--r-- | graphics/pokemon/palettes/circled_question_mark_shiny_palette.pal | 19 |
2 files changed, 38 insertions, 0 deletions
diff --git a/graphics/pokemon/palettes/circled_question_mark_palette.pal b/graphics/pokemon/palettes/circled_question_mark_palette.pal new file mode 100644 index 000000000..681f1cefe --- /dev/null +++ b/graphics/pokemon/palettes/circled_question_mark_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 205 205 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +205 205 205 +172 172 172 +255 255 255 +0 0 0 diff --git a/graphics/pokemon/palettes/circled_question_mark_shiny_palette.pal b/graphics/pokemon/palettes/circled_question_mark_shiny_palette.pal new file mode 100644 index 000000000..aa8d08dc3 --- /dev/null +++ b/graphics/pokemon/palettes/circled_question_mark_shiny_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +123 172 172 +32 32 32 +32 32 32 +32 32 32 +32 32 32 +32 32 32 +32 32 32 +32 32 32 +32 32 32 +32 32 32 +32 32 32 +32 32 32 +172 172 172 +139 139 139 +222 222 222 +32 32 32 |