Replaced some unsupported symbols in AegisNames (step 2)

This removes the remaining unsupported symbols (despite they being
official names) in AegisNames: The apostrophe (`'`) sign is suppressed.

The full replacement rules (cumulative with the step 1 commit) are thus:

- Any apostrophe is suppressed.
- Any non-`[A-Za-z0-9_]` character is replaced with an underscore (`_`).
- If the replaced symbol is at a word boundary (beginning or end of the
  string, or next to another underscore), it is suppressed instead.
- If the replacement causes an AegisName conflict, underscores are
  appended appropriately.

Signed-off-by: Haru <haru@dotalux.com>

12 files changed, 38 insertions, 38 deletions

diff --git a/npc/re/instances/OldGlastHeim.txt b/npc/re/instances/OldGlastHeim.txt
index fc01464f2..bf099cd2d 100644
--- a/npc/re/instances/OldGlastHeim.txt
+++ b/npc/re/instances/OldGlastHeim.txt
@@ -2450,7 +2450,7 @@ glast_01,212,273,4	script	Hugin's Magic Master	1_F_01,{ // Custom text due to of
 				case MHP2:
 				case Attack_Delay_4:
 				case Luck6:
-					.@enchant = callfunc("F_Rand", Bear's_Power, Runaway_Magic, Speed_Of_Light, Muscle_Fool, Hawkeye, Lucky_Day);
+					.@enchant = callfunc("F_Rand", Bears_Power, Runaway_Magic, Speed_Of_Light, Muscle_Fool, Hawkeye, Lucky_Day);
 					mes("[Hugin's Magic Master]"); // Custom text
 					mes("Seems you already completed the best upgrade option in your 4th slot. For that I can give a random bonus effect to your 3rd slot. And of course, with certain payment...");
 					next;
diff --git a/npc/re/jobs/3-1/ranger.txt b/npc/re/jobs/3-1/ranger.txt
index 0308884fd..78e200843 100644
--- a/npc/re/jobs/3-1/ranger.txt
+++ b/npc/re/jobs/3-1/ranger.txt
@@ -1748,7 +1748,7 @@ job3_rang01,90,43,3	script	Ranger Master#jr_29	4_M_REIDIN_KURS,{
 		jobchange roclass(eaclass()|EAJL_THIRD);
 		getitem Sniper_Goggle,1;
 		getitem Green_Apple_Ring,1;
-		getitem Wolf's_Flute,1;
+		getitem Wolfs_Flute,1;
 		close;
 	}
 	mes "Hey, you look great.";
diff --git a/npc/re/jobs/novice/novice.txt b/npc/re/jobs/novice/novice.txt
index 811593c81..6ac0d9935 100644
--- a/npc/re/jobs/novice/novice.txt
+++ b/npc/re/jobs/novice/novice.txt
@@ -445,7 +445,7 @@ new_5-2,100,29,4	duplicate(NvSprakkiB)	Sprakki#nv5b	4_F_01
 		mes "You've come along fine this far.";
 		mes "This is not much, but take this as a reward.";
 		job_novice_q = 7;
-		getitem N_Adventurer's_Suit,1;
+		getitem N_Adventurers_Suit,1;
 		completequest 7120;
 		close;
 	} else if (job_novice_q == 7) {
@@ -2609,7 +2609,7 @@ L_Supplies:
 	nov_3_swordman = 40;
 	getitem Cargo_Free_Ticket,20;
 	getitem Warp_Free_Ticket,30;
-	getitem N_Adventurer's_Suit,1;
+	getitem N_Adventurers_Suit,1;
 	getitem N_Cutter,1;
 	next;
 	mes "[Hanson]";
diff --git a/npc/re/merchants/coin_exchange.txt b/npc/re/merchants/coin_exchange.txt
index e5ee13ffb..be9f1dbee 100644
--- a/npc/re/merchants/coin_exchange.txt
+++ b/npc/re/merchants/coin_exchange.txt
@@ -1129,7 +1129,7 @@ ecl_in01,67,39,4	script	Replication Expert Paltu	4_M_FAIRYKID4,{
 						Assassin_Mask_,
 						Elven_Ears,
 						Hahoe_Mask,
-						Boy's_Cap;
+						Boys_Cap;
 	setarray .@costumes[0], C_Frog_Cap,
 							C_Centimental_Flower,
 							C_Magestic_Goat,
diff --git a/npc/re/merchants/enchan_mal.txt b/npc/re/merchants/enchan_mal.txt
index 7be4eaa6f..864505b85 100644
--- a/npc/re/merchants/enchan_mal.txt
+++ b/npc/re/merchants/enchan_mal.txt
@@ -93,7 +93,7 @@ malangdo,213,167,4	script	Mayomayo#mal	4_CAT_3COLOR,{
 			case 1224: callsub L_Socket,1,2; //Sword_Breaker
 			case 1225: callsub L_Socket,1,2; //Mail_Breaker
 			case 1227: callsub L_Socket,1,2; //Weeder_Knife
-			case 1229: callsub L_Socket,1,2; //Mama's_Knife
+			case 1229: callsub L_Socket,1,2; //Mamas_Knife
 			case 1232: callsub L_Socket,1,2; //Assasin_Dagger
 			case 1233: callsub L_Socket,1,2; //Exercise
 			case 1235: callsub L_Socket,1,2; //Azoth
@@ -212,7 +212,7 @@ malangdo,213,167,4	script	Mayomayo#mal	4_CAT_3COLOR,{
 			case 1466: callsub L_Socket,1,2; //Crescent_Scythe
 			case 1467: callsub L_Socket,1,2; //Bill_Guisarme
 			case 1468: callsub L_Socket,1,2; //Zephyrus
-			case 1469: callsub L_Socket,1,2; //Longinus's_Spear
+			case 1469: callsub L_Socket,1,2; //Longinuss_Spear
 			case 1470: callsub L_Socket,1,2; //Brionac
 			case 1471: callsub L_Socket,1,2; //Hell_Fire
 			case 1474: callsub L_Socket,1,2; //Gae_Bolg
@@ -264,7 +264,7 @@ malangdo,213,167,4	script	Mayomayo#mal	4_CAT_3COLOR,{
 	case 15: // Books
 		switch(@mal_equip_id) {
 			case 1557: callsub L_Socket,1,2; //Book_Of_The_Apocalypse
-			case 1558: callsub L_Socket,1,2; //Girl's_Diary
+			case 1558: callsub L_Socket,1,2; //Girls_Diary
 			case 1559: callsub L_Socket,1,2; //Legacy_Of_Dragon
 			case 1561: callsub L_Socket,1,2; //Hardback
 			case 1562: callsub L_Socket,1,2; //Bible_Of_Battlefield
@@ -311,11 +311,11 @@ malangdo,213,167,4	script	Mayomayo#mal	4_CAT_3COLOR,{
 			case 1963: callsub L_Socket,1,2; //Rapture_Rose
 			case 1964: callsub L_Socket,1,2; //Chemeti
 			case 1969: callsub L_Socket,1,2; //Bladed_Whip
-			case 1970: callsub L_Socket,1,2; //Queen's_Whip
+			case 1970: callsub L_Socket,1,2; //Queens_Whip
 			case 1972: callsub L_Socket,1,2; //Electric_Eel
 			case 1973: callsub L_Socket,1,2; //Sea_Witch_Foot
 			case 1974: callsub L_Socket,1,2; //Carrot_Whip
-			case 1976: callsub L_Socket,1,2; //Queen's_Whip_
+			case 1976: callsub L_Socket,1,2; //Queens_Whip_
 			case 1979: callsub L_Socket,1,2; //Stem_Of_Nepenthes
 			case 1984: callsub L_Socket,2,2; //Stem_Whip
 			case 1985: callsub L_Socket,4,2; //Rosebine
diff --git a/npc/re/merchants/flute.txt b/npc/re/merchants/flute.txt
index 6732035dc..98fd3789c 100644
--- a/npc/re/merchants/flute.txt
+++ b/npc/re/merchants/flute.txt
@@ -110,7 +110,7 @@ pay_arche,91,134,3	duplicate(fflute)	Falcon Flute Trader#fft2	1_M_BARD
 
 tur_dun01,89,170,5	script	Expert Flute Crafter	1_M_ORIENT01,{
 	if (Class == Job_Ranger || Class == Job_Ranger_T || Class == Job_Baby_Ranger) {
-		if (countitem(Wolf's_Flute)) {
+		if (countitem(Wolfs_Flute)) {
 			mes "[Expert Flute Crafter]";
 			mes "The Wolf Flute you have is crafted by myself, with wood.";
 			mes "You can come back here and find me if you lose your Wolf flute!";
@@ -137,7 +137,7 @@ tur_dun01,89,170,5	script	Expert Flute Crafter	1_M_ORIENT01,{
 				mes "Hope you are ready to use it.";
 				delitem Bamboo_Cut,1;
 				Zeny -= 100000;
-				getitem Wolf's_Flute,1;
+				getitem Wolfs_Flute,1;
 				close;
 			}
 			mes "[Expert Flute Crafter]";
diff --git a/npc/re/merchants/shops.txt b/npc/re/merchants/shops.txt
index d8f7594b2..543d9cdc7 100644
--- a/npc/re/merchants/shops.txt
+++ b/npc/re/merchants/shops.txt
@@ -712,16 +712,16 @@ OnInit:
 morocc,171,103,4	trader	Item Collector#moc3	4_M_03,{
 OnInit:
 	sellitem Scell;
-	sellitem Monster's_Feed;
-	sellitem Animal's_Skin;
+	sellitem Monsters_Feed;
+	sellitem Animals_Skin;
 	sellitem Bill_Of_Birds;
 }
 
 morocc,205,247,2	trader	Item Collector#moc4	4_M_03,{
 OnInit:
 	sellitem Scell;
-	sellitem Monster's_Feed;
-	sellitem Animal's_Skin;
+	sellitem Monsters_Feed;
+	sellitem Animals_Skin;
 	sellitem Bill_Of_Birds;
 }
 
diff --git a/npc/re/quests/cupet.txt b/npc/re/quests/cupet.txt
index ac4a765fd..72e1bd6c9 100644
--- a/npc/re/quests/cupet.txt
+++ b/npc/re/quests/cupet.txt
@@ -38,7 +38,7 @@
 
 	setarray .@tame_id[0],Unripe_Apple,Orange_Juice,Rainbow_Carrot,Earthworm_The_Dude,Rotten_Fish,Sweet_Milk,Well_Dried_Bone,Singing_Flower,Dew_Laden_Moss;
 	setarray .@tame_amount[0],3,3,3,3,3,3,3,3,3;
-	setarray .@hunt_id[0],Jellopy,Jellopy,Clover,Feather_Of_Birds,Shell,Animal's_Skin,Animal's_Skin,Grasshopper's_Leg,Mushroom_Spore;
+	setarray .@hunt_id[0],Jellopy,Jellopy,Clover,Feather_Of_Birds,Shell,Animals_Skin,Animals_Skin,Grasshoppers_Leg,Mushroom_Spore;
 	setarray .@hunt_amount[0],500,600,500,500,500,500,600,500,500;
 	setarray .@mob_id[0],1002,1113,1063,1049,1011,1167,1107,1052,1014;
 	.@tame_gets = 3;
@@ -95,9 +95,9 @@
 
 	setarray .@tame_id[0],Silver_Knife_Of_Chaste,Monster_Juice,Contracts_In_Shadow,Sway_Apron,Prohibition_Red_Candle,Book_Of_Devil;
 	setarray .@tame_amount[0],1,1,1,1,1,1;
-	setarray .@hunt_id[0],Long_Hair,Solid_Shell,Petite_DiablOfs_Horn,Alice's_Apron,Queen's_Whip,Evil_Horn;
+	setarray .@hunt_id[0],Long_Hair,Solid_Shell,Petite_DiablOfs_Horn,Alices_Apron,Queens_Whip,Evil_Horn;
 	setarray .@hunt_amount[0],600,600,600,500,1,100;
-	setarray .@hunt_id2[0],0,0,0,0,Executioner's_Mitten,0;
+	setarray .@hunt_id2[0],0,0,0,0,Executioners_Mitten,0;
 	setarray .@hunt_amount2[0],0,0,0,0,20,0;
 	setarray .@mob_id[0],1170,1035,1109,1275,1200,1101;
 	.@tame_gets = 1;
diff --git a/npc/re/quests/eden/26-40.txt b/npc/re/quests/eden/26-40.txt
index 3a3068a5c..1c680d7ed 100644
--- a/npc/re/quests/eden/26-40.txt
+++ b/npc/re/quests/eden/26-40.txt
@@ -530,11 +530,11 @@ payon,179,66,3	script	Dashia	4_M_RACHMAN1,{
 		break;
 	case 2:
 		callsub L_Quest,8275;
-		if ((countitem(Bear's_Foot) > 9) && (countitem(Animal's_Skin) > 4)) {
+		if ((countitem(Bears_Foot) > 9) && (countitem(Animals_Skin) > 4)) {
 			callsub L_Reward;
 			getitem Novice_Potion,100;
-			delitem Bear's_Foot,10;
-			delitem Animal's_Skin,5;
+			delitem Bears_Foot,10;
+			delitem Animals_Skin,5;
 			getexp 1000,100;
 			erasequest 8275;
 			close;
diff --git a/npc/re/quests/newgears/2012_headgears.txt b/npc/re/quests/newgears/2012_headgears.txt
index 10566cb39..e243300d5 100644
--- a/npc/re/quests/newgears/2012_headgears.txt
+++ b/npc/re/quests/newgears/2012_headgears.txt
@@ -469,10 +469,10 @@ moc_para01,41,169,3	script	Reno#2012hat	1_M_WIZARD,{
 				Assassin_Mask_,     -1, 200, Improved_Assassin_Mask,
 				Welding_Mask,       -1, 200, Improved_Welding_Mask,
 				Safety_Ring,        -1, 200, Safety_Ring_,
-				Angel's_Protection,  1, 100, Im_Angel's_Protection,
-				Angel's_Safeguard,   1, 100, Impr_Angel's_Safeguard,
-				Angel's_Arrival,     1, 100, Impr_Angel's_Arrival,
-				Angel's_Warmth,      1, 100, Impr_Angel's_Warmth,
+				Angels_Protection,   1, 100, Im_Angels_Protection,
+				Angels_Safeguard,    1, 100, Impr_Angels_Safeguard,
+				Angels_Arrival,      1, 100, Impr_Angels_Arrival,
+				Angels_Warmth,       1, 100, Impr_Angels_Warmth,
 				Kiss_Of_Angel,       1, 100, Improved_Kiss_Of_Angel;
 			break;
 		case 4:
@@ -487,10 +487,10 @@ moc_para01,41,169,3	script	Reno#2012hat	1_M_WIZARD,{
 				Variant_Shoes,     -1,  300, Enhanced_Variant_Shoes,
 				Ring_Of_Flame_Lord,-1,  300, Good_Ring_Of_Flame_Lord,
 				Ring_Of_Resonance, -1,  300, Good_Ring_Of_Resonance,
-				Angel's_Protection, 1,   20, Im_Angel's_Protection,
-				Angel's_Safeguard,  1,   20, Impr_Angel's_Safeguard,
-				Angel's_Arrival,    1,   20, Impr_Angel's_Arrival,
-				Angel's_Warmth,     1,   20, Impr_Angel's_Warmth,
+				Angels_Protection,  1,   20, Im_Angels_Protection,
+				Angels_Safeguard,   1,   20, Impr_Angels_Safeguard,
+				Angels_Arrival,     1,   20, Impr_Angels_Arrival,
+				Angels_Warmth,      1,   20, Impr_Angels_Warmth,
 				Kiss_Of_Angel,      1,   20, Improved_Kiss_Of_Angel;
 			break;
 		}
@@ -680,10 +680,10 @@ moc_para01,41,169,3	script	Reno#2012hat	1_M_WIZARD,{
 			else if (.@r <= 9)  getitem Improved_Assassin_Mask,1;
 			else if (.@r <= 12) getitem Improved_Welding_Mask,1;
 			else if (.@r <= 13) getitem Safety_Ring_,1;
-			else if (.@r <= 14) getitem Im_Angel's_Protection,1;
-			else if (.@r <= 15) getitem Impr_Angel's_Safeguard,1;
-			else if (.@r <= 16) getitem Impr_Angel's_Arrival,1;
-			else if (.@r <= 17) getitem Impr_Angel's_Warmth,1;
+			else if (.@r <= 14) getitem Im_Angels_Protection,1;
+			else if (.@r <= 15) getitem Impr_Angels_Safeguard,1;
+			else if (.@r <= 16) getitem Impr_Angels_Arrival,1;
+			else if (.@r <= 17) getitem Impr_Angels_Warmth,1;
 			else                getitem Improved_Kiss_Of_Angel,1;
 			break;
 		case 4:
diff --git a/npc/re/quests/quests_eclage.txt b/npc/re/quests/quests_eclage.txt
index bbf074581..d669d0d46 100644
--- a/npc/re/quests/quests_eclage.txt
+++ b/npc/re/quests/quests_eclage.txt
@@ -17592,7 +17592,7 @@ eclage,112,40,3	script	Eclage Guard Leo#tl	4_M_FAIRYSOLDIER2,{
 			}
 		}
 		else if (questprogress(7420) == 1) {
-			if ((countitem(Pinguicula's_fruit_Jam) < 3) || (countitem(Luciola's_Honey_Jam) < 3)) {
+			if ((countitem(Pinguiculas_fruit_Jam) < 3) || (countitem(Luciolas_Honey_Jam) < 3)) {
 				mes "[Leo]";
 				mes "I need 3 jars of Pinguicula's pickled fruits and another 3 jars of Luciola's honey jam~";
 				mes "They are specialties of the base of Splendide.";
@@ -17611,8 +17611,8 @@ eclage,112,40,3	script	Eclage Guard Leo#tl	4_M_FAIRYSOLDIER2,{
 			mes "It seems like Mayor Jun has an eye for character.";
 			mes "So he is Mayor after all...";
 			next;
-			delitem Pinguicula's_fruit_Jam,3; //Pinguicula's_fruit_Jam
-			delitem Luciola's_Honey_Jam,3; //Luciola's_Honey_Jam
+			delitem Pinguiculas_fruit_Jam,3;
+			delitem Luciolas_Honey_Jam, 3;
 			completequest 7420;
 			getexp 200000,200000;
 			.@alltotal =  questprogress(7420) + questprogress(7419) + questprogress(7418);
diff --git a/npc/re/quests/quests_mora.txt b/npc/re/quests/quests_mora.txt
index 79615327d..39ca8649c 100644
--- a/npc/re/quests/quests_mora.txt
+++ b/npc/re/quests/quests_mora.txt
@@ -5148,7 +5148,7 @@ function	script	mora_remains	{
 1@mist,145,245,0	script	Meshir's Remains#33	CLEAR_NPC,{ callfunc "mora_remains",12245,"Meshir",5,943,4; }	//Solid_Shell
 1@mist,196,276,0	script	Noirit's Remains#33	CLEAR_NPC,{ callfunc "mora_remains",12246,"Noirit",6,549,3; }	//Nice_Sweet_Potato
 1@mist,304,327,0	script	Pajama God's Remains#33	CLEAR_NPC,{ callfunc "mora_remains",12247,"Pajama God",5,945,18; }	//Raccoon_Leaf
-1@mist,334,287,0	script	Mendel's Remains#33	CLEAR_NPC,{ callfunc "mora_remains",12248,"Mendel",7,946,31; }	//Snail's_Shell
+1@mist,334,287,0	script	Mendel's Remains#33	CLEAR_NPC,{ callfunc "mora_remains",12248,"Mendel",7,946,31; }	//Snails_Shell
 1@mist,330,177,0	script	Milebit's Remains#33	CLEAR_NPC,{ callfunc "mora_remains",12249,"Milebit",5,7008,17; }	//Stiff_Horn
 1@mist,284,84,0	script	Kunmun's Remains#33	CLEAR_NPC,{ callfunc "mora_remains",12250,"Kunmun",4,6380,20; }	//Mora_Coin
 1@mist,170,54,0	script	Tsaihokin's Remains#33	CLEAR_NPC,{ callfunc "mora_remains",12251,"Tsaihokin",2,929,5; }	//Immortal_Heart