Added official names as comments in many newer scripts.

Signed-off-by: Euphy <euphy@rathena.org>

npc/merchants/renters.txt

@@ -26,7 +26,8 @@
 //= 2.2 Added warg checks. [Euphy]
 //============================================================ 
 
-// PecoPeco Breeder (for Knights)-------------------------------------------
+// PecoPeco Breeder (for Knights) :: breeder
+//============================================================
 prontera,55,350,5	script	Peco Peco Breeder#knt	105,{
 	if(Upper==0) set .@price,2500; //Normal Peco - default price
 	if(Upper==1) set .@price,2500; //Armored Peco
@@ -89,7 +90,8 @@ prontera,55,350,5	script	Peco Peco Breeder#knt	105,{
 	}
 }
 
-// Grand PecoPeco Breeder (for Crusaders)-------------------------------------------
+// Grand PecoPeco Breeder (for Crusaders)
+//============================================================
 prontera,232,318,3	script	Peco Peco Breeder#cru	105,{
 	if(Upper==0) set .@price,3500; //Normal Peco - default price
 	if(Upper==1) set .@price,3500; //Armored Peco
@@ -151,7 +153,8 @@ prontera,232,318,3	script	Peco Peco Breeder#cru	105,{
 	}
 }
 
-// Falcon Master--------------------------------------------------------------
+// Falcon Master :: breeder
+//============================================================
 hu_in01,381,304,5	script	Falcon Breeder#hnt	105,{
 	if(Upper==0) set .@price,2500; //Normal Falcon - default price
 	if(Upper==1) set .@price,2500; //Scarf Falcon

npc/other/acolyte_warp.txt

@@ -16,6 +16,8 @@
 //=     The function is located in re/quests/eden/eden_vip.txt.
 //============================================================
 
+// Warpers :: acolyte_warp
+//============================================================
 prontera,98,121,4	script	Acolyte#Prtclear	90,{
 	mes "[Keiki]";
 	mes "Hello there, adventurer.";

npc/re/cities/izlude.txt

@@ -82,7 +82,7 @@ prt_fild08b,350,219,4	duplicate(Guard_izlude)	Guard#izlude_b	105
 prt_fild08c,350,219,4	duplicate(Guard_izlude)	Guard#izlude_c	105
 prt_fild08d,350,219,4	duplicate(Guard_izlude)	Guard#izlude_d	105
 
-// Channel Warper
+// Channel Warper :: channel
 //============================================================
 function	script	F_IzludeChannel	{
 	mes "[Izlude Copy Warper]";

npc/re/instances/BakonawaLake.txt

@@ -16,6 +16,8 @@
 //= 1.2 Added VIP features. [Euphy]
 //============================================================ 
 
+// Instance Creation :: ma_baku
+//============================================================
 ma_scene01,174,179,4	script	Taho	541,{
 	disable_items;
 	if (checkweight(1201,1) == 0) {
@@ -119,6 +121,8 @@ sec_in02,26,26,4	script	Bakonawa's Rage	541,{
 	close;
 }
 
+// Instance Scripts :: in_baku01
+//============================================================
 1@ma_b,62,52,4	script	Taho#nf	541,{
 	mes "[Taho]";
 	mes "Heehee, I could join the Bakonawa hunt, but I'd rather hide behind that rock and cheer you guys on.";

npc/re/instances/BangungotHospital.txt

@@ -16,7 +16,7 @@
 //= 1.2 Added VIP features. [Euphy]
 //============================================================ 
 
-// Instance Creation
+// Instance Creation :: ma_hos_enter
 //============================================================
 ma_dun01,147,10,5	script	Nurse#ma_dun01	569,{
 	if (BaseLevel < 100) end;
@@ -349,6 +349,8 @@ L_Complete:
 	return;
 }
 
+// GM Management NPC :: ma_hos_enter_2
+//============================================================
 sec_in02,27,30,0	script	Bangungot Gate	406,{
 	callfunc "F_GM_NPC";
 	mes "Password";
@@ -372,7 +374,7 @@ sec_in02,27,30,0	script	Bangungot Gate	406,{
 	}
 }
 
-// Instance Scripts
+// Instance Scripts :: ma_hos
 //============================================================
 1@ma_h,43,157,0	script	#Memorial Start	139,2,2,{
 	end;

npc/re/instances/BuwayaCave.txt

@@ -14,6 +14,8 @@
 //= 1.0 First version. [Euphy]
 //============================================================ 
 
+// Instance Creation :: buwaya_dun
+//============================================================
 ma_fild02,312,317,5	script	Guard#buwaya_cave	570,{
 	if (BaseLevel < 130) {
 		mes "[Guard]";
@@ -152,6 +154,8 @@ OnTouch:
 	}
 }
 
