summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/005-1/_import.txt2
-rw-r--r--npc/005-1/underground.txt12
-rw-r--r--npc/006-0/_import.txt2
-rw-r--r--npc/006-0/_warps.txt3
-rw-r--r--npc/006-0/warpcandorbattle.txt (renamed from npc/005-1/warpcandorbattle.txt)2
-rw-r--r--npc/006-1/barrier.txt2
6 files changed, 20 insertions, 3 deletions
diff --git a/npc/005-1/_import.txt b/npc/005-1/_import.txt
index bbd950b67..84542811c 100644
--- a/npc/005-1/_import.txt
+++ b/npc/005-1/_import.txt
@@ -9,7 +9,7 @@
"npc/005-1/sailors.txt",
"npc/005-1/ship.txt",
"npc/005-1/soul-menhir.txt",
+"npc/005-1/underground.txt",
"npc/005-1/vincent.txt",
-"npc/005-1/warpcandorbattle.txt",
"npc/005-1/wateranimation.txt",
"npc/005-1/zegas.txt",
diff --git a/npc/005-1/underground.txt b/npc/005-1/underground.txt
new file mode 100644
index 000000000..ba721aaa6
--- /dev/null
+++ b/npc/005-1/underground.txt
@@ -0,0 +1,12 @@
+// TMW2 Script
+// Author:
+// Crazyfefe
+// Jesusalva
+
+005-1,66,62,0 script Magic Barrier NPC_HIDDEN,0,0,{
+ end;
+
+OnTouch:
+ warp "006-0", 49, 53;
+ end;
+}
diff --git a/npc/006-0/_import.txt b/npc/006-0/_import.txt
index 4957943c3..8e1618778 100644
--- a/npc/006-0/_import.txt
+++ b/npc/006-0/_import.txt
@@ -1,2 +1,4 @@
// Map 006-0: Candor's Underground, 1F
// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/006-0/_warps.txt",
+"npc/006-0/warpcandorbattle.txt",
diff --git a/npc/006-0/_warps.txt b/npc/006-0/_warps.txt
new file mode 100644
index 000000000..42c187325
--- /dev/null
+++ b/npc/006-0/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 006-0: Candor's Underground, 1F warps
+006-0,49,54,0 warp #006-0_49_54 0,0,005-1,66,63
diff --git a/npc/005-1/warpcandorbattle.txt b/npc/006-0/warpcandorbattle.txt
index d7af54df4..20ef44ee2 100644
--- a/npc/005-1/warpcandorbattle.txt
+++ b/npc/006-0/warpcandorbattle.txt
@@ -3,7 +3,7 @@
// Crazyfefe
// Jesusalva
-005-1,66,62,0 script Magic Barrier NPC_HIDDEN,0,0,{
+006-0,54,35,0 script Magic Barrier NPC_HIDDEN,0,0,{
end;
OnTouch:
diff --git a/npc/006-1/barrier.txt b/npc/006-1/barrier.txt
index bbf8a102b..da4ca36d7 100644
--- a/npc/006-1/barrier.txt
+++ b/npc/006-1/barrier.txt
@@ -5,7 +5,7 @@
006-1,49,54,0 script #FightCaveBarrier NPC_NO_SPRITE,0,0,{
if ($@FEFE_CAVE_LEVEL) goto L_Block;
- warp "005-1", 66, 63;
+ warp "006-0", 54, 36;
end;
L_Block: