summaryrefslogtreecommitdiff
path: root/graphics/interface
diff options
context:
space:
mode:
authorgolem galvanize <golemgalvanize@github.com>2018-12-07 14:47:20 -0500
committergolem galvanize <golemgalvanize@github.com>2018-12-07 14:47:20 -0500
commit53fac4417b53fcee2cc9e46d72ad598b016cc967 (patch)
tree07e69072826569c7c31230cb4671a5d321e5f972 /graphics/interface
parent18124740a4d75ae95948f95ca6f63c320e51501c (diff)
parent6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff)
fixing merge conflicts
Diffstat (limited to 'graphics/interface')
-rw-r--r--graphics/interface/menu.pngbin444 -> 0 bytes
-rw-r--r--graphics/interface/menu_0.pal19
-rw-r--r--graphics/interface/menu_1.pal19
-rw-r--r--graphics/interface/menu_map.binbin4096 -> 0 bytes
4 files changed, 0 insertions, 38 deletions
diff --git a/graphics/interface/menu.png b/graphics/interface/menu.png
deleted file mode 100644
index 96f6b8b15..000000000
--- a/graphics/interface/menu.png
+++ /dev/null
Binary files differ
diff --git a/graphics/interface/menu_0.pal b/graphics/interface/menu_0.pal
deleted file mode 100644
index 67e1af896..000000000
--- a/graphics/interface/menu_0.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-0 0 0
-255 255 255
-255 0 0
-82 98 156
-106 139 189
-255 255 255
-106 90 115
-213 205 213
-65 74 123
-74 65 82
-131 139 139
-106 65 90
-172 106 98
-213 74 57
-156 74 98
-106 164 164
diff --git a/graphics/interface/menu_1.pal b/graphics/interface/menu_1.pal
deleted file mode 100644
index 3adc73766..000000000
--- a/graphics/interface/menu_1.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-0 0 0
-74 57 115
-82 98 156
-106 139 189
-41 49 49
-255 255 255
-106 90 115
-222 213 222
-90 82 82
-180 189 180
-139 156 213
-90 74 131
-0 0 0
-0 0 0
-0 0 0
-0 0 0
diff --git a/graphics/interface/menu_map.bin b/graphics/interface/menu_map.bin
deleted file mode 100644
index 8a7b3f1f0..000000000
--- a/graphics/interface/menu_map.bin
+++ /dev/null
Binary files differ