7 files changed, 13 insertions, 13 deletions
diff --git a/world/map/npc/009-2/drunks.txt b/world/map/npc/009-2/drunks.txt
index d97100ac..73158c14 100644
--- a/world/map/npc/009-2/drunks.txt
+++ b/world/map/npc/009-2/drunks.txt
@@ -1,6 +1,6 @@
 //Left drinking contest guy
 
-009-2.gat,65,55,0|script|Drinker|121,
+009-2.gat,65,55,0|script|Drinker#1|121,
 {
     mes "[Binge Drinker]";
     mes "\"Ha! I'll drink muuuch mo.. more than you! Im not ooone biiit dr...dr..unk!\"";
@@ -9,7 +9,7 @@
 
 //Right drinking contest guy
 
-009-2.gat,68,55,0|script|Drinker|121,
+009-2.gat,68,55,0|script|Drinker#2|121,
 {
     mes "[Binge Drinker]";
     mes "\"I can still drink more! Better give up you... you... teelotaler! MORE BEER MELINDA!\"";
diff --git a/world/map/npc/009-2/mapflags.txt b/world/map/npc/009-2/mapflags.txt
index 84ee64b6..81cb5f02 100644
--- a/world/map/npc/009-2/mapflags.txt
+++ b/world/map/npc/009-2/mapflags.txt
@@ -1,2 +1,2 @@
-009-2.gat mapflag no_player_drops
-009-2.gat mapflag town
+009-2.gat|mapflag|no_player_drops
+009-2.gat|mapflag|town
diff --git a/world/map/npc/009-2/misc.txt b/world/map/npc/009-2/misc.txt
index 5c80dc90..7af10c83 100644
--- a/world/map/npc/009-2/misc.txt
+++ b/world/map/npc/009-2/misc.txt
@@ -1,6 +1,6 @@
 //Note in bar
 
-009-2.gat,54,49,0|script|Note|400,
+009-2.gat,54,49,0|script|Note#bar|400,
 {
     mes "[Note]";
     mes "\"We refuse service to anyone who:\"";
diff --git a/world/map/npc/009-2/nurse.txt b/world/map/npc/009-2/nurse.txt
index d89b30d4..5249819d 100644
--- a/world/map/npc/009-2/nurse.txt
+++ b/world/map/npc/009-2/nurse.txt
@@ -1,4 +1,4 @@
- //######################################################################################
+//######################################################################################
 //# Nurse
 //# AUTHORS:         Jenalya and Pjotr Orial
 //# REVIEWED BY:
diff --git a/world/map/npc/009-2/olana.txt b/world/map/npc/009-2/olana.txt
index d528cc41..3e7be881 100644
--- a/world/map/npc/009-2/olana.txt
+++ b/world/map/npc/009-2/olana.txt
@@ -82,9 +82,9 @@ L_Worried:
 L_See:
     if (gotcherry == 1)
         goto L_Task;
-    if (countitem("cherry") < @Cherry_Amount)
+    if (countitem("Cherry") < @Cherry_Amount)
         goto L_Worried;
-    delitem "cherry", @Cherry_Amount;
+    delitem "Cherry", @Cherry_Amount;
     menu
         "Hi, Rossy asked me to give you this. She says it is a gift from both her and Julia.", -;
     mes "[Olana]";
@@ -147,7 +147,7 @@ L_RG:
     close;
 
 L_RC:
-    if(countitem("redrose") < @RedRose_Amount)
+    if(countitem("RedRose") < @RedRose_Amount)
         goto L_RG;
     mes "[Olana]";
     set Rossy_Quest, 10;
diff --git a/world/map/npc/009-2/selim.txt b/world/map/npc/009-2/selim.txt
index 055e54eb..dee87a8e 100644
--- a/world/map/npc/009-2/selim.txt
+++ b/world/map/npc/009-2/selim.txt
@@ -90,13 +90,13 @@ L_miniskirt:
 L_tanktop:
     set @del, 688;
     set @new, 2090;
-    set @name$, "tanktop";
+    set @name$, "tank top";
     goto L_picked_item;
 
 L_tanktop_short:
     set @del, 689;
     set @new, 2120;
-    set @name$, "short tanktop";
+    set @name$, "short tank top";
     goto L_picked_item;
 
 L_robe:
diff --git a/world/map/npc/009-2/shops.txt b/world/map/npc/009-2/shops.txt
index c6267ceb..7837b816 100644
--- a/world/map/npc/009-2/shops.txt
+++ b/world/map/npc/009-2/shops.txt
@@ -10,7 +10,7 @@
 
 // Receptionist
 // Offers the player to rest at the inn for 100gp
-009-2.gat,50,48,0|script|Receptionist|108,
+009-2.gat,50,48,0|script|Receptionist#inn|108,
 {
     set @npcname$, "Receptionist";
     set @cost, 100;
@@ -27,4 +27,4 @@
 
 // General Store
 // Sells various things, many not sold elsewhere
-009-2.gat,32,99,0|shop|General Store|112,Milk :-1,BottleOfWater :-1,CottonShirt :-1,CottonShorts :-1,Boots :-1,SerfHat :-1,CottonHeadband :-1,CottonGloves :-1
+009-2.gat,32,99,0|shop|General Store#hurnscald|112,Milk :-1,BottleOfWater :-1,CottonShirt :-1,CottonShorts :-1,Boots :-1,SerfHat :-1,CottonHeadband :-1,CottonGloves :-1