Missing warps

2 files changed, 40 insertions, 58 deletions

diff --git a/maps/022-1.tmx b/maps/022-1.tmx
index f9c6408c..1cd27c12 100644
--- a/maps/022-1.tmx
+++ b/maps/022-1.tmx
@@ -1408,20 +1408,18 @@
   </object>
  </objectgroup>
  <objectgroup color="#ffff00" name="warps">
-  <object id="13" name="paraCaverna" type="warp" x="2560" y="2080" width="32" height="32">
+  <object id="13" name="to Cave" type="warp" x="2560" y="2080" width="32" height="32">
    <properties>
-    <property name="dest_map" value="010-3"/>
-    <property name="dest_x" value="1824"/>
-    <property name="dest_y" value="1376"/>
-    <property name="npc_id" value="SCRIPT"/>
+    <property name="dest_map" value="023-1"/>
+    <property name="dest_x" value="57"/>
+    <property name="dest_y" value="42"/>
    </properties>
   </object>
-  <object id="14" name="paraCaverna" type="warp" x="2336" y="1984" width="32" height="32">
+  <object id="14" name="to Cave" type="warp" x="2336" y="1984" width="32" height="32">
    <properties>
-    <property name="dest_map" value="010-3"/>
-    <property name="dest_x" value="1504"/>
-    <property name="dest_y" value="1888"/>
-    <property name="npc_id" value="SCRIPT"/>
+    <property name="dest_map" value="023-1"/>
+    <property name="dest_x" value="47"/>
+    <property name="dest_y" value="58"/>
    </properties>
   </object>
   <object id="15" name="paraCasaNoel" type="warp" x="2240" y="1664" width="32" height="32">
@@ -1432,28 +1430,18 @@
     <property name="npc_id" value="SCRIPT"/>
    </properties>
   </object>
-  <object id="16" name="paraCaverna" type="warp" x="1856" y="1664" width="32" height="32">
-   <properties>
-    <property name="dest_map" value="010-3"/>
-    <property name="dest_x" value="1184"/>
-    <property name="dest_y" value="896"/>
-    <property name="npc_id" value="SCRIPT"/>
-   </properties>
-  </object>
-  <object id="17" name="paraCaverna" type="warp" x="1856" y="1664" width="32" height="32">
+  <object id="17" name="to Cave" type="warp" x="1856" y="1664" width="32" height="32">
    <properties>
-    <property name="dest_map" value="010-3"/>
-    <property name="dest_x" value="1184"/>
-    <property name="dest_y" value="896"/>
-    <property name="npc_id" value="SCRIPT"/>
+    <property name="dest_map" value="023-1"/>
+    <property name="dest_x" value="37"/>
+    <property name="dest_y" value="27"/>
    </properties>
   </object>
-  <object id="18" name="paraCaverna" type="warp" x="2240" y="2592" width="32" height="32">
+  <object id="18" name="to Cave" type="warp" x="2240" y="2592" width="32" height="32">
    <properties>
-    <property name="dest_map" value="010-3"/>
-    <property name="dest_x" value="1664"/>
-    <property name="dest_y" value="1984"/>
-    <property name="npc_id" value="SCRIPT"/>
+    <property name="dest_map" value="023-1"/>
+    <property name="dest_x" value="52"/>
+    <property name="dest_y" value="61"/>
    </properties>
   </object>
   <object id="19" name="to Frozen Cave" type="warp" x="2176" y="2880" width="32" height="32">
@@ -1463,12 +1451,11 @@
     <property name="dest_y" value="69"/>
    </properties>
   </object>
-  <object id="31" name="paraCaverna" type="warp" x="1568" y="1760" width="32" height="32">
+  <object id="31" name="to Cave" type="warp" x="1568" y="1760" width="32" height="32">
    <properties>
-    <property name="dest_map" value="010-3"/>
-    <property name="dest_x" value="832"/>
-    <property name="dest_y" value="1152"/>
-    <property name="npc_id" value="SCRIPT"/>
+    <property name="dest_map" value="023-1"/>
+    <property name="dest_x" value="26"/>
+    <property name="dest_y" value="35"/>
    </properties>
   </object>
   <object id="38" name="Entrada do Coliseu" type="warp" x="1248" y="1280" width="64" height="32">
