4 files changed, 11 insertions, 12 deletions
diff --git a/world/map/npc/017-4/_import.txt b/world/map/npc/017-4/_import.txt
index fcd79a8e..33a00b9b 100644
--- a/world/map/npc/017-4/_import.txt
+++ b/world/map/npc/017-4/_import.txt
@@ -2,6 +2,7 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 map: 017-4
 npc: npc/017-4/_mobs.txt
+npc: npc/017-4/_nodes.txt
 npc: npc/017-4/_warps.txt
 npc: npc/017-4/guardingspirit.txt
 npc: npc/017-4/mapflags.txt
diff --git a/world/map/npc/017-4/_mobs.txt b/world/map/npc/017-4/_mobs.txt
index 920a1db5..5270e787 100644
--- a/world/map/npc/017-4/_mobs.txt
+++ b/world/map/npc/017-4/_mobs.txt
@@ -1,9 +1,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Hideout mobs
 
-
-
-017-4,0,0,0|script|Mob017-4|32767
-{
-    end;
-}
diff --git a/world/map/npc/017-4/_nodes.txt b/world/map/npc/017-4/_nodes.txt
new file mode 100644
index 00000000..357bf9fd
--- /dev/null
+++ b/world/map/npc/017-4/_nodes.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Hideout nodes
+
+// (no nodes)
diff --git a/world/map/npc/017-4/waric.txt b/world/map/npc/017-4/waric.txt
index f98cb0d0..a0f826e9 100644
--- a/world/map/npc/017-4/waric.txt
+++ b/world/map/npc/017-4/waric.txt
@@ -234,7 +234,7 @@ L_Mushroom:
     mes "\"Now that you are a student of mine, I will teach you some spells.\"";
     next;
     mes "\"We will start with an easy one. I will teach you how to summon a wicked mushroom.\"";
-    mes "\"The spell consumes a Small Mushroom and a Dark Crystal. Shove the Dark Crystal into the Small Mushroom and yell " + getspellinvocation("summon-wickedmushroom") +".\"";
+    mes "\"The spell consumes a Small Mushroom and a Dark Crystal. Shove the Dark Crystal into the Small Mushroom and yell " + get(.invocation$, "smwmushroom") +".\"";
     next;
     mes "\"A wicked mushroom will appear to fight for you.\"";
     set OrumQuest, 37;
@@ -254,7 +254,7 @@ L_Next4:
     next;
     mes "\"You have to use two roots for this spell. First you have to take one root and break off all the root hair. Shape it into  a stick, if you will. Then put it on top of the other root and form an arrow-like structure.\"";
     next;
-    mes "\"Once this is done you have to throw it in the air and scream " + getspellinvocation("toxic-dart") + " and the two roots will turn into toxic darts, a projectile you can throw.\"";
+    mes "\"Once this is done you have to throw it in the air and scream " + get(.invocation$, "toxic-dart") + " and the two roots will turn into toxic darts, a projectile you can throw.\"";
     next;
     mes "\"If you want to learn more, come back later.\"";
     set OrumQuest, 38;
@@ -312,7 +312,7 @@ L_SnakesSpell:
 
 L_Next7:
     mes "[Waric]";
-    mes "\"I said " + getspellinvocation("summon-snakes") + ".\"";
+    mes "\"I said " + get(.invocation$, "summon-snakes") + ".\"";
     mes "\"Have fun with those spells and use them to cause hate, anger and death.\"";
     set OrumQuest, 41;
     goto L_Close;
@@ -341,9 +341,9 @@ L_MoreMagic:
 L_Next8:
     mes "[Waric]";
     mes "\"Yes, of course.\"";
-    mes "\"To summon the snakes use " + getspellinvocation("summon-snakes") + ".\"";
-    mes "\"Say " + getspellinvocation("toxic-dart") + " to make your roots into toxic darts.\"";
-    mes "\"And the first spell, to summon wicked mushrooms, is " + getspellinvocation("summon-wickedmushroom") + ".\"";
+    mes "\"To summon the snakes use " + get(.invocation$, "summon-snakes") + ".\"";
+    mes "\"Say " + get(.invocation$, "toxic-dart") + " to make your roots into toxic darts.\"";
+    mes "\"And the first spell, to summon wicked mushrooms, is " + get(.invocation$, "summon-wickedmushroom") + ".\"";
     next;
     mes "\"Now leave. Spread chaos with the spells I have taught you!\"";
     goto L_Close;