Call all functions directly (without callfunc).

27 files changed, 44 insertions, 45 deletions

diff --git a/npc/000-0-0/q'onan.txt b/npc/000-0-0/q'onan.txt
index 02f7602e..1dc1ae29 100644
--- a/npc/000-0-0/q'onan.txt
+++ b/npc/000-0-0/q'onan.txt
@@ -6,7 +6,7 @@
 //    Sleeping and snoring NPC.
 
 000-0-0,29,28,0	script	Q'Onan#000-0-0	402,{
-    callfunc "Asleep";
+    Asleep;
     close;
 
 OnInit:
diff --git a/npc/000-0/sailors.txt b/npc/000-0/sailors.txt
index 22196aa8..a0534ce0 100644
--- a/npc/000-0/sailors.txt
+++ b/npc/000-0/sailors.txt
@@ -10,7 +10,7 @@
 000-0,23,20,0	script	Sailors	405,6,6,{
 
 OnTouch:
-    callfunc "CheckClientVersion";
+    CheckClientVersion;
     requestlang .@lang;
     if (.@lang >= 0 && .@lang <= 9) Lang = .@lang;
 
diff --git a/npc/000-1/ale.txt b/npc/000-1/ale.txt
index 8b8cb4c6..5509d571 100644
--- a/npc/000-1/ale.txt
+++ b/npc/000-1/ale.txt
@@ -31,7 +31,7 @@
     mesq l("Hmm... Let's see, take this one.");
     next;
 
-    callfunc "InventoryPlace", 714, 1;
+    InventoryPlace 714, 1;
 
     setq ShipQuests_Ale, 1;
     getitem "AquadaBox", 1;
@@ -43,7 +43,7 @@
     close;
 
 L_CallFunc:
-    callfunc "SailorFood";
+    SailorFood;
 
     menu
         rif(getq(ShipQuests_Gugli) > 1, l("Task is done.")), L_TaskDone,
diff --git a/npc/000-1/astapolos.txt b/npc/000-1/astapolos.txt
index 2fd93c09..7648ef52 100644
--- a/npc/000-1/astapolos.txt
+++ b/npc/000-1/astapolos.txt
@@ -58,7 +58,7 @@
     mesq lg("You have been so nice to me. So please, take one.");
     next;
 
-    callfunc "InventoryPlace", 715, 1;
+    InventoryPlace 715, 1;
 
     setq ShipQuests_Astapolos, 1;
     getitem "CroconutBox", 1;
@@ -70,7 +70,7 @@
     close;
 
 L_CallFunc:
-    callfunc "SailorFood";
+    SailorFood;
 
     menu
         rif(getq(ShipQuests_Gugli) > 1, l("Task is done.")), L_TaskDone,
diff --git a/npc/000-1/chest.txt b/npc/000-1/chest.txt
index 32f0f212..8871fefa 100644
--- a/npc/000-1/chest.txt
+++ b/npc/000-1/chest.txt
@@ -24,7 +24,7 @@
 L_Give:
     if (.@q > 0) goto L_Close;
 
-    callfunc "InventoryPlace", 514, 1;
+    InventoryPlace 514, 1;
 
     setq ShipQuests_TreasureChest, 1;
 
diff --git a/npc/000-1/cookiemaster.txt b/npc/000-1/cookiemaster.txt
index c4db33a6..9b48ce20 100644
--- a/npc/000-1/cookiemaster.txt
+++ b/npc/000-1/cookiemaster.txt
@@ -179,7 +179,7 @@ L_Reward:
 
     set .@item, 517;
     set .@count, 1;
-    callfunc "InventoryPlace", 517, 1;
+    InventoryPlace 517, 1;
 
     setq General_Cookies, 1;
     getitem "DeliciousCookie", 1;
diff --git a/npc/000-1/couwan.txt b/npc/000-1/couwan.txt
index f2158261..bc312a32 100644
--- a/npc/000-1/couwan.txt
+++ b/npc/000-1/couwan.txt
@@ -43,7 +43,7 @@
     mesq l("Yeye ask too much but do too little. Take this box and stop talking.");
     next;
 
-    callfunc "InventoryPlace", 713, 1;
+    InventoryPlace 713, 1;
 
     mesn "Narrator";
     mes col(l("Couwan hands you a box full of fish."), 9);
diff --git a/npc/000-1/gulukan.txt b/npc/000-1/gulukan.txt
index b372482b..e2ca632c 100644
--- a/npc/000-1/gulukan.txt
+++ b/npc/000-1/gulukan.txt
@@ -54,7 +54,7 @@ L_Continue2:
 
     set .@item, 715;
     set .@count, 1;
-    callfunc "InventoryPlace", 715, 1;
+    InventoryPlace 715, 1;
 
     setq ShipQuests_Gulukan, 1;
     getitem "CroconutBox", 1;
diff --git a/npc/000-1/jalad.txt b/npc/000-1/jalad.txt
index e484862f..a2ab8ca8 100644
--- a/npc/000-1/jalad.txt
+++ b/npc/000-1/jalad.txt
@@ -40,7 +40,7 @@ L_Continue:
     mesq l("Surely. Take this box full of @@s.", getitemlink("Plushroom"));
     next;
 
-    callfunc "InventoryPlace", 716, 1;
+    InventoryPlace 716, 1;
 
     setq ShipQuests_Jalad, 1;
     getitem "PlushroomBox", 1;
@@ -52,7 +52,7 @@ L_Continue:
     goto L_Close;
 
 L_CallFunc:
-    callfunc "SailorFood";
+    SailorFood;
 
     menu
         rif(getq(ShipQuests_Gugli) > 1, l("Task is done.")), L_TaskDone,
@@ -117,7 +117,7 @@ L_TaskDone:
     mesq l("Perfect!");
 
 L_Close:
-    callfunc "GoodBye";
+    GoodBye;
     close;
 
 OnInit:
diff --git a/npc/000-1/lean.txt b/npc/000-1/lean.txt
index f264fae4..d73c08b0 100644
--- a/npc/000-1/lean.txt
+++ b/npc/000-1/lean.txt
@@ -59,7 +59,7 @@ L_Sailors:
     close;
 
 L_Close:
-    callfunc "GoodBye";
+    GoodBye;
     close;
 
 OnInit:
diff --git a/npc/000-1/max.txt b/npc/000-1/max.txt
index 42f881e0..36ed3db8 100644
--- a/npc/000-1/max.txt
+++ b/npc/000-1/max.txt
@@ -103,5 +103,5 @@ OnInit:
     end;
 
 L_Quit:
-    callfunc "GoodBye";
+    GoodBye;
 }
diff --git a/npc/000-1/muller.txt b/npc/000-1/muller.txt
index 8448b8f7..f63266d4 100644
--- a/npc/000-1/muller.txt
+++ b/npc/000-1/muller.txt
@@ -42,7 +42,7 @@
     mesq l("Well then... Take this one!");
     next;
 
-    callfunc "InventoryPlace", 716, 1;
+    InventoryPlace 716, 1;
 
     setq ShipQuests_QMuller, 1;
     getitem "PlushroomBox", 1;
@@ -54,7 +54,7 @@
     close;
 
 L_CallFunc:
-    callfunc "SailorFood";
+    SailorFood;
 
     menu
         rif(getq(ShipQuests_Gugli) > 1, l("Task is done.")), L_TaskDone,
@@ -114,7 +114,7 @@ L_TaskDone:
     mesq l("Good to hear!");
     next;
 
-    callfunc "GoodBye";
+    GoodBye;
 
 L_Quit:
     closedialog;
diff --git a/npc/000-1/sapartan.txt b/npc/000-1/sapartan.txt
index 693cd48e..76daf906 100644
--- a/npc/000-1/sapartan.txt
+++ b/npc/000-1/sapartan.txt
@@ -98,5 +98,5 @@ OnInit:
     end;
 
 L_Quit:
-    callfunc "GoodBye";
+    GoodBye;
 }
diff --git a/npc/000-1/silvio.txt b/npc/000-1/silvio.txt
index 78f17c1f..55b3cda2 100644
--- a/npc/000-1/silvio.txt
+++ b/npc/000-1/silvio.txt
@@ -133,7 +133,7 @@ L_Artis:
     next;
     mesq l("You should look at them when we arrive at the port, they are worth it, hehe...");
 
-    callfunc "GoodBye";
+    GoodBye;
 
 L_ForeverAlone:
     mes "";
diff --git a/npc/000-1/tibbo.txt b/npc/000-1/tibbo.txt
index 31e99250..31a92759 100644
--- a/npc/000-1/tibbo.txt
+++ b/npc/000-1/tibbo.txt
@@ -40,7 +40,7 @@
     mesq l("Bring this box to Gugli. He will be extremely happy!");
     next;
 
-    callfunc "InventoryPlace", 714, 1;
+    InventoryPlace 714, 1;
 
     setq ShipQuests_Tibbo, 1;
     getitem "AquadaBox", 1;
@@ -52,7 +52,7 @@
     goto L_Close;
 
 L_CallFunc:
-    callfunc "SailorFood";
+    SailorFood;
 
     menu
         rif(getq(ShipQuests_Gugli) > 1, l("Task is done.")), L_TaskDone,
@@ -109,7 +109,7 @@ L_TaskDone:
     close;
 
 L_Close:
-    callfunc "GoodBye";
+    GoodBye;
     close;
 
 OnInit:
diff --git a/npc/000-2-0/julia.txt b/npc/000-2-0/julia.txt
index ef869c61..69e1b373 100644
--- a/npc/000-2-0/julia.txt
+++ b/npc/000-2-0/julia.txt
@@ -63,8 +63,7 @@ L_Menu:
     goto L_ChooseLang;
 
 L_First:
-
-    callfunc "CheckClientVersion";
+    CheckClientVersion;
 
     mesn;
     mesq l("Hi, nice to see you!");
@@ -276,5 +275,5 @@ OnInit:
     end;
 
 L_Quit:
-    callfunc "GoodBye";
+    GoodBye;
 }
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:
diff --git a/npc/000-2-3/box.txt b/npc/000-2-3/box.txt
index 8ec15cca..f4bf2d1b 100644
--- a/npc/000-2-3/box.txt
+++ b/npc/000-2-3/box.txt
@@ -74,7 +74,7 @@ L_NoQuest:
     mesq l("Now go outside and talk with Gugli, he'll tell you what provisions we need.");
     next;
 
-    callfunc "InventoryPlace", 718, 1;
+    InventoryPlace 718, 1;
     setq ShipQuests_Nard, 1;
     getitem "JohanneKey", 1;
 
@@ -86,7 +86,7 @@ L_Give:
     mesn "Nard";
     mesq l("Congrats, you are now part of the crew. Thanks again for your help.");
 
-    callfunc "InventoryPlace", 2900, 1;
+    InventoryPlace 2900, 1;
 
     setq ShipQuests_Nard, 5;
     getitem "Bandana", 1;
diff --git a/npc/000-2-3/nard.txt b/npc/000-2-3/nard.txt
index e5106df4..6836d2b0 100644
--- a/npc/000-2-3/nard.txt
+++ b/npc/000-2-3/nard.txt
@@ -101,7 +101,7 @@ L_NeedContent:
     mesq l("Now go outside and talk with Gugli, he'll tell you what we need.");
     next;
 
-    callfunc "InventoryPlace", 718, 1;
+    InventoryPlace 718, 1;
 
     setq ShipQuests_Nard, 1;
     getitem "JohanneKey", 1;
diff --git a/npc/001-1/cookiemaster.txt b/npc/001-1/cookiemaster.txt
index 138132d6..de9b36f4 100644
--- a/npc/001-1/cookiemaster.txt
+++ b/npc/001-1/cookiemaster.txt
@@ -177,7 +177,7 @@ L_Reward:
 
     set .@item, 517;
     set .@count, 1;
-    callfunc "InventoryPlace", 517, 1;
+    InventoryPlace 517, 1;
 
     setq General_Cookies, 1;
     getitem "DeliciousCookie", 1;
@@ -242,7 +242,7 @@ L_LostCookie:
 
     set .@item, 517;
     set .@count, 1;
-    callfunc "InventoryPlace", 517, 1;
+    InventoryPlace 517, 1;
 
     getitem "DeliciousCookie", 1;
     npctalk3 l("You receive a @@!", getitemlink("DeliciousCookie"));
diff --git a/npc/scripts.conf b/npc/scripts.conf
index 6d4644ff..59275d45 100644
--- a/npc/scripts.conf
+++ b/npc/scripts.conf
@@ -1,8 +1,5 @@
 // This is the main script import file
 
-// Maps specific scripts
-import: npc/_import.txt
-
 // Item functions
 npc: npc/items/croconut.txt
 npc: npc/items/oldbook.txt
@@ -14,3 +11,6 @@ npc: npc/functions/inventoryplace.txt
 npc: npc/functions/goodbye.txt
 npc: npc/functions/sailordialogue.txt
 npc: npc/functions/savepoint.txt
+
+// Maps specific scripts
+import: npc/_import.txt