Clear (most) new warnings

3 files changed, 36 insertions, 279 deletions

diff --git a/world/map/npc/010-2/chef.txt b/world/map/npc/010-2/chef.txt
index a128b094..1ea64fef 100644
--- a/world/map/npc/010-2/chef.txt
+++ b/world/map/npc/010-2/chef.txt
@@ -1,23 +1,5 @@
 010-2.gat,33,25,0|script|Chef#dimond|148,
 {
-// lines belong to Easter 2011:
-// set @month, 4;
-// set @start_day, 15;
-// set @end_day, 30;
-
-// if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 7) goto L_JellyBean;
-// if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 8) goto L_MakeJellyBean;
-// if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 9) goto L_SeeBunny;
-
-// lines belong to Easter 2012:
-//    if (!(gettime(6) == 3 && gettime(5) >= $@easter2012_start_day) && !(gettime(6) == 4 && gettime(5) <= $@easter2012_reward_end_day)) goto L_Begin;
-//    if (QUEST_Easter12 == 6) goto L_Easter2012_Begin;
-//    if (QUEST_Easter12 == 7) goto L_Easter2012_Wait;
-//    if (QUEST_Easter12 == 8) goto L_Easter2012Foolplayers;
-//    if (QUEST_Easter12 == 9) goto OnEaster2012Out;
-    goto L_Begin;
-
-L_Begin:
     mes "[Chef]";
     mes "";
     mes "\"I'm too busy right now to talk.\"";
@@ -138,233 +120,8 @@ L_bringit:
     mes "";
     mes "\"Bring it here when you do.\"";
     next;
-    goto L_End;
+    goto L_end;
 
-L_End:
-    close;
-
-L_JellyBean:
-    mes "[Chef]";
-    mes "";
-    mes "\"I can't talk right now... I'm too busy.\"";
-    next;
-    mes "\"Oh, wait. I see you are the adventurer who was speaking with the Easter Bunny. He has a really bad memory, you know? Every year he forgets who he needs to ask to get Jelly Beans, and every year an adventurer comes to my kitchen asking if I can help the Easter Bunny get some.\"";
-    next;
-    mes "\"Even though I am really busy this time of year, I will help you make some Jelly Beans to put in the basket if you wish. Just to keep the tradition alive...\"";
-    menu
-        "I would really appreciate that!", L_Next4,
-        "Nah, I decided not to do that stupid quest.", L_End;
-
-L_Next4:
-    set QUEST_Easter11, 8;
-    goto L_MakeJellyBean;
-
-L_MakeJellyBean:
-    mes "[Chef]";
-    mes "";
-    mes "\"I will need you to bring me some candies.\"";
-    mes "\"I think 15 should be enough.\"";
-    mes "\"Sea slimes seem to have those, so try them.\"";
-    mes "\"And because it's the holidays, I'll add in the other ingredient for free.\"";
-    menu
-        "I have some candies!", L_Next5,
-        "Ok, I will be back soon.", L_End,
-        "I changed my mind, forget about it.", L_End;
-
-L_Next5:
-    if(countitem("Candy") < 15)
-        goto L_EasterNotEnough;
-    if(countitem("Candy") >= 15)
-        goto L_EasterEnough;
-    close;
-
-L_EasterNotEnough:
-    mes "[Chef]";
-    mes "";
-    mes "\"You do not have enough candies for me to work with yet.\"";
-    mes "\"Please go get more.\"";
-    close;
-
-L_EasterEnough:
-    getinventorylist;
-    if (@inventorylist_count == 100 && countitem("Candy") > 15)
-        goto L_EasterTooMany;
-    if(countitem("Candy") < 15)
-        goto L_EasterNotEnough;
-    delitem "Candy", 15;
-    getitem "JellyBeans", 1;
-    set QUEST_Easter11, 9;
-    mes "[Chef]";
-    mes "";
-    mes "\"You have gathered enough candies for me to make the Jelly Beans.\"";
-    mes "He puts the candies into a pot and starts melting them.";
-    mes "He adds in some gooey stuff, then lets the solution cool for a moment before forming the Jelly Beans.";
-    mes "\"Here are your Jelly Beans.\"";
-    close;
-
-L_TooMany:
-    mes "[Chef]";
-    mes "";
-    mes "\"You don't have enough room for the Jelly Beans. Come back later.\"";
-    close;
-
-L_SeeBunny:
-    mes "[Chef]";
-    mes "";
-    mes "\"Oh yeah, you need to return to the Easter Bunny now.\"";
-    next;
-    goto L_Begin;
-
-// Lines below here belong to Easter 2012:
-
-L_Easter2012_Begin:
-    mes "[Chef]";
-    mes "\"Ahh, " + strcharinfo(0) + "! I really need to talk to you. Did the Easter Bunny give you a very thick and heavy pan?\"";
-    menu
-        "Yes, he did. Why?", L_Next12;
-
-L_Next12:
-    mes "[Chef]";
-    mes "\"Good to know! I am asking because now you are my only hope. I have invented the ultimate culinary wonder, a recipe for the most incredibly tasty food you can imagine!\"";
-    next;
-    mes "\"But here is the problem, to complete this recipe I need a very resistant pan, because in the process I need to use a very strong acid solution based on yeti saliva!\"";
-    next;
-    mes "\"Can you believe I ruined ALL of my pans and 17 infantry helmets while trying to cook it? That is why I am asking for this favor. Could you lend me your pan? I promise I will give you a jar of the final product.\"";
-    next;
-    mes "\"Oh, and I will need to keep it with me for a while, as the ingredients need to rest in the acid solution for a long time, but you can always come here to see how it is going.\"";
-    menu
-        "Ok, but I want my pan back when it is done!", L_Accept_Cooking,
-        "No way, I won't let you fill my hat with corrosive yeti saliva!", L_Next6;
-
-L_Next6:
-    mes "[Chef]";
-    mes "\"Ahh, don't say that! Please, think about it and come back if you change your mind.\"";
-    close;
-
-L_Accept_Cooking:
-    mes "[Chef]";
-    mes "\"Great! But I can't promise anything regarding your hat. What I can promise is: IF it works, you will eat the most spectacular food of all time! I won't say what it is, but it is going to be great! What do you say, are you sure?\"";
-    menu
-        "Ahh, just take the pan and do your thing.", L_Next7,
-        "No way!", L_Close;
-
-L_Next7:
-    if (countitem("PanHat") < 1)
-        goto L_No_PanHat;
-    delitem "PanHat", 1;
-    set QUEST_Easter12, 7;
-    mes "\"Very good! Now I just need to put the basic ingredients inside a metal pan filled with water, yeti saliva, a little bit of salt and finally... The secret ingredient!\"";
-    next;
-    mes "The chef turns his back to you so he can hide what he is using. But you can clearly distinguish a smell of coal...";
-    mes "\"Hahahah! And now we wait!\"";
-    close;
-
-L_Easter2012_Wait:
-    if ((gettime(6) == 4 && gettime(5) >= $@easter2012_reward_start_day))
-        goto L_Easter2012_Result;
-    mes "[Chef]";
-    mes "\"Be patient... The basic ingredients are not ready yet.\"";
-    close;
-
-L_Easter2012_Result:
-    set @temp, rand(99);
-    mes "[Chef]";
-    mes "\"Hey! I have some good news and some bad news... Which one do you want to hear first?\"";
-    menu
-        "The good one.", L_Next8,
-        "The bad one.", L_Next8,
-        "Oh no, I don't even want to hear!", L_Close;
-
-L_Next8:
-    if (@temp < 15) goto L_Easter2012_Lucky;
-    goto L_Easter2012_Unlucky;
-    close;
-
-L_Easter2012_Lucky:
-    mes "[Chef]";
-    mes "\"Wait! Did I mention bad news? I must be crazy... There is no bad news my friend! The ultimate pickled beets is now ready AND your pan is intact!\"";
-    next;
-    mes "\"Here! Take your pan back and a jar of the best pickled beets of the mana world!\"";
-    set QUEST_Easter12, 10;
-    getitem "PickledBeets", 1;
-    getitem "PanHat", 1;
-    close;
-
-L_Easter2012_Unlucky:
-    mes "[Chef]";
-    mes "\"Ahh, actually, it doesn't matter! The important thing is that the recipe was a success! I just can't believe how something can be so tasty!\"";
-    next;
-    menu
-        "Nice! Now, what about my hat?", L_Next9;
-
-L_Next9:
-    mes "\"Oh, that... Ehh, unfortunately, the pan is not anymore. It was completely destroyed by the time the pickled beets were ready! But don't worry, I will keep my promise and give you a jar of this culinary masterpiece!\"";
-    next;
-    menu
-        "Wait, wait... Are you saying I lost my hat?", L_Next10;
-
-L_Next10:
-    mes "[Chef]";
-    mes "\"Hmm, yes. But I must say I really appreciate your effort to help me! You sacrificed your cool hat in the name of the culinary arts, only a great person would do that!\"";
-    next;
-    menu
-        "But... I... My hat...", L_Next11;
-
-L_Next11:
-    mes "[Chef]";
-    mes "\"Here, take your pickled beets!\"";
-    getitem "PickledBeets", 1;
-    set QUEST_Easter12, 8;
-    close;
-
-OnEaster2012Out:
-    if (QUEST_Easter12 == 8)
-        set QUEST_Easter12, 9;
-    mes "[Chef]";
-    mes "\"Hey, I couldn't help but notice your sadness... You really like these silly hats, don't you? Well, since your hat is completely destroyed, just like all my pans, I can give you one of these nice cooking hats. But only if you give my jar of pickled beets back. What do you say?\"";
-    menu
-        "A chef hat for a jar of pickled beets? Of course I want!", L_GetChefhat,
-        "Ahh, keep you silly hat! The pickled beets are way better!", L_KeepBeets;
-
-L_GetChefhat:
-    if (countitem("PickledBeets") < 1)
-        goto L_No_Pickledbeets;
-    mes "[Chef]";
-    mes "\"Really? Well, if you are sure about that... Here is your hat!\"";
-    delitem "PickledBeets", 1;
-    getitem "ChefHat", 1;
-    set QUEST_Easter12, 10;
-    close;
-
-L_KeepBeets:
-    mes "[Chef]";
-    mes "\"Hmm, I see that at least you are a wise person. See you later!\"";
-    set QUEST_Easter12, 10;
-    close;
-
-L_No_PanHat:
-    mes "[Chef]";
-    mes "\"So? You said you have the pan, where is it?\"";
-    close;
-
-L_No_Pickledbeets:
-    mes "[Chef]";
-    mes "\"Hey, no pickled beets means no chef hat.\"";
-    close;
-
-L_Easter2012Foolplayers:
-    mes "The chef can't hear you. He keeps looking and feeling the scent of his new recipe.";
-    close;
-
-L_Close:
+L_end:
     close;
 }
-
-//010-2.gat,28,31,0|script|#chefproposition|32767,0,0
-//{
-//OnTouch:
-//    if (gettime(7) != $@easter2012_year || QUEST_Easter12 != 8 || !((gettime(6) == 4 && gettime(5) >= $@easter2012_reward_start_day) && (gettime(6) == 4 && gettime(5) <= $@easter2012_reward_end_day)))
-//        end;
-//    doevent "Chef::OnEaster2012Out";
-//    end;
-//}
diff --git a/world/map/npc/010-2/dimonds.txt b/world/map/npc/010-2/dimonds.txt
index e51213ae..1048a108 100644
--- a/world/map/npc/010-2/dimonds.txt
+++ b/world/map/npc/010-2/dimonds.txt
@@ -47,12 +47,12 @@
     set @month, 1;
     set @start_day, 24;
     set @end_day, 26;
-    if (gettime(6) != @month) goto no_event;
-    if (gettime(5) < @start_day) goto no_event;
-    if (gettime(5) > @end_day) goto no_event;
+    if (gettime(6) != @month) goto L_no_event;
+    if (gettime(5) < @start_day) goto L_no_event;
+    if (gettime(5) > @end_day) goto L_no_event;
     if (gettimetick(2)-TUT_var < 2*7*86400 ) //player must be created at least 2 weeks ago
-        goto no_event;
-    if (FLAGS & FLAG_HAS_BOWLER_BURNSDAY ) goto event_done;
+        goto L_no_event;
+    if (FLAGS & FLAG_HAS_BOWLER_BURNSDAY ) goto L_event_done;
     getinventorylist;
     if (@inventorylist_count == 100) goto L_Full_Inv;
 
@@ -67,140 +67,140 @@
     mes "\"Clos'd under hatches,\"";
     mes "\"Spairges about the brunstane cootie\"";
     mes "\"To scaud poor wretches!\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"Hear me, Auld Hangie, for a wee,\"";
     mes "\"An' let poor damned bodies be;\"";
     mes "\"I'm sure sma' pleasure it can gie,\"";
     mes "\"E'en to a deil,\"";
     mes "\"To skelp an' scaud poor dogs like me,\"";
     mes "\"An' hear us squeel!\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"Great is thy pow'r, an' great thy fame;\"";
     mes "\"Far ken'd an' noted is thy name;\"";
     mes "\"An' tho' yon lowin heugh's thy hame,\"";
     mes "\"Thou travels far;\"";
     mes "\"An' faith! thou's neither lag nor lame,\"";
     mes "\"Nor blate nor scaur.\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"Whyles, ranging like a roarin lion,\"";
     mes "\"For prey a' holes an' corners tryin;\"";
     mes "\"Whyles, on the strong-wing'd tempest flyin,\"";
     mes "\"Tirlin' the kirks;\"";
     mes "\"Whyles, in the human bosom pryin,\"";
     mes "\"Unseen thou lurks.\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"I've heard my rev'rend graunie say,\"";
     mes "\"In lanely glens ye like to stray;\"";
     mes "\"Or whare auld ruin'd castles gray\"";
     mes "\"Nod to the moon,\"";
     mes "\"Ye fright the nightly wand'rer's way\"";
     mes "\"Wi' eldritch croon.\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"When twilight did my graunie summon\"";
     mes "\"To say her pray'rs, douce honest woman!\"";
     mes "\"Aft yont the dike she's heard you bummin,\"";
     mes "\"Wi' eerie drone;\"";
     mes "\"Or, rustlin thro' the boortrees comin,\"";
     mes "\"Wi' heavy groan.\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"Ae dreary, windy, winter night,\"";
     mes "\"The stars shot down wi' sklentin light,\"";
     mes "\"Wi' you mysel I gat a fright,\"";
     mes "\"Ayont the lough;\"";
     mes "\"Ye like a rash-buss stood in sight,\"";
     mes "\"Wi' waving sugh.\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"The cudgel in my nieve did shake,\"";
     mes "\"Each bristl'd hair stood like a stake,\"";
     mes "\"When wi' an eldritch, stoor 'Quaick, quaick,'\"";
     mes "\"Amang the springs,\"";
     mes "\"Awa ye squatter'd like a drake,\"";
     mes "\"On whistling wings.\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"Let warlocks grim an' wither'd hags\"";
     mes "\"Tell how wi' you on ragweed nags\"";
     mes "\"They skim the muirs an' dizzy crags\"";
     mes "\"Wi' wicked speed;\"";
     mes "\"And in kirk-yards renew their leagues,\"";
     mes "\"Owre howket dead.\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"Thence, countra wives wi' toil an' pain\"";
     mes "\"May plunge an' plunge the kirn in vain;\"";
     mes "\"For oh! the yellow treasure's taen\"";
     mes "\"By witchin skill;\"";
     mes "\"An' dawtet, twal-pint hawkie's gaen\"";
     mes "\"As yell's the bill.\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"Thence, mystic knots mak great abuse,\"";
     mes "\"On young guidmen, fond, keen, an' croose;\"";
     mes "\"When the best wark-lume i' the house,\"";
     mes "\"By cantraip wit,\"";
     mes "\"Is instant made no worth a louse,\"";
     mes "\"Just at the bit.\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"When thowes dissolve the snawy hoord,\"";
     mes "\"An' float the jinglin icy-boord,\"";
     mes "\"Then water-kelpies haunt the foord\"";
     mes "\"By your direction,\"";
     mes "\"An' nighted trav'lers are allur'd\"";
     mes "\"To their destruction.\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"And aft your moss-traversing spunkies\"";
     mes "\"Decoy the wight that late an drunk is:\"";
     mes "\"The bleezin, curst, mischievous monkeys\"";
     mes "\"Delude his eyes,\"";
     mes "\"Till in some miry slough he sunk is,\"";
     mes "\"Ne'er mair to rise.\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"When Masons' mystic word an grip\"";
     mes "\"In storms an' tempests raise you up,\"";
     mes "\"Some cock or cat your rage maun stop,\"";
     mes "\"Or, strange to tell!\"";
     mes "\"The youngest brither ye wad whip\"";
     mes "\"Aff straught to hell!\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"Lang syne, in Eden'd bonie yard,\"";
     mes "\"When youthfu' lovers first were pair'd,\"";
     mes "\"An all the soul of love they shar'd,\"";
     mes "\"The raptur'd hour,\"";
     mes "\"Sweet on the fragrant flow'ry swaird,\"";
     mes "\"In shady bow'r;\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"Then you, ye auld snick-drawin dog!\"";
     mes "\"Ye cam to Paradise incog,\"";
     mes "\"And play'd on man a cursed brogue,\"";
     mes "\"(Black be your fa'!)\"";
     mes "\"An gied the infant warld a shog,\"";
     mes "\"Maist ruin'd a'.\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"D'ye mind that day, when in a bizz,\"";
     mes "\"Wi' reeket duds an reestet gizz,\"";
     mes "\"Ye did present your smoutie phiz\"";
     mes "\"Mang better folk,\"";
     mes "\"An' sklented on the man of Uz\"";
     mes "\"Your spitefu' joke?\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"An' how ye gat him i' your thrall,\"";
     mes "\"An' brak him out o' house and hal',\"";
     mes "\"While scabs and blotches did him gall,\"";
     mes "\"Wi' bitter claw,\"";
     mes "\"An' lows'd his ill-tongued, wicked scaul,\"";
     mes "\"Was warst ava?\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"But a' your doings to rehearse,\"";
     mes "\"Your wily snares an' fechtin fierce,\"";
     mes "\"Sin' that day Michael did you pierce,\"";
     mes "\"Down to this time,\"";
     mes "\"Wad ding a Lallan tongue, or Erse,\"";
     mes "\"In prose or rhyme.\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"An' now, Auld Cloots, I ken ye're thinkin,\"";
     mes "\"A certain Bardie's rantin, drinkin,\"";
     mes "\"Some luckless hour will send him linkin,\"";
     mes "\"To your black pit;\"";
     mes "\"But faith! he'll turn a corner jinkin,\"";
     mes "\"An' cheat you yet.\"";
-    callsub food_menu;
+    callsub S_food_menu;
     mes "\"But fare you weel, Auld Nickie-ben!\"";
     mes "\"O wad ye tak a thought an' men'!\"";
     mes "\"Ye aiblins might--I dinna ken--\"";
@@ -222,12 +222,12 @@ L_Next:
     set FLAGS, FLAGS | FLAG_HAS_BOWLER_BURNSDAY;
     close;
 
-no_event:
+L_no_event:
     mes "[Shannon]";
     mes "\"I'm a traveling poet and admirer of Robert Burns.\"";
     close;
 
-event_done:
+L_event_done:
     mes "[Shannon]";
     mes "\"Ah, my dear friend. Good to see you again in this remarkable time of the year.\"";
     next;
@@ -391,7 +391,7 @@ L_Full_Inv:
     mes "\"Maybe you should turn away from the mundane world and get rid of this burden to change your view to the beauty of poetry.\"";
     close;
 
-food_menu:
+S_food_menu:
     setarray @choice_idx, 0,0,0,0,0,0;
     setarray @choice$, "","","","","","";
 
diff --git a/world/map/npc/010-2/loratay.txt b/world/map/npc/010-2/loratay.txt
index 35cf3af7..f9467e40 100644
--- a/world/map/npc/010-2/loratay.txt
+++ b/world/map/npc/010-2/loratay.txt
@@ -368,7 +368,7 @@ L_proposal_retrieve_design:
     mes "\"May you go retrieve the design from Agostine?\"";
     next;
     menu
-        "Certainly I'll be back soon!", L_Close,
+        "Certainly I'll be back soon!", L_end,
         "Actually I want something else...", L_main_menu;
 
 L_proposal_bringing_design:
@@ -428,7 +428,7 @@ L_proposal_deliver_dress:
     mes "[Lora Tay the Seamstress]";
     mes "\"Please take the unfinished dress to him so he may finish the edges with the cloth.\"";
     menu
-        "I'm on my way.", L_Close,
+        "I'm on my way.", L_end,
         "I have a request...", L_main_menu;
 
 L_desert_hat:
@@ -441,7 +441,7 @@ L_desert_hat:
     setarray @item_names$, "Here is a Cotton Headband.", "Here is a Red Cotton Headband.", "Here is a Green Cotton Headband.", "Here is a Dark Blue Cotton Headband.", "Here is a Yellow Cotton Headband.", "Here is a Light Blue Cotton Headband.", "Here is a Pink Cotton Headband.", "Here is a Black Cotton Headband.", "Here is an Orange Cotton Headband.", "Here is a Puple Cotton Headband.", "Here is a Dark Green Cotton Headband.";
     set @items_nr, 11;
 
-    callsub SUB_pick_one_of_many_items;
+    callsub S_pick_one_of_many_items;
     if (@item == 0)
         goto L_main_menu;
     if (@item == 724)
@@ -497,7 +497,7 @@ L_trim:
     setarray @items, 1202, 2050, 2051, 2052, 2053, 2054, 2055, 2056, 2057, 2058, 2059, 688, 2090, 2091, 2092, 2093, 2094, 2095, 2096, 2097, 2098, 2099, 632, 2100, 2101, 2102, 2103, 2104, 2105, 2106, 2107, 2108, 2109, 648, 2180, 2181, 2182, 2183, 2184, 2185, 2186, 2187, 2188, 2189;
     setarray @item_names$, "Cotton Shirt", "Red Cotton Shirt", "Green Cotton Shirt", "Dark Blue Cotton Shirt", "Yellow Cotton Shirt", "Light Blue Cotton Shirt", "Pink Cotton Shirt", "Black Cotton Shirt", "Orange Cotton Shirt", "Purple Cotton Shirt", "Dark Green Cotton Shirt", "Tank Top", "Red Tank Top", "Green Tank Top", "Dark Blue Tank Top", "Yellow Tank Top", "Light Blue Tank Top", "Pink Tank Top", "Black Tank Top", "Orange Tank Top", "Purple Tank Top", "Dark Green Tank Top", "Cotton Skirt", "Red Cotton Skirt", "Green Cotton Skirt", "Dark Blue Cotton Skirt", "Yellow Cotton Skirt", "Light Blue Cotton Skirt", "Pink Cotton Skirt", "Black Cotton Skirt", "Orange Cotton Skirt", "Purple Cotton Skirt", "Dark Green Cotton Skirt", "Cotton Trousers", "Red Cotton Trousers", "Green Cotton Trousers", "Dark Blue Cotton Trousers", "Yellow Cotton Trousers", "Light Blue Cotton Trousers", "Pink Cotton Trousers", "Black Cotton Trousers", "Orange Cotton Trousers", "Purple Cotton Trousers", "Dark Green Cotton Trousers";
     set @items_nr, 44;
-    callsub SUB_pick_one_of_many_items;
+    callsub S_pick_one_of_many_items;
     if (@item == 0)
         goto L_main_menu;
     set @delitem, @item;
@@ -557,7 +557,7 @@ L_lengthen:
     setarray @item_names$, "Tank Top", "Red Tank Top", "Green Tank Top", "Dark Blue Tank Top", "Yellow Tank Top", "Light Blue Tank Top", "Pink Tank Top", "Black Tank Top", "Orange Tank Top", "Purple Tank Top", "Dark Green Tank Top", "Short Tank Top", "Red Short Tank Top", "Green Short Tank Top", "Dark Blue Short Tank Top", "Yellow Short Tank Top", "Light Blue Short Tank Top", "Pink Short Tank Top", "Black Short Tank Top", "Orange Short Tank Top", "Purple Short Tank Top", "Dark Green Short Tank Top", "Miniskirt", "Red Miniskirt", "Green Miniskirt", "Dark Blue Miniskirt", "Yellow Miniskirt", "Light Blue Miniskirt", "Pink Miniskirt", "Black Miniskirt", "Orange Miniskirt", "Purple Miniskirt", "Dark Green Miniskirt", "Cotton Shorts", "Red Cotton Shorts", "Green Cotton Shorts", "Dark Blue Cotton Shorts", "Yellow Cotton Shorts", "Light Blue Cotton Shorts", "Pink Cotton Shorts", "Black Cotton Shorts", "Orange Cotton Shorts", "Purple Cotton Shorts", "Dark Green Cotton Shorts";
 
     set @items_nr, 44;
-    callsub SUB_pick_one_of_many_items;
+    callsub S_pick_one_of_many_items;
     if (@item == 0)
         goto L_main_menu;
 
@@ -857,7 +857,7 @@ L_end:
 //        @items_nr (number of entries in @items)
 //        @default_choice$ (default option)
 // Return:  @item (The selected item, or 0 if the default/something invalid was chosen)
-SUB_pick_one_of_many_items:
+S_pick_one_of_many_items:
     set @c, 0;
     set @i, 0;