Merge branch 'master' into link

5 files changed, 51 insertions, 0 deletions

diff --git a/graphics/battle_terrain/underwater/anim_map.bin b/graphics/battle_terrain/underwater/anim_map.bin
new file mode 100755
index 000000000..616c2a242
--- /dev/null
+++ b/graphics/battle_terrain/underwater/anim_map.bin
diff --git a/graphics/battle_terrain/underwater/anim_tiles.png b/graphics/battle_terrain/underwater/anim_tiles.png
new file mode 100755
index 000000000..3e75434db
--- /dev/null
+++ b/graphics/battle_terrain/underwater/anim_tiles.png
diff --git a/graphics/battle_terrain/underwater/map.bin b/graphics/battle_terrain/underwater/map.bin
new file mode 100755
index 000000000..61f358f53
--- /dev/null
+++ b/graphics/battle_terrain/underwater/map.bin
diff --git a/graphics/battle_terrain/underwater/palette.pal b/graphics/battle_terrain/underwater/palette.pal
new file mode 100755
index 000000000..b5859af6e
--- /dev/null
+++ b/graphics/battle_terrain/underwater/palette.pal
@@ -0,0 +1,51 @@
+JASC-PAL
+0100
+48
+0 0 0
+197 230 255
+131 139 197
+148 197 246
+172 205 255
+131 164 213
+189 213 255
+148 180 222
+205 222 255
+197 230 255
+0 0 0
+148 164 238
+156 189 238
+172 205 238
+189 213 246
+197 222 255
+0 0 0
+197 230 255
+131 139 197
+148 197 246
+172 205 255
+131 164 213
+189 213 255
+148 180 222
+205 222 255
+197 230 255
+0 0 0
+148 164 238
+156 189 238
+172 205 238
+189 213 246
+197 222 255
+0 0 0
+98 164 230
+131 197 255
+172 238 255
+255 255 255
+205 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+98 98 172
+131 131 230
+172 172 255
+255 255 255
diff --git a/graphics/battle_terrain/underwater/tiles.png b/graphics/battle_terrain/underwater/tiles.png
new file mode 100755
index 000000000..b0d49a9cc
--- /dev/null
+++ b/graphics/battle_terrain/underwater/tiles.png