Make script_warps warps

7 files changed, 17 insertions, 8 deletions

diff --git a/maps/000-2-0.tmx b/maps/000-2-0.tmx
index 7ce8fd2f..931a0b10 100644
--- a/maps/000-2-0.tmx
+++ b/maps/000-2-0.tmx
@@ -372,11 +372,12 @@
 </data>
  </layer>
  <objectgroup name="Object">
-  <object id="1" name="ToOutside" type="script_warp" x="608" y="896" width="32" height="32">
+  <object id="1" name="ToOutside" type="warp" x="608" y="896" width="32" height="32">
    <properties>
     <property name="dest_map" value="000-1"/>
     <property name="dest_x" value="93"/>
     <property name="dest_y" value="100"/>
+    <property name="npc_id" value="SCRIPT"/>
    </properties>
   </object>
   <object id="2" name="To Nard's Room" type="warp" x="1056" y="896" width="32" height="32">
@@ -384,6 +385,7 @@
     <property name="dest_map" value="000-2-3"/>
     <property name="dest_x" value="20"/>
     <property name="dest_y" value="27"/>
+    <property name="npc_id" value="SCRIPT"/>
    </properties>
   </object>
   <object id="3" name="To Second Deck" type="warp" x="992" y="800" width="32" height="32">
diff --git a/maps/000-2-1.tmx b/maps/000-2-1.tmx
index 5196d1c1..bef6b500 100644
--- a/maps/000-2-1.tmx
+++ b/maps/000-2-1.tmx
@@ -409,11 +409,12 @@
 </data>
  </layer>
  <objectgroup name="Object">
-  <object id="1" name="To Ship's Hold" type="script_warp" x="2304" y="1088" width="32" height="32">
+  <object id="1" name="To Ship's Hold" type="warp" x="2304" y="1088" width="32" height="32">
    <properties>
     <property name="dest_map" value="000-2-2"/>
     <property name="dest_x" value="48"/>
     <property name="dest_y" value="28"/>
+    <property name="npc_id" value="SCRIPT"/>
    </properties>
   </object>
   <object id="2" name="To First Deck" type="warp" x="2304" y="960" width="32" height="32">
diff --git a/maps/000-2-2.tmx b/maps/000-2-2.tmx
index 79f2b2de..65dbdfeb 100644
--- a/maps/000-2-2.tmx
+++ b/maps/000-2-2.tmx
@@ -496,18 +496,20 @@
 </data>
  </layer>
  <objectgroup name="Object">
-  <object id="1" name="To Second Deck" type="script_warp" x="1536" y="928" width="32" height="28">
+  <object id="1" name="To Second Deck" type="warp" x="1536" y="928" width="32" height="28">
    <properties>
     <property name="dest_map" value="000-2-1"/>
     <property name="dest_x" value="61"/>
     <property name="dest_y" value="34"/>
+    <property name="npc_id" value="SCRIPT"/>
    </properties>
   </object>
-  <object id="2" name="To ..." type="script_warp" x="740" y="992" width="28" height="32">
+  <object id="2" name="To ..." type="warp" x="740" y="992" width="28" height="32">
    <properties>
     <property name="dest_map" value="000-2-2"/>
     <property name="dest_x" value="1"/>
     <property name="dest_y" value="1"/>
+    <property name="npc_id" value="SCRIPT"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-2-22.tmx b/maps/001-2-22.tmx
index 99394986..0e1b6c5f 100644
--- a/maps/001-2-22.tmx
+++ b/maps/001-2-22.tmx
@@ -412,11 +412,12 @@
 </data>
  </layer>
  <objectgroup name="Object">
-  <object id="1" name="To Ship's Hold" type="script_warp" x="2304" y="1088" width="32" height="32">
+  <object id="1" name="To Ship's Hold" type="warp" x="2304" y="1088" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-23"/>
     <property name="dest_x" value="48"/>
     <property name="dest_y" value="28"/>
+    <property name="npc_id" value="SCRIPT"/>
    </properties>
   </object>
   <object id="2" name="To First Deck" type="warp" x="2304" y="960" width="32" height="32">
diff --git a/maps/001-2-23.tmx b/maps/001-2-23.tmx
index 1fede02c..5b127b3b 100644
--- a/maps/001-2-23.tmx
+++ b/maps/001-2-23.tmx
@@ -506,11 +506,12 @@
     <property name="dest_y" value="35"/>
    </properties>
   </object>
-  <object id="2" name="To ..." type="script_warp" x="736" y="992" width="32" height="32">
+  <object id="2" name="To ..." type="warp" x="736" y="992" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-23"/>
     <property name="dest_x" value="1"/>
     <property name="dest_y" value="1"/>
+    <property name="npc_id" value="SCRIPT"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-2-32.tmx b/maps/001-2-32.tmx
index 4e3f7f32..7d301524 100644
--- a/maps/001-2-32.tmx
+++ b/maps/001-2-32.tmx
@@ -489,11 +489,12 @@
     <property name="dest_y" value="33"/>
    </properties>
   </object>
-  <object id="24" name="To Fight Room" type="script_warp" x="1056" y="928" width="32" height="32">
+  <object id="24" name="To Fight Room" type="warp" x="1056" y="928" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-35"/>
     <property name="dest_x" value="24"/>
     <property name="dest_y" value="29"/>
+    <property name="npc_id" value="SCRIPT"/>
    </properties>
   </object>
   <object id="27" name="graphics/particles/warp.xml" type="particle_effect" x="1056" y="928" width="32" height="32"/>
diff --git a/maps/001-2-34.tmx b/maps/001-2-34.tmx
index 45a9d051..932d62a0 100644
--- a/maps/001-2-34.tmx
+++ b/maps/001-2-34.tmx
@@ -489,11 +489,12 @@
     <property name="dest_y" value="33"/>
    </properties>
   </object>
-  <object id="24" name="To Training Room" type="script_warp" x="736" y="928" width="32" height="32">
+  <object id="24" name="To Training Room" type="warp" x="736" y="928" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-36"/>
     <property name="dest_x" value="36"/>
     <property name="dest_y" value="30"/>
+    <property name="npc_id" value="SCRIPT"/>
    </properties>
   </object>
  </objectgroup>