Merge branch 'master' into record_mixing

13 files changed, 19 insertions, 0 deletions

diff --git a/graphics/interface/map_popup/857F444.pal b/graphics/interface/map_popup/857F444.pal
new file mode 100644
index 000000000..19b8cf9c4
--- /dev/null
+++ b/graphics/interface/map_popup/857F444.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+238 255 255
+65 65 123
+255 255 255
+180 222 255
+139 172 213
+98 123 172
+57 74 131
+16 24 90
+180 222 255
+139 172 213
+98 123 172
+57 74 131
+16 24 90
+255 255 255
diff --git a/graphics/interface/map_popup/brick.png b/graphics/interface/map_popup/brick.png
new file mode 100644
index 000000000..8fef0a1c2
--- /dev/null
+++ b/graphics/interface/map_popup/brick.png
diff --git a/graphics/interface/map_popup/brick_outline.png b/graphics/interface/map_popup/brick_outline.png
new file mode 100644
index 000000000..be4b6f95a
--- /dev/null
+++ b/graphics/interface/map_popup/brick_outline.png
diff --git a/graphics/interface/map_popup/marble.png b/graphics/interface/map_popup/marble.png
new file mode 100644
index 000000000..d79b9ec34
--- /dev/null
+++ b/graphics/interface/map_popup/marble.png
diff --git a/graphics/interface/map_popup/marble_outline.png b/graphics/interface/map_popup/marble_outline.png
new file mode 100644
index 000000000..54f3021ea
--- /dev/null
+++ b/graphics/interface/map_popup/marble_outline.png
diff --git a/graphics/interface/map_popup/stone.png b/graphics/interface/map_popup/stone.png
new file mode 100644
index 000000000..fe3b7e29d
--- /dev/null
+++ b/graphics/interface/map_popup/stone.png
diff --git a/graphics/interface/map_popup/stone2.png b/graphics/interface/map_popup/stone2.png
new file mode 100644
index 000000000..261c3184a
--- /dev/null
+++ b/graphics/interface/map_popup/stone2.png
diff --git a/graphics/interface/map_popup/stone2_outline.png b/graphics/interface/map_popup/stone2_outline.png
new file mode 100644
index 000000000..b0c0748df
--- /dev/null
+++ b/graphics/interface/map_popup/stone2_outline.png
diff --git a/graphics/interface/map_popup/stone_outline.png b/graphics/interface/map_popup/stone_outline.png
new file mode 100644
index 000000000..7c014d05e
--- /dev/null
+++ b/graphics/interface/map_popup/stone_outline.png
diff --git a/graphics/interface/map_popup/underwater.png b/graphics/interface/map_popup/underwater.png
new file mode 100644
index 000000000..e6cf2b6c8
--- /dev/null
+++ b/graphics/interface/map_popup/underwater.png
diff --git a/graphics/interface/map_popup/underwater_outline.png b/graphics/interface/map_popup/underwater_outline.png
new file mode 100644
index 000000000..2ffe3cb75
--- /dev/null
+++ b/graphics/interface/map_popup/underwater_outline.png
diff --git a/graphics/interface/map_popup/wood.png b/graphics/interface/map_popup/wood.png
new file mode 100644
index 000000000..e846a6bcd
--- /dev/null
+++ b/graphics/interface/map_popup/wood.png
diff --git a/graphics/interface/map_popup/wood_outline.png b/graphics/interface/map_popup/wood_outline.png
new file mode 100644
index 000000000..d143dbc2f
--- /dev/null
+++ b/graphics/interface/map_popup/wood_outline.png