18 files changed, 18 insertions, 18 deletions
diff --git a/npc/003-1/aidan.txt b/npc/003-1/aidan.txt
index 6087b8789..08f4ab05c 100644
--- a/npc/003-1/aidan.txt
+++ b/npc/003-1/aidan.txt
@@ -178,7 +178,7 @@ L_Finish:
     close;
 
 OnInit:
-    .@npcId = getnpcid(0, .name$);
+    .@npcId = getnpcid(.name$);
     setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
     setunitdata(.@npcId, UDT_HEADMIDDLE, LegionCopperArmor);
     setunitdata(.@npcId, UDT_HEADBOTTOM, CottonTrousers);
diff --git a/npc/003-1/ched.txt b/npc/003-1/ched.txt
index 60a041bea..244b8901a 100644
--- a/npc/003-1/ched.txt
+++ b/npc/003-1/ched.txt
@@ -148,7 +148,7 @@ L_Autumn:
     close;
 
 OnInit:
-    .@npcId = getnpcid(0, .name$);
+    .@npcId = getnpcid(.name$);
     setunitdata(.@npcId, UDT_HEADTOP, SamuraiHelmet);
     setunitdata(.@npcId, UDT_HEADMIDDLE, SilkRobe);
     setunitdata(.@npcId, UDT_HEADBOTTOM, NPCEyes);
diff --git a/npc/003-1/eomie.txt b/npc/003-1/eomie.txt
index 8de219162..dac04c054 100644
--- a/npc/003-1/eomie.txt
+++ b/npc/003-1/eomie.txt
@@ -82,7 +82,7 @@ L_Gift:
     close;
 
 OnInit:
-    .@npcId = getnpcid(0, .name$);
+    .@npcId = getnpcid(.name$);
     //setunitdata(.@npcId, UDT_HEADTOP, PinkieHat);
     setunitdata(.@npcId, UDT_HEADMIDDLE, ValentineDress);
     setunitdata(.@npcId, UDT_HEADBOTTOM, CottonTrousers);
diff --git a/npc/003-1/gladys.txt b/npc/003-1/gladys.txt
index 9dc6ad9dd..7874c28e5 100644
--- a/npc/003-1/gladys.txt
+++ b/npc/003-1/gladys.txt
@@ -85,7 +85,7 @@ L_Close:
     close;
 
 OnInit:
-    .@npcId = getnpcid(0, "Gladys");
+    .@npcId = getnpcid("Gladys");
     setunitdata(.@npcId, UDT_HEADTOP, TrapperHat); // Whaaaaaaaaat
     setunitdata(.@npcId, UDT_HEADMIDDLE, ValentineDress);
     setunitdata(.@npcId, UDT_HEADBOTTOM, CottonTrousers);
diff --git a/npc/003-1/inac.txt b/npc/003-1/inac.txt
index 37ae82899..689f48efc 100644
--- a/npc/003-1/inac.txt
+++ b/npc/003-1/inac.txt
@@ -24,7 +24,7 @@
     close;
 
 OnInit:
-    .@npcId = getnpcid(0, .name$);
+    .@npcId = getnpcid(.name$);
     setunitdata(.@npcId, UDT_HEADTOP, Bandana);
     setunitdata(.@npcId, UDT_HEADMIDDLE, VneckJumper);
     setunitdata(.@npcId, UDT_HEADBOTTOM, CottonTrousers);
diff --git a/npc/003-1/inar.txt b/npc/003-1/inar.txt
index b45f8f8ae..54bcd1687 100644
--- a/npc/003-1/inar.txt
+++ b/npc/003-1/inar.txt
@@ -21,7 +21,7 @@ L_Close:
     close;
 
 OnInit:
-    .@npcId = getnpcid(0, .name$);
+    .@npcId = getnpcid(.name$);
     setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
     setunitdata(.@npcId, UDT_HEADMIDDLE, SilkRobe);
     //setunitdata(.@npcId, UDT_HEADBOTTOM, LeatherTrousers); // TODO
