Call all functions directly (without callfunc).

7 files changed, 11 insertions, 11 deletions

diff --git a/npc/000-2-1/alige.txt b/npc/000-2-1/alige.txt
index 51f6a248..ca5c1a92 100644
--- a/npc/000-2-1/alige.txt
+++ b/npc/000-2-1/alige.txt
@@ -190,7 +190,7 @@ L_GiveFood:
 //  if (.@id == item's ID) then food is correct.
 // Do not put any other number than -1, 0, 1, 2 or the item's ID, that'll avoid confusion.
 
-    callfunc "InventoryPlace", 507, 3;
+    InventoryPlace 507, 3;
     delitem .@id, 1;
 
     setcamnpc;
diff --git a/npc/000-2-1/chefgado.txt b/npc/000-2-1/chefgado.txt
index c6b8545c..16ce2f01 100644
--- a/npc/000-2-1/chefgado.txt
+++ b/npc/000-2-1/chefgado.txt
@@ -121,7 +121,7 @@ L_OpenCroconut:
 L_GotAll:
     mes "";
 
-    callfunc "InventoryPlace", 717, 1;
+    InventoryPlace 717, 1;
 
     delitem "PiouLegs", 2;
     delitem "HalfCroconut", 1;
@@ -164,7 +164,7 @@ L_PoisonJulia:
     setq ShipQuests_ChefGado, 4;
     set Zeny, Zeny + 200;
     message strcharinfo(0), l("You receive @@ E!", 200);
-    callfunc "InventoryPlace", 502, 2;
+    InventoryPlace 502, 2;
     getitem "Bread", 1;
     getexp 15, 0;
 
diff --git a/npc/000-2-1/chest.txt b/npc/000-2-1/chest.txt
index 06a98003..bb4d1cdf 100644
--- a/npc/000-2-1/chest.txt
+++ b/npc/000-2-1/chest.txt
@@ -25,7 +25,7 @@ L_Give:
     if (.@q > 1) goto L_Quit;
     set .@item, 1300;
     set .@count, 2;
-    callfunc "InventoryPlace", 1300, 2;
+    InventoryPlace 1300, 2;
 
     setq ShipQuests_Arpan, 2;
     getitem "CreasedShirt", 1;
diff --git a/npc/000-2-1/devis.txt b/npc/000-2-1/devis.txt
index 2b59b02a..01a6fae0 100644
--- a/npc/000-2-1/devis.txt
+++ b/npc/000-2-1/devis.txt
@@ -7,7 +7,7 @@
 //    Sleeping and grumbling NPC.
 
 000-2-1,32,38,0	script	Devis	410,{
-    callfunc "Asleep";
+    Asleep;
     close;
 
 OnInit:
diff --git a/npc/000-2-1/knife.txt b/npc/000-2-1/knife.txt
index a696d59e..6ab34afc 100644
--- a/npc/000-2-1/knife.txt
+++ b/npc/000-2-1/knife.txt
@@ -29,7 +29,7 @@ L_Give:
     mes "";
     set .@item, 3500;
     set .@count, 1;
-    callfunc "InventoryPlace", 3500, 1;
+    InventoryPlace 3500, 1;
 
     setq ShipQuests_Knife, 1;
     getitem "Knife", 1;
diff --git a/npc/000-2-1/q'onan.txt b/npc/000-2-1/q'onan.txt
index 10a9b80d..2a428d47 100644
--- a/npc/000-2-1/q'onan.txt
+++ b/npc/000-2-1/q'onan.txt
@@ -6,7 +6,7 @@
 //    Sleeping and snoring NPC.
 
 000-2-1,53,38,0	script	Q'Onan#000-2-1	402,{
-    callfunc "Asleep";
+    Asleep;
     close;
 
 OnInit:
diff --git a/npc/000-2-1/savepoint.txt b/npc/000-2-1/savepoint.txt
index 5f65c252..12622152 100644
--- a/npc/000-2-1/savepoint.txt
+++ b/npc/000-2-1/savepoint.txt
@@ -5,7 +5,7 @@
 //    Saves locations in 000-2-1 map.
 
 000-2-1,40,37,0	script	#name1	901,{
-    callfunc "SavePoint", "000-2-1.gat", 40, 37;
+    SavePoint "000-2-1.gat", 40, 37;
     close;
 
 OnInit:
@@ -14,7 +14,7 @@ OnInit:
 }
 
 000-2-1,46,37,0	script	#name2	901,{
-    callfunc "SavePoint", "000-2-1.gat", 46, 37;
+    SavePoint "000-2-1.gat", 46, 37;
     close;
 
 OnInit:
@@ -23,7 +23,7 @@ OnInit:
 }
 
 000-2-1,50,38,0	script	#name3	901,{
-    callfunc "SavePoint", "000-2-1.gat", 50, 38;
+    SavePoint "000-2-1.gat", 50, 38;
     close;
 
 OnInit:
@@ -32,7 +32,7 @@ OnInit:
 }
 
 000-2-1,55,40,0	script	#name4	901,{
-    callfunc "SavePoint", "000-2-1.gat", 55, 40;
+    SavePoint "000-2-1.gat", 55, 40;
     close;
 
 OnInit: