Merge remote-tracking branch 'upstream/master' into Hetchel_1

1 files changed, 13 insertions, 13 deletions

diff --git a/maps/055-1.tmx b/maps/055-1.tmx
index 8d7ac146..410855c4 100644
--- a/maps/055-1.tmx
+++ b/maps/055-1.tmx
@@ -98,7 +98,7 @@
     <property name="monster_id" value="26"/>
    </properties>
   </object>
-  <object name="Clover Patch" type="spawn" x="2819" y="1511" width="244" height="180">
+  <object name="CloverPatch" type="spawn" x="2819" y="1511" width="244" height="180">
    <properties>
     <property name="eA_death" value="180000"/>
     <property name="eA_spawn" value="10000"/>
@@ -106,7 +106,7 @@
     <property name="monster_id" value="35"/>
    </properties>
   </object>
-  <object name="Clover Patch" type="spawn" x="3235" y="1724" width="213" height="157">
+  <object name="CloverPatch" type="spawn" x="3235" y="1724" width="213" height="157">
    <properties>
     <property name="eA_death" value="180000"/>
     <property name="eA_spawn" value="10000"/>
@@ -114,7 +114,7 @@
     <property name="monster_id" value="35"/>
    </properties>
   </object>
-  <object name="Clover Patch" type="spawn" x="1653" y="2164" width="916" height="548">
+  <object name="CloverPatch" type="spawn" x="1653" y="2164" width="916" height="548">
    <properties>
     <property name="eA_death" value="120000"/>
     <property name="eA_spawn" value="10000"/>
@@ -122,7 +122,7 @@
     <property name="monster_id" value="35"/>
    </properties>
   </object>
-  <object name="snail" type="spawn" x="1268" y="714" width="2681" height="833">
+  <object name="Snail" type="spawn" x="1268" y="714" width="2681" height="833">
    <properties>
     <property name="eA_death" value="85000"/>
     <property name="eA_spawn" value="10000"/>
@@ -130,7 +130,7 @@
     <property name="monster_id" value="39"/>
    </properties>
   </object>
-  <object name="Alizarin Plant" type="spawn" x="1993" y="1936" width="588" height="806">
+  <object name="AlizarinPlant" type="spawn" x="1993" y="1936" width="588" height="806">
    <properties>
     <property name="eA_death" value="60000"/>
     <property name="eA_spawn" value="10000"/>
@@ -138,7 +138,7 @@
     <property name="monster_id" value="30"/>
    </properties>
   </object>
-  <object name="Alizarin Plant" type="spawn" x="1329" y="702" width="2628" height="746">
+  <object name="AlizarinPlant" type="spawn" x="1329" y="702" width="2628" height="746">
    <properties>
     <property name="eA_death" value="60000"/>
     <property name="eA_spawn" value="10000"/>
@@ -146,7 +146,7 @@
     <property name="monster_id" value="30"/>
    </properties>
   </object>
-  <object name="Mauve Plant" type="spawn" x="0" y="0">
+  <object name="MauvePlant" type="spawn" x="0" y="0">
    <properties>
     <property name="eA_death" value="55000"/>
     <property name="eA_spawn" value="10000"/>
@@ -154,7 +154,7 @@
     <property name="monster_id" value="27"/>
    </properties>
   </object>
-  <object name="Cobalt Plant" type="spawn" x="0" y="0">
+  <object name="CobaltPlant" type="spawn" x="0" y="0">
    <properties>
     <property name="eA_death" value="60000"/>
     <property name="eA_spawn" value="10000"/>
@@ -162,7 +162,7 @@
     <property name="monster_id" value="28"/>
    </properties>
   </object>
-  <object name="Gamboge Plant" type="spawn" x="0" y="0">
+  <object name="GambogePlant" type="spawn" x="0" y="0">
    <properties>
     <property name="eA_death" value="60000"/>
     <property name="eA_spawn" value="10000"/>
@@ -170,7 +170,7 @@
     <property name="monster_id" value="29"/>
    </properties>
   </object>
-  <object name="Pink Flower" type="spawn" x="3678" y="1896" width="188" height="126">
+  <object name="PinkFlower" type="spawn" x="3678" y="1896" width="188" height="126">
    <properties>
     <property name="eA_death" value="45000"/>
     <property name="eA_spawn" value="10000"/>
@@ -178,7 +178,7 @@
     <property name="monster_id" value="12"/>
    </properties>
   </object>
-  <object name="Pink Flower" type="spawn" x="3049" y="1908" width="183" height="116">
+  <object name="PinkFlower" type="spawn" x="3049" y="1908" width="183" height="116">
    <properties>
     <property name="eA_death" value="45000"/>
     <property name="eA_spawn" value="10000"/>
@@ -186,7 +186,7 @@
     <property name="monster_id" value="12"/>
    </properties>
   </object>
-  <object name="Pink Flower" type="spawn" x="1708" y="2109" width="787" height="590">
+  <object name="PinkFlower" type="spawn" x="1708" y="2109" width="787" height="590">
    <properties>
     <property name="eA_death" value="45000"/>
     <property name="eA_spawn" value="10000"/>
@@ -215,7 +215,7 @@
     <property name="dest_y" value="2400"/>
    </properties>
   </object>
-  <object name="Spiky Mushroom" type="spawn" x="0" y="0">
+  <object name="SpikyMushroom" type="spawn" x="0" y="0">
    <properties>
     <property name="eA_death" value="60000"/>
     <property name="eA_spawn" value="10000"/>