diff --git a/maps/023-1.tmx b/maps/023-1.tmx
index 8d57a2a2..93610038 100644
--- a/maps/023-1.tmx
+++ b/maps/023-1.tmx
@@ -591,12 +591,11 @@
     <property name="dest_y" value="56"/>
    </properties>
   </object>
-  <object id="4" name="paraFora" type="warp" x="1184" y="896" width="32" height="32">
+  <object id="4" name="Outside" type="warp" x="1184" y="896" width="32" height="32">
    <properties>
-    <property name="dest_map" value="010"/>
-    <property name="dest_x" value="1856"/>
-    <property name="dest_y" value="1664"/>
-    <property name="npc_id" value="SCRIPT"/>
+    <property name="dest_map" value="022-1"/>
+    <property name="dest_x" value="58"/>
+    <property name="dest_y" value="53"/>
    </properties>
   </object>
   <object id="5" name="F(paraE)" type="slide" x="1120" y="1056" width="32" height="32">
@@ -605,12 +604,11 @@
     <property name="dest_y" value="61"/>
    </properties>
   </object>
-  <object id="6" name="paraFora" type="warp" x="1824" y="1376" width="32" height="32">
+  <object id="6" name="Outside" type="warp" x="1824" y="1376" width="32" height="32">
    <properties>
-    <property name="dest_map" value="010"/>
-    <property name="dest_x" value="2560"/>
-    <property name="dest_y" value="2080"/>
-    <property name="npc_id" value="SCRIPT"/>
+    <property name="dest_map" value="022-1"/>
+    <property name="dest_x" value="80"/>
+    <property name="dest_y" value="66"/>
    </properties>
   </object>
   <object id="7" name="H(paraG)" type="slide" x="1600" y="1376" width="32" height="32">
@@ -619,12 +617,11 @@
     <property name="dest_y" value="49"/>
    </properties>
   </object>
-  <object id="8" name="paraFora" type="warp" x="832" y="1152" width="32" height="32">
+  <object id="8" name="Outside" type="warp" x="832" y="1152" width="32" height="32">
    <properties>
-    <property name="dest_map" value="010"/>
-    <property name="dest_x" value="1568"/>
-    <property name="dest_y" value="1760"/>
-    <property name="npc_id" value="SCRIPT"/>
+    <property name="dest_map" value="022-1"/>
+    <property name="dest_x" value="49"/>
+    <property name="dest_y" value="56"/>
    </properties>
   </object>
   <object id="9" name="C(paraD)" type="slide" x="1152" y="1504" width="32" height="32">
@@ -645,20 +642,18 @@
     <property name="dest_y" value="31"/>
    </properties>
   </object>
-  <object id="12" name="paraFora" type="warp" x="1504" y="1888" width="32" height="32">
+  <object id="12" name="Outside" type="warp" x="1504" y="1888" width="32" height="32">
    <properties>
-    <property name="dest_map" value="010"/>
-    <property name="dest_x" value="2336"/>
-    <property name="dest_y" value="1984"/>
-    <property name="npc_id" value="SCRIPT"/>
+    <property name="dest_map" value="022-1"/>
+    <property name="dest_x" value="73"/>
+    <property name="dest_y" value="63"/>
    </properties>
   </object>
-  <object id="13" name="paraFora" type="warp" x="1664" y="1984" width="32" height="32">
+  <object id="13" name="Outside" type="warp" x="1664" y="1984" width="32" height="32">
    <properties>
-    <property name="dest_map" value="010"/>
-    <property name="dest_x" value="2240"/>
-    <property name="dest_y" value="2592"/>
-    <property name="npc_id" value="SCRIPT"/>
+    <property name="dest_map" value="022-1"/>
+    <property name="dest_x" value="70"/>
+    <property name="dest_y" value="82"/>
    </properties>
   </object>
   <object id="14" name="E(paraF)" type="slide" x="992" y="1984" width="32" height="32">