diff --git a/npc/003-1/ishi.txt b/npc/003-1/ishi.txt
index 1f7febe04..9d5d33c8d 100644
--- a/npc/003-1/ishi.txt
+++ b/npc/003-1/ishi.txt
@@ -221,7 +221,7 @@ L_Give_all:
     close;
 
 OnInit:
-    .@npcId = getnpcid(0, .name$);
+    .@npcId = getnpcid(.name$);
     //setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
     setunitdata(.@npcId, UDT_HEADMIDDLE, LegionCopperArmor);
     setunitdata(.@npcId, UDT_HEADBOTTOM, CottonTrousers);
diff --git a/npc/003-1/itka.txt b/npc/003-1/itka.txt
index 20caf7935..ae96c8b01 100644
--- a/npc/003-1/itka.txt
+++ b/npc/003-1/itka.txt
@@ -16,7 +16,7 @@
     close;
 
 OnInit:
-    .@npcId = getnpcid(0, .name$);
+    .@npcId = getnpcid(.name$);
     setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
     setunitdata(.@npcId, UDT_HEADMIDDLE, VneckSweater);
     setunitdata(.@npcId, UDT_HEADBOTTOM, RaidTrousers);
diff --git a/npc/003-1/jakod.txt b/npc/003-1/jakod.txt
index 5faf36cf1..6800e5b37 100644
--- a/npc/003-1/jakod.txt
+++ b/npc/003-1/jakod.txt
@@ -81,7 +81,7 @@ L_Tier2:
     close;
 
 OnInit:
-    .@npcId = getnpcid(0, .name$);
+    .@npcId = getnpcid(.name$);
     setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
     setunitdata(.@npcId, UDT_HEADMIDDLE, ForestArmor);
     setunitdata(.@npcId, UDT_HEADBOTTOM, JeansShorts);
diff --git a/npc/003-1/lieutenantdausen.txt b/npc/003-1/lieutenantdausen.txt
index 263e73673..7fab08921 100644
--- a/npc/003-1/lieutenantdausen.txt
+++ b/npc/003-1/lieutenantdausen.txt
@@ -551,7 +551,7 @@ OnInit:
 
     // Check items.xml for info about this.
     // NOTE: Why Dausen item list is on Philip...?
-    .@npcId = getnpcid(0, "Lieutenant Dausen");
+    .@npcId = getnpcid("Lieutenant Dausen");
     setunitdata(.@npcId, UDT_HEADTOP, Bull);
     setunitdata(.@npcId, UDT_HEADMIDDLE, LegionTrainingShirt);
     setunitdata(.@npcId, UDT_HEADBOTTOM, RaidTrousers);
diff --git a/npc/003-1/mahoud.txt b/npc/003-1/mahoud.txt
index 73d97dcb4..61a126909 100644
--- a/npc/003-1/mahoud.txt
+++ b/npc/003-1/mahoud.txt
@@ -45,7 +45,7 @@ OnInit:
     .sex = G_MALE;
     .distance = 7;
 
-    .@npcId = getnpcid(0, .name$);
+    .@npcId = getnpcid(.name$);
     // Check items.xml for info about this
     setunitdata(.@npcId, UDT_HEADTOP, InfantryHelmet);
     setunitdata(.@npcId, UDT_HEADMIDDLE, SailorShirt);
diff --git a/npc/003-1/malivox.txt b/npc/003-1/malivox.txt
index 95bc0981a..0a06bd038 100644
--- a/npc/003-1/malivox.txt
+++ b/npc/003-1/malivox.txt
@@ -89,7 +89,7 @@ L_Quit:
     goodbye;
 
 OnInit:
-    .@npcId = getnpcid(0, .name$);
+    .@npcId = getnpcid(.name$);
     setunitdata(.@npcId, UDT_HEADTOP, FancyHat);
     setunitdata(.@npcId, UDT_HEADMIDDLE, SailorShirt);
     setunitdata(.@npcId, UDT_HEADBOTTOM, BromenalPants);
