diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-18 16:58:14 +0100 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-18 16:58:14 +0100 |
commit | cb229f56e8951e3f9efc35516447a54e18e8fef0 (patch) | |
tree | 656599caae716c6cc8e81121f2b1cd061927b99e /graphics | |
parent | c3abe2863feb8ebb21921c40d3c685a27a4135c4 (diff) | |
parent | 6a674e1e83db097d7a31a3786d12e42987f09f70 (diff) |
fix pokeblock conflicts
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/wallclock/graphics_85b1f58.png | bin | 0 -> 204 bytes | |||
-rw-r--r-- | graphics/wallclock/palette_85b21d4.pal | 7 |
2 files changed, 7 insertions, 0 deletions
diff --git a/graphics/wallclock/graphics_85b1f58.png b/graphics/wallclock/graphics_85b1f58.png Binary files differnew file mode 100644 index 000000000..06a4ecad0 --- /dev/null +++ b/graphics/wallclock/graphics_85b1f58.png diff --git a/graphics/wallclock/palette_85b21d4.pal b/graphics/wallclock/palette_85b21d4.pal new file mode 100644 index 000000000..fda317608 --- /dev/null +++ b/graphics/wallclock/palette_85b21d4.pal @@ -0,0 +1,7 @@ +JASC-PAL +0100 +4 +0 0 0 +74 180 189 +255 255 255 +0 0 0 |