summaryrefslogtreecommitdiff
path: root/graphics/misc
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-11-17 19:34:55 +0100
committerDizzyEggg <jajkodizzy@wp.pl>2017-11-17 19:34:55 +0100
commitd0245cf8d23aa65a357977a00b21f58d42dfcf6e (patch)
treecb5e1c81baaf882f2bb8f323b04a7b41d316be7b /graphics/misc
parent3e1f3d0e1e2bc5fbe5e630d81b741b653080e77b (diff)
parenta98c6bf210cec0591badb51be1e472c5fb4f1f1a (diff)
recorded battle merge conflicts fix
Diffstat (limited to 'graphics/misc')
-rw-r--r--graphics/misc/japanese_hof.pal19
-rw-r--r--graphics/misc/japanese_hof.pngbin0 -> 425 bytes
2 files changed, 19 insertions, 0 deletions
diff --git a/graphics/misc/japanese_hof.pal b/graphics/misc/japanese_hof.pal
new file mode 100644
index 000000000..f50aa5341
--- /dev/null
+++ b/graphics/misc/japanese_hof.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+131 238 197
+255 32 32
+115 222 180
+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
+65 65 65
+255 255 255
diff --git a/graphics/misc/japanese_hof.png b/graphics/misc/japanese_hof.png
new file mode 100644
index 000000000..6d88a48b2
--- /dev/null
+++ b/graphics/misc/japanese_hof.png
Binary files differ