summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-12-18 16:58:14 +0100
committerDizzyEggg <jajkodizzy@wp.pl>2017-12-18 16:58:14 +0100
commitcb229f56e8951e3f9efc35516447a54e18e8fef0 (patch)
tree656599caae716c6cc8e81121f2b1cd061927b99e /graphics
parentc3abe2863feb8ebb21921c40d3c685a27a4135c4 (diff)
parent6a674e1e83db097d7a31a3786d12e42987f09f70 (diff)
fix pokeblock conflicts
Diffstat (limited to 'graphics')
-rw-r--r--graphics/wallclock/graphics_85b1f58.pngbin0 -> 204 bytes
-rw-r--r--graphics/wallclock/palette_85b21d4.pal7
2 files changed, 7 insertions, 0 deletions
diff --git a/graphics/wallclock/graphics_85b1f58.png b/graphics/wallclock/graphics_85b1f58.png
new file mode 100644
index 000000000..06a4ecad0
--- /dev/null
+++ b/graphics/wallclock/graphics_85b1f58.png
Binary files differ
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