summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--maps/008-1.tmx2
-rw-r--r--maps/009-1.tmx2
-rw-r--r--maps/009-2.tmx2
-rw-r--r--maps/018-2.tmx2
-rw-r--r--maps/025-1.tmx2
m---------music0
6 files changed, 5 insertions, 5 deletions
diff --git a/maps/008-1.tmx b/maps/008-1.tmx
index 41bd8b97..0e5c5ef4 100644
--- a/maps/008-1.tmx
+++ b/maps/008-1.tmx
@@ -2,7 +2,7 @@
<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="162" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="24">
<properties>
<property name="minimap" value="graphics/minimaps/008-1.png"/>
- <property name="music" value="the-forest.ogg"/>
+ <property name="music" value="magick-real.ogg"/>
<property name="name" value="Hurnscald Outskirts"/>
<property name="overlay0image" value="graphics/images/ambient/clouds.png"/>
<property name="overlay0parallax" value="1.0"/>
diff --git a/maps/009-1.tmx b/maps/009-1.tmx
index 0905a593..78985d10 100644
--- a/maps/009-1.tmx
+++ b/maps/009-1.tmx
@@ -2,7 +2,7 @@
<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="117" height="75" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="95">
<properties>
<property name="minimap" value="graphics/minimaps/009-1.png"/>
- <property name="music" value="magick-real.ogg"/>
+ <property name="music" value="Birdsong.ogg"/>
<property name="name" value="Hurnscald"/>
<property name="overlay0image" value="graphics/images/ambient/clouds.png"/>
<property name="overlay0parallax" value="1.0"/>
diff --git a/maps/009-2.tmx b/maps/009-2.tmx
index 4919ed2b..49136359 100644
--- a/maps/009-2.tmx
+++ b/maps/009-2.tmx
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="200" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="26">
<properties>
- <property name="music" value="magick-real.ogg"/>
+ <property name="music" value=""/>
<property name="name" value="Hurnscald Indoor"/>
</properties>
<tileset firstgid="1" source="../tilesets/collision.tsx"/>
diff --git a/maps/018-2.tmx b/maps/018-2.tmx
index f3b3a66b..d8f64979 100644
--- a/maps/018-2.tmx
+++ b/maps/018-2.tmx
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="146" height="70" tilewidth="32" tileheight="32" infinite="0" nextlayerid="6" nextobjectid="13">
<properties>
- <property name="music" value="magick-real.ogg"/>
+ <property name="music" value=""/>
<property name="name" value="Woodland Mining Camp Indoor"/>
</properties>
<tileset firstgid="1" source="../tilesets/collision.tsx"/>
diff --git a/maps/025-1.tmx b/maps/025-1.tmx
index e4c1ae8b..b631f524 100644
--- a/maps/025-1.tmx
+++ b/maps/025-1.tmx
@@ -2,7 +2,7 @@
<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="150" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="27">
<properties>
<property name="minimap" value="graphics/minimaps/025-1.png"/>
- <property name="music" value="mystique-forest.ogg"/>
+ <property name="music" value="the-forest.ogg"/>
<property name="name" value="Woodland Swamp"/>
</properties>
<tileset firstgid="1" source="../tilesets/collision.tsx"/>
diff --git a/music b/music
-Subproject feb739ae5b4385829985b28e9e8dd2f4281d73e
+Subproject 825bc8c93380ccfc899f245adc8a170eae52b94