2 files changed, 29 insertions, 29 deletions

diff --git a/world/map/npc/002-2/bleacher.txt b/world/map/npc/002-2/bleacher.txt
index e93201d2..213c96f8 100644
--- a/world/map/npc/002-2/bleacher.txt
+++ b/world/map/npc/002-2/bleacher.txt
@@ -140,70 +140,70 @@ L_sorcerer_robe:
     mes "\"Which one?\"";
     next;
     menu
-        "A red lined one.", L_red_lined_sorcerer_robe,
-        "A green lined one.", L_green_lined_sorcerer_robe,
-        "A dark blue lined one.", L_dark_blue_lined_sorcerer_robe,
-        "A yellow lined one.", L_yellow_lined_sorcerer_robe,
-        "A light blue lined one.", L_light_blue_lined_sorcerer_robe,
-        "A pink lined one.", L_pink_lined_sorcerer_robe,
-        "A black lined one.", L_black_lined_sorcerer_robe,
-        "An orange lined one.", L_orange_lined_sorcerer_robe,
-        "A purple lined one.", L_purple_lined_sorcerer_robe,
-        "A dark green lined one.", L_dark_green_lined_sorcerer_robe,
-        "A white lined one.", L_white_lined_sorcerer_robe,
+        "A red lined one.", L_red_lined,
+        "A green lined one.", L_green_lined,
+        "A dark blue lined one.", L_dark_blue_lined,
+        "A yellow lined one.", L_yellow_lined,
+        "A light blue lined one.", L_light_blue_lined,
+        "A pink lined one.", L_pink_lined,
+        "A black lined one.", L_black_lined,
+        "An orange lined one.", L_orange_lined,
+        "A purple lined one.", L_purple_lined,
+        "A dark green lined one.", L_dark_green_lined,
+        "A white lined one.", L_white_lined,
         "Nevermind.", L_Close;
 
-L_red_lined_sorcerer_robe:
+L_red_lined:
     set @normal, 798;
     set @dyeBase, 2220;
     goto L_choose_color;
 
-L_green_lined_sorcerer_robe:
+L_green_lined:
     set @normal, 5010;
     set @dyeBase, 5000;
     goto L_choose_color;
 
-L_dark_blue_lined_sorcerer_robe:
+L_dark_blue_lined:
     set @normal, 5021;
     set @dyeBase, 5011;
     goto L_choose_color;
 
-L_yellow_lined_sorcerer_robe:
+L_yellow_lined:
     set @normal, 5032;
     set @dyeBase, 5022;
     goto L_choose_color;
 
-L_light_blue_lined_sorcerer_robe:
+L_light_blue_lined:
     set @normal, 5043;
     set @dyeBase, 5033;
     goto L_choose_color;
 
-L_pink_lined_sorcerer_robe:
+L_pink_lined:
     set @normal, 5054;
     set @dyeBase, 5044;
     goto L_choose_color;
 
-L_black_lined_sorcerer_robe:
+L_black_lined:
     set @normal, 5065;
     set @dyeBase, 5055;
     goto L_choose_color;
 
-L_orange_lined_sorcerer_robe:
+L_orange_lined:
     set @normal, 5076;
     set @dyeBase, 5066;
     goto L_choose_color;
 
-L_purple_lined_sorcerer_robe:
+L_purple_lined:
     set @normal, 5087;
     set @dyeBase, 5077;
     goto L_choose_color;
 
-L_dark_green_lined_sorcerer_robe:
+L_dark_green_lined:
     set @normal, 5098;
     set @dyeBase, 5088;
     goto L_choose_color;
 
-L_white_lined_sorcerer_robe:
+L_white_lined:
     set @normal, 5109;
     set @dyeBase, 5099;
     goto L_choose_color;
diff --git a/world/map/npc/002-2/hetchel.txt b/world/map/npc/002-2/hetchel.txt
index 8aecea94..15fc61f9 100644
--- a/world/map/npc/002-2/hetchel.txt
+++ b/world/map/npc/002-2/hetchel.txt
@@ -72,7 +72,7 @@ L_Spants_Cry_2:
         "Sorry to bother, I'm just visiting.", L_Close,
         "I am looking for silk sheets, Lora Tay told me that I could find some in this market. Can you help?", L_main_menu,
         "Hey you have been crying so badly, can I help you somehow?", L_Spants_Reply_Cry,
-        "Give Hetchel something to dry her tears", L_Spants_Wipe_Tears;
+        "Give Hetchel something to dry her tears", L_Spants_Tears;
 
 L_Spants_Start:
     mes "[Hetchel the weaver]";
@@ -112,10 +112,10 @@ L_Spants_Cry_Cont_1:
     mes "";
     menu
         "\"Hey, what is the problem?\"", L_Spants_Reply_Cry,
-        "Give Hetchel something to dry her tears", L_Spants_Wipe_Tears,
+        "Give Hetchel something to dry her tears", L_Spants_Tears,
         "\"Oh really? Just sell me some Silk Sheets if you have them\"", L_main_menu;
 
-L_Spants_Wipe_Tears:
+L_Spants_Tears:
     mes "Choose the item you want to give her.";
     next;
     cleararray @items$, "", getarraysize(@items$);
@@ -126,14 +126,14 @@ L_Spants_Wipe_Tears:
     set @spants_wipe_thingy$, @item$;
     if (@spants_wipe_thingy$ == "") goto L_Close;
     if (countitem(@spants_wipe_thingy$) < 1) goto L_Spants_No_Item;
-    if (@spants_wipe_thingy$ == "RedCottonCloth") goto L_Spants_Wipe_Tears_Cont;
-    if (@spants_wipe_thingy$ == "RedHitchhikersTowel") goto L_Spants_Wipe_Tears_Towel;
+    if (@spants_wipe_thingy$ == "RedCottonCloth") goto L_Spants_Tears_Cont;
+    if (@spants_wipe_thingy$ == "RedHitchhikersTowel") goto L_Spants_Tears_Towel;
     mes "Hetchel looks at you, then looks at the" + @spants_wipe_thingy$ + ".";
     mes "She hangs her head and weeps more";
     mes "Red is the only color I have ever loved, bring me something red to dry my tears";
     goto L_Close;
 
-L_Spants_Wipe_Tears_Towel:
+L_Spants_Tears_Towel:
     mes "[Hetchel the weaver]";
     mes "";
     mes "\"No, I recognize this towel, it is one of those warping towels, are you trying to mess with me?\"";
@@ -143,7 +143,7 @@ L_Spants_No_Item:
     mes "Oh you do not have it.";
     goto L_Close;
 
-L_Spants_Wipe_Tears_Cont:
+L_Spants_Tears_Cont:
     mes "Hetchel dries her tears with the Red Piece of Cloth you gave her.";
     mes "This seems to have consoled her.";
     delitem "RedCottonCloth", 1;