diff --git a/npc/003-1/neko.txt b/npc/003-1/neko.txt
index de1f5e292..08bf2c9cd 100644
--- a/npc/003-1/neko.txt
+++ b/npc/003-1/neko.txt
@@ -55,7 +55,7 @@
     close;
 
 OnInit:
-    .@npcId = getnpcid(0, .name$);
+    .@npcId = getnpcid(.name$);
     setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
     setunitdata(.@npcId, UDT_HEADMIDDLE, SilkRobe);
     //setunitdata(.@npcId, UDT_HEADBOTTOM, LeatherTrousers); // FIXME: LeatherTrousers are BROKEN!
diff --git a/npc/003-1/ninathetraveler.txt b/npc/003-1/ninathetraveler.txt
index 83fca7270..5ef8760ab 100644
--- a/npc/003-1/ninathetraveler.txt
+++ b/npc/003-1/ninathetraveler.txt
@@ -90,7 +90,7 @@ L_Close:
     close;
 
 OnInit:
-    .@npcId = getnpcid(0, .name$);
+    .@npcId = getnpcid(.name$);
     setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
     setunitdata(.@npcId, UDT_HEADMIDDLE, UglyChristmasSweater);
     setunitdata(.@npcId, UDT_HEADBOTTOM, JeansShorts);
diff --git a/npc/003-1/sarah.txt b/npc/003-1/sarah.txt
index 4034f4fbd..5063c97c6 100644
--- a/npc/003-1/sarah.txt
+++ b/npc/003-1/sarah.txt
@@ -73,7 +73,7 @@
     close;
 
 OnInit:
-    .@npcId = getnpcid(0, .name$);
+    .@npcId = getnpcid(.name$);
     setunitdata(.@npcId, UDT_HEADTOP, TerraniteArmor);
     setunitdata(.@npcId, UDT_HEADMIDDLE, RaidTrousers);
     setunitdata(.@npcId, UDT_HEADBOTTOM, NPCEyes);
diff --git a/npc/003-1/silvia.txt b/npc/003-1/silvia.txt
index 9c0166886..ac8218669 100644
--- a/npc/003-1/silvia.txt
+++ b/npc/003-1/silvia.txt
@@ -80,7 +80,7 @@ L_Close:
     close;
 
 OnInit:
-    .@npcId = getnpcid(0, .name$);
+    .@npcId = getnpcid(.name$);
     setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
     setunitdata(.@npcId, UDT_HEADMIDDLE, SilkRobe);
     //setunitdata(.@npcId, UDT_HEADBOTTOM, LeatherTrousers); // TODO
diff --git a/npc/003-1/swezanne.txt b/npc/003-1/swezanne.txt
index 1268703e6..bacae524a 100644
--- a/npc/003-1/swezanne.txt
+++ b/npc/003-1/swezanne.txt
@@ -94,7 +94,7 @@ L_Close:
     close;
 
 OnInit:
-    .@npcId = getnpcid(0, .name$);
+    .@npcId = getnpcid(.name$);
     setunitdata(.@npcId, UDT_HEADTOP, BromenalChest);
     setunitdata(.@npcId, UDT_HEADMIDDLE, CottonTrousers);
     setunitdata(.@npcId, UDT_HEADBOTTOM, NPCEyes);
diff --git a/npc/003-1/tinris.txt b/npc/003-1/tinris.txt
index 75a30c80c..7f4c0f433 100644
--- a/npc/003-1/tinris.txt
+++ b/npc/003-1/tinris.txt
@@ -160,7 +160,7 @@ L_Lying:
     close;
 
 OnInit:
-    .@npcId = getnpcid(0, .name$);
+    .@npcId = getnpcid(.name$);
     //setunitdata(.@npcId, UDT_HEADTOP, 2929); // TODO: This NPC is an Elf and therefore, CANNOT use NPCEyes.
     setunitdata(.@npcId, UDT_HEADMIDDLE, ForestArmor);
     setunitdata(.@npcId, UDT_HEADBOTTOM, CottonTrousers);