+// Instance Scripts :: buwaya_in
+//============================================================
 1@ma_c,33,112,0	script	#damage	139,7,7,{
 	end;
 OnInstanceInit:

npc/re/instances/HazyForest.txt

@@ -15,7 +15,7 @@
 //= 1.1 Instance system rewrite. [Euphy]
 //============================================================ 
 
-// Instance Creation
+// Instance Creation :: md_mistwoods_enter
 //============================================================
 bif_fild01,158,340,5	script	Laphine Soldier#mist	447,{
 
@@ -168,7 +168,7 @@ bif_fild01,161,355,0	script	Log Tunnel	844,{
 	}
 }
 
-// Instance Scripts
+// Instance Scripts :: md_mistwoods_in
 //============================================================
 1@mist,89,29,0	script	#Whisper_mist	844,1,1,{
 	end;
@@ -502,6 +502,8 @@ OnMyMobDead:
 
 // Wandering Guardian Quest
 //============================================================
+
+// ----------------- Part of md_mistwoods_in -----------------
 1@mist,2,2,0	script	#Dragon Herder	844,{
 	end;
 OnInstanceInit:
@@ -747,6 +749,7 @@ OnEnable:
 	end;
 }
 
+// --------------- Part of md_mistwoods_enter ----------------
 mora,46,152,5	script	Flower Smelling Lady	510,{
 	if (ep14_1_mistwoods < 3) {
 		mes "[Flower Smell Lady]";
@@ -922,7 +925,7 @@ mora,48,152,3	script	Sharp Eyed Man	512,{
 	}
 }
 
-// Monster Spawns
+// Monster Spawns :: md_mist_mob
 //============================================================
 1@mist,1,1,0	script	#Mist Mobs Respawn1	844,{
 	end;
@@ -997,7 +1000,7 @@ OnInstanceInit:
 	end;
 }
 
-// Warp Portals
+// Warp Portals :: md_mist_in_link
 //============================================================
 bif_fild01,38,374,0	script	Mysterious Flower#ep14_1	844,{
 	mes "It's a giant flower with mysterious energy.";

npc/re/instances/MalangdoCulvert.txt

@@ -19,7 +19,7 @@
 //= 1.1 Instance system rewrite. [Euphy]
 //============================================================ 
 
-// Quest NPCs
+// Quest NPCs :: mal_yong
 //============================================================
 mal_in01,172,28,2	script	Albo#mal	561,{
 	if (checkweight(1201,1) == 0) {
@@ -265,7 +265,7 @@ L_CheckQuest:
 	return;
 }
 
-// Instance Creation
+// Instance Creation :: pump
 //============================================================
 mal_in01,160,34,4	script	Missing, the Cleaner	545,{
 	if (BaseLevel < 90) {
@@ -565,7 +565,7 @@ function	script	F_mal_missing	{
 	}
 }
 
-// Instance: Normal Mode
+// Instance: Normal Mode :: in_pump1
 //============================================================
 1@pump,84,105,4	script	Missing, the Cleaner#nf	545,{
 	mes "[Missing, the Cleaner]";
@@ -895,7 +895,7 @@ OnInstanceInit:
 	end;
 }
 
-// Instance: Hard Mode
+// Instance: Hard Mode :: in_pump2
 //============================================================
 2@pump,39,88,4	duplicate(Missing, the Cleaner#nf)	Missing, the Cleaner#hf	545
 

npc/re/instances/OctopusCave.txt

@@ -14,7 +14,7 @@
 //= 1.1 Instance system rewrite. [Euphy]
 //============================================================ 
 
-// Instance Creation
+// Instance Creation :: oct
 //============================================================
 mal_dun01,151,235,5	script	Starfish	551,{
 
@@ -157,7 +157,7 @@ mal_dun01,153,237,5	script	Weird Entrance	844,{
 	}
 }
 
-// Instance Scripts
+// Instance Scripts :: oct_in
 //============================================================
 1@cash,199,99,0	script	oct_enter	139,4,4,{
 	end;

npc/re/merchants/3rd_trader.txt

@@ -19,7 +19,7 @@
 //= 1.5 Added Izlude duplicates. [Euphy]
 //============================================================ 
 
-// Poison Herb Merchants (Guillotine Cross)
+// Poison Herb Merchants (Guillotine Cross) :: poison_herb_3rd_trader
 //============================================================
 -	script	::phs	-1,{
 	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 2000) {
@@ -83,7 +83,7 @@ job3_guil01,79,96,3	duplicate(phs)	Poison Herb Merchant	877
 morocc,191,94,4	duplicate(phs)	Poison Herb Merchant#moc	877	//Official: (190,96) -> in a wall
 lhz_in02,16,205,4	duplicate(phs)	Poison Herb Merchant#lhz	877
 
-// Rune Stone Merchants (Rune Knight)
+// Rune Stone Merchants (Rune Knight) :: rune_3rd_trader
 //============================================================
 -	script	::runesale	-1,{
 	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 2000) {
@@ -151,7 +151,7 @@ lhz_in02,16,205,4	duplicate(phs)	Poison Herb Merchant#lhz	877
 job3_rune01,90,62,3	duplicate(runesale)	Rune Merchant#job3	853
 prontera,168,228,3	duplicate(runesale)	Rune Merchant#prt	853
 
-// Rare Herb Merchants (Guillotine Cross)
+// Rare Herb Merchants (Guillotine Cross) :: rare_herb_3rd_trader
 //============================================================
 job3_guil01,91,93,3	script	Rare Herb Collector	49,{
 	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 2000) {
@@ -214,7 +214,7 @@ job3_guil01,91,93,3	script	Rare Herb Collector	49,{
 	close;
 }
 
-// Point Merchants (Sorcerer)
+// Point Merchants (Sorcerer) :: point_3rd_trader
 //============================================================
 -	script	::pss	-1,{
 	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 2000) {

npc/re/merchants/card_separation.txt

@@ -356,5 +356,5 @@
 	mes "That is all for the results of the card separation. Please come again.";
 	close;
 }
-malangdo,215,166,4	duplicate(CardSeparation_mal)	Jeremy#pa0829	553
-malangdo,208,166,6	duplicate(CardSeparation_mal)	Richard#pa0829	559
+malangdo,215,166,4	duplicate(CardSeparation_mal)	Jeremy#pa0829	553	// Armors :: mal_yong
+malangdo,208,166,6	duplicate(CardSeparation_mal)	Richard#pa0829	559	// Weapons :: soc_weapon

npc/re/merchants/catalog.txt

@@ -15,6 +15,8 @@
 //= 1.1 Updated dialogue. [Euphy]
 //============================================================ 
 
+// Main NPC :: catalog_merchant
+//============================================================
 moc_para01,22,16,5	script	Catalog Magician#catal01	704,{
 	if (!checkweight(1301,3)) {
 		mes "- You have too many items. Please make space. -";

npc/re/merchants/coin_exchange.txt

@@ -15,7 +15,7 @@
 //= 1.2 Added Eclage traders (not fully complete). [Euphy]
 //============================================================
 
-// Malangdo
+// Malangdo Item Machines :: mal_yong
 //============================================================
 malangdo,220,167,5	script	Coin Exchanger CX-1	564,{
 	if (checkweight(1201,1) == 0) {
@@ -178,6 +178,8 @@ L_AddItem:
 	}
 }
 
+// Malangdo Coin Exchange :: mal_mo_coin
+//============================================================
 malangdo,236,179,5	script	Dark Merchant K	554,{
 	if (checkweight(1201,1) == 0) {
 		mes "It seems you have too much in your inventory. Let's try again after getting rid of some of your belongings.";
@@ -344,6 +346,8 @@ malangdo,233,180,3	script	Dark MachineTX100	564,{
 	close;
 }
 
+// Malangdo Can Exchange :: mal_can_rep
+//============================================================
 malangdo,175,145,4	script	Can Agency Guard	549,{
 	if (checkweight(1201,1) == 0) {
 		mes "You seem to have too many items. Give it a try after sorting out the item kinds.";
@@ -425,6 +429,8 @@ malangdo,175,145,4	script	Can Agency Guard	549,{
 	close;
 }
 
+// Malangdo Traders :: malang_trader
+//============================================================
 function	script	F_mal_coin	{
 
 // Initial dialogue and checks:

npc/re/merchants/enchan_ko.txt

@@ -13,6 +13,8 @@
 //= 1.0 First version. [Euphy]
 //============================================================
 
+// Main NPC :: job_ko
+//============================================================
 que_ng,75,20,3	script	Artisan Tene#ko	762,{
 	disable_items;
 	mes "[Artisan Tene]";

npc/re/merchants/enchan_mal.txt

@@ -15,6 +15,8 @@
 //= 1.0a Added 'delequip' command. [Euphy]
 //============================================================ 
 
+// Enchanter NPC :: mal_yong
+//============================================================
 malangdo,213,167,4	script	Mayomayo#mal	555,{
 	disable_items;
 	if (checkweight(1201,1) == 0) {

npc/re/merchants/flute.txt

@@ -15,7 +15,8 @@
 //= 1.2 Added Wolf Flute trader, optimized. [Euphy]
 //= 1.2a Fixed some conditions. [Euphy]
 //============================================================ 
-
+// Falcon Flute :: falcon_flute
+//============================================================
 -	script	Falcon Flute Trader::fflute	-1,{
 	mes "[Falcon Flute Trader]";
 	if (BaseJob == Job_Hunter) {
@@ -89,6 +90,8 @@
 hu_in01,386,306,3	duplicate(fflute)	Falcon Flute Trader#fft	51
 pay_arche,91,134,3	duplicate(fflute)	Falcon Flute Trader#fft2	51
 
+// Wolf Flute :: job_ranger
+//============================================================
 tur_dun01,89,170,5	script	Expert Flute Crafter	59,{
 	if (Class == Job_Ranger || Class == Job_Ranger_T || Class == Job_Baby_Ranger) {
 		if (countitem(6124)) {

npc/re/merchants/renters.txt

@@ -14,7 +14,7 @@
 //= 2.2 Updated to match the official scripts. [Euphy]
 //============================================================ 
 
-// Dragon Breeder
+// Dragon Breeder :: dragon
 //============================================================
 job3_rune01,88,62,5	script	Dragon Breeder	105,{
 	mes "[Dragon Breeder]";
@@ -52,7 +52,7 @@ job3_rune01,88,62,5	script	Dragon Breeder	105,{
 	close;
 }
 
-// Dragon/Gryphon Master
+// Dragon/Gryphon Master :: dragon
 //============================================================
 prontera,130,213,5	script	Riding Creature Master	105,{
 	mes "[Riding Creature Master]";
@@ -122,7 +122,7 @@ aldebaran,133,109,5	duplicate(Riding Creature Master)	Riding Creature Master#4	1
 yuno,171,187,3	duplicate(Riding Creature Master)	Riding Creature Master#5	105
 rachel,106,130,5	duplicate(Riding Creature Master)	Riding Creature Master#6	105
 
-// Peco removing NPC
+// Peco removing NPC :: dragon
 //============================================================
 prontera,125,208,5	script	Peco Peco Remover	105,{
 	mes "[Soldier]";
@@ -153,7 +153,7 @@ prontera,125,208,5	script	Peco Peco Remover	105,{
 	close;
 }
 
-// Magic Gear Renter
+// Magic Gear Renter :: madogear
 //============================================================
 -	script	::mgm	-1,{
 	mes "[Magic Gear Master]";

npc/re/other/stone_change.txt

@@ -13,6 +13,8 @@
 //= 1.0 First version.
 //============================================================ 
 
+// Main NPC :: stonechange
+//============================================================
 geffen_in,99,174,5	script	Ore Tester#sorty	700,{
 	mes "[Ore Tester Sorty]";
 	mes "Do you have ^3131FFany same type of ores in your inventories^000000 which take many spaces?";

npc/re/quests/eden/eden_common.txt

@@ -21,6 +21,8 @@
 //= 1.8 Updated to match the latest official script. [Euphy]
 //============================================================
 
+// Common NPCs :: lv_tre
+//============================================================
 moc_para01,27,35,5	script	Secretary Lime Evenor	952,{
 	if (checkweight(1201,1) == 0 || (MaxWeight - Weight) < 2000) {
 		mes "- Wait a minute !! -";

npc/re/quests/eden/eden_iro.txt

@@ -565,7 +565,7 @@ L_Exchange:
 moc_para01,41,169,2	script	Kafra Stacker#eden	749,{
 	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 2000) {
 		mes "- Wait a moment! -";
-		mes "- Currently you'r carrying -";
+		mes "- Currently you're carrying -";
 		mes "- too much weight in items. -";
 		mes "- Please come back later -";
 		mes "- after you put some into Kafra storage. -";

npc/re/quests/eden/eden_service.txt

@@ -13,6 +13,8 @@
 //= 1.1 Replaced 2nd NPC with duplicate function. [Masao]
 //============================================================
 
+// Goods Cabinets :: pare_service
+//============================================================
 -	script	Goods Cabinet#00::pggc	-1,{
 	mes "It is a Goods Storage Cabinet.";
 	mes "A message is written on a piece of paper.";

npc/re/quests/eden/eden_tutorial.txt

@@ -13,6 +13,8 @@
 //= 1.0 First Version. [Euphy]
 //============================================================
 
+// Main Quest :: TutorialVer2
+//============================================================
 moc_para01,34,178,3	script	Tutorial Instructor	904,{
 	if (Class == Job_Novice) {
 		// Fall through

npc/re/quests/homun_s.txt

@@ -16,7 +16,7 @@
 //= 1.2 Replaced with official script. [Euphy]
 //============================================================ 
 
-// Main NPCs
+// Main NPCs :: Homun_S
 //============================================================
 job3_gen01,12,44,3	script	Viorel#job3_gen01	542,{
 	if (countitem(6415)) {

npc/re/quests/newgears/2012_headgears.txt

@@ -14,6 +14,8 @@
 //=     Script is a little messy, could use some cleaning.
 //============================================================
 
+// Main NPC :: 2012_hat_quest
+//============================================================
 moc_para01,41,169,3	script	Reno#2012hat	64,{
 
 	// iRO has (very) minor differences in dialogue from the original script.

npc/re/quests/ninja_quests.txt

@@ -13,6 +13,8 @@
 //= 1.0 First version. [Euphy]
 //============================================================
 
+// Armor and Weapon NPCs :: kaboro_gearmix
+//============================================================
 que_ng,21,72,6	script	Master Armor Craftsman	934,{
 	mes "[Gyo]";
 	mes "How would you define victory?";

npc/re/quests/pile_bunker.txt

@@ -13,6 +13,8 @@
 //= 2.2 Updated to match the official script. [Euphy]
 //============================================================ 
 
+// Main NPC :: mech_book
+//============================================================
 yuno,179,174,4	script	Gomer	851,{
 	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
 		mes "[Gomer]";

npc/re/quests/quests_malangdo.txt

@@ -10505,7 +10505,7 @@ mal_in01,19,213,1	script	Waiting Cat#gamer	555,{
 	close;
 }
 
-// Archangel Wing Enchants :: enc_angel
+// Archangel Wing Enchants :: 2011_enc_angel02
 //============================================================
 malangdo,234,153,6	script	Notice Board#mal	837,{
 	mes "^0000FFThere's a hastily written message on this bulletin board.^000000";

npc/re/quests/quests_morocc.txt

@@ -49,7 +49,7 @@ moc_fild16,124,381,4	duplicate(Continental Guard#man)	Continental Guard#man7	852
 moc_fild16,333,380,4	duplicate(Continental Guard#man)	Continental Guard#man8	852
 moc_fild01,84,19,1	duplicate(Continental Guard#man)	Continental Guard#man9	852
 
-// Pyramids Nightmare Mode
+// Pyramids Nightmare Mode :: nightmare_pry
 //============================================================
 moc_prydb1,103,54,3	script	Suspicious Cat#night	547,{
 	mes "[Suspicious Cat]";

npc/re/warps/dungeons/iz_dun.txt

@@ -14,7 +14,7 @@
 //= 1.3 Added Undersea Tunnel 6th floor warper.
 //============================================================
 
-// Undersea Tunnel Warper
+// Undersea Tunnel Warper :: iz_dun05
 //============================================================
 iz_dun04,130,234,5	script	Gatekeeper#iz_dun	413,{
 	mes "[Gatekeeper]";