5 files changed, 19 insertions, 13 deletions
diff --git a/npc/000-2-0/_import.txt b/npc/000-2-0/_import.txt
index b64f95c7..832013d6 100644
--- a/npc/000-2-0/_import.txt
+++ b/npc/000-2-0/_import.txt
@@ -1,5 +1,4 @@
 // Map 000-2-0: La Johanne, First Deck
-map: 000-2-0.gat
 npc: npc/000-2-0/_warps.txt
 npc: npc/000-2-0/billybons.txt
 npc: npc/000-2-0/doors.txt
diff --git a/npc/000-2-0/billybons.txt b/npc/000-2-0/billybons.txt
index 237e5c26..0da101d9 100644
--- a/npc/000-2-0/billybons.txt
+++ b/npc/000-2-0/billybons.txt
@@ -4,7 +4,9 @@
 // Description:
 //    Drunk easteregg telling about the player's past.
 
-000-2-0.gat,20,23,0,1	script	Billy Bons	311;3,{
+// Size = 3
+// Gender = 1
+000-2-0,20,23,0	script	Billy Bons	311,{
 
     if (rand(5) == 2) goto L_Hic;
 
diff --git a/npc/000-2-0/doors.txt b/npc/000-2-0/doors.txt
index 7cf311a6..3bb17f4f 100644
--- a/npc/000-2-0/doors.txt
+++ b/npc/000-2-0/doors.txt
@@ -16,11 +16,12 @@
 //    11   Need to see Julia
 //    12   Has been registered by Julia
 
-000-2-0.gat,20,28,0,1	script	AreaNPC	0,0,0,{
+// Gender = 1
+000-2-0,20,28,0	script	AreaNPC	32767,0,0,{
 
 OnTouch:
     set @nard, getq(ShipQuests_Nard);
-    if (@nard > 0 && countitem("JohanneKey") > 0) goto L_Key;
+    if (@nard > 0 && countitemcolor("JohanneKey") > 0) goto L_Key;
 //  if (@nard == 2) goto L_GotoNard;
 //  if (@nard == 3) goto L_End;
 
@@ -54,7 +55,8 @@ L_End:
     close;
 }
 
-000-2-0.gat,33,28,0,1	script	AreaNPC	0,0,0,{
+// Gender = 1
+000-2-0,33,28,0	script	AreaNPC	32767,0,0,{
 
 OnTouch:
     set @julia, getq(ShipQuests_Julia);
diff --git a/npc/000-2-0/julia.txt b/npc/000-2-0/julia.txt
index b37efcab..7ed69ce3 100644
--- a/npc/000-2-0/julia.txt
+++ b/npc/000-2-0/julia.txt
@@ -32,8 +32,10 @@
 //    24   ChefGado Quest completed and "Introduction" chapter finalized.
 //    25   Reward taken from the box.
 
-000-2-0.gat,27,24,0,0	script	Julia	304,2,10;10,{
-    setskill 1, 1; // Add Emote skill.
+// Size = 10
+// Gender = 0
+000-2-0,27,24,0	script	Julia	304,2,10,{
+    addtoskill 1, 1; // Add Emote skill.
 
     mesn;
     mesq lg("Hello dear!");
@@ -48,8 +50,8 @@
 L_Menu:
     menu
         rif(@q3 == 3 && @q2 == 0, l("I heard rumors about some old hostilities between you and Gado. Are they true?")), L_Rumors,
-        rif(@q2 == 2 && countitem("PoisonedDish", 1), l("Well... No wait, I have something for you but you shouldn't eat it... I'm taking it back to the kitchen.")), L_Regret,
-        rif(@q2 == 2 && countitem("PoisonedDish", 1), l("I have brought you a tasty present for your delicate mouth.")), L_PoisonJulia,
+        rif(@q2 == 2 && countitemcolor("PoisonedDish", 1), l("Well... No wait, I have something for you but you shouldn't eat it... I'm taking it back to the kitchen.")), L_Regret,
+        rif(@q2 == 2 && countitemcolor("PoisonedDish", 1), l("I have brought you a tasty present for your delicate mouth.")), L_PoisonJulia,
         lg("I made a mistake, I would like to change my language."), L_ChooseLang,
         l("Could you explain to me where I am?"), L_WhereIam,
         l("What happened to me?"), L_What,
@@ -208,7 +210,7 @@ L_PoisonJulia:
     mesq l("Seems yummy! Let me taste it!");
     next;
     mesq l("Hmmm, hm... *cough*, *cough*, *burp*, *cough*. What... What is that?!... *cough*, *burp*... Damn Gado... *cough*");
-    if (countitem("PoisonedDish") > 0) delitem "PoisonedDish", 1;
+    if (countitemcolor("PoisonedDish") > 0) delitem "PoisonedDish", 1;
     setq ShipQuests_ChefGado, 3;
 
     close;
@@ -229,7 +231,7 @@ L_Regret:
     mesq l("Take this money for your wise choice. But do not try it again. The open sea has been merciful with you once... Do not further tempt the fates!");
 
     setq ShipQuests_ChefGado, 5;
-    set zeny, zeny + 200;
+    set Zeny, Zeny + 200;
     message strcharinfo(0), l("You receive @@ E!", 200);
     getexp 15, 0;
 
@@ -264,7 +266,7 @@ L_Rumors:
     mesq l("Take this money as a reward for your nice words.");
 
     setq ShipQuests_ChefGado, 6;
-    set zeny, zeny + 100;
+    set Zeny, Zeny + 100;
     message strcharinfo(0), l("You receive @@ E!", 100);
     getexp 8, 0;
 
diff --git a/npc/000-2-0/note.txt b/npc/000-2-0/note.txt
index 95f19646..22c562ff 100644
--- a/npc/000-2-0/note.txt
+++ b/npc/000-2-0/note.txt
@@ -6,7 +6,8 @@
 // Description:
 //    A small note presenting the 6 main rules of Evol Online.
 
-000-2-0.gat,29,25,0	script	Note	116;2,{
+// Size = 2
+000-2-0,29,25,0	script	Note	116,{
     mesn "Narrator";
     mes col(l("There is a paper with some rules written on it."), 9);
     next;