Replaced the SEX_FEMALE/SEX_MALE constants to scripts, where appropriate

16 files changed, 66 insertions, 60 deletions

diff --git a/npc/jobs/1-1e/taekwon.txt b/npc/jobs/1-1e/taekwon.txt
index 60853001f..382f45a9a 100644
--- a/npc/jobs/1-1e/taekwon.txt
+++ b/npc/jobs/1-1e/taekwon.txt
@@ -400,11 +400,10 @@
 			mes "You are still young, so";
 			mes "I assume you'll want a job";
 			mes "title. Mm. In that case, you";
-			if(Sex == 0) {
+			if (Sex == SEX_FEMALE)
 				mes "are now a ^FF0000Taekwon Girl^000000.";
-			} else {
+			else
 				mes "are now a ^FF0000Taekwon Boy^000000.";
-			}
 			mes "Yes, that sounds good. ";
 			next;
 			mes "[Phoenix]";
diff --git a/npc/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt
index 969990051..10bbb6534 100644
--- a/npc/jobs/2-1/assassin.txt
+++ b/npc/jobs/2-1/assassin.txt
@@ -377,7 +377,7 @@ OnTouch:
 			close;
 		case 2:
 			mes "[Assassin 'Khai']";
-			if (Sex) {
+			if (Sex == SEX_MALE) {
 				mes "Huh. You must have a lot of self confidence to be a Thief nowadays.";
 				next;
 				mes "[Assassin 'Khai']";
@@ -1877,7 +1877,7 @@ OnTouch:
 				mes "Haha, the needs of the body are sometimes hard to ignore. It's best to accept that part of human nature.";
 				next;
 				mes "[Guildmaster]";
-				if (Sex)
+				if (Sex == SEX_MALE)
 					mes "But you must never reveal to her the Assassin side of your life. No matter what it takes.";
 				else
 					mes "But you must never reveal to him the Assassin side of your life, no matter what it takes.";
diff --git a/npc/jobs/2-1/blacksmith.txt b/npc/jobs/2-1/blacksmith.txt
index 4e09d5ed9..5531c87ae 100644
--- a/npc/jobs/2-1/blacksmith.txt
+++ b/npc/jobs/2-1/blacksmith.txt
@@ -84,7 +84,7 @@ ein_in01,18,28,4	script	Guildsman#BLS	4_M_JOB_BLACKSMITH,{
 		close;
 	}
 	if (BaseClass == Job_Novice) {
-		if (Sex == 0) {
+		if (Sex == SEX_FEMALE) {
 			mes "[Altiregen]";
 			mes "Oh~";
 			mes "what a very";
diff --git a/npc/jobs/2-1/hunter.txt b/npc/jobs/2-1/hunter.txt
index 2680fa6f7..20ab68dbe 100644
--- a/npc/jobs/2-1/hunter.txt
+++ b/npc/jobs/2-1/hunter.txt
@@ -425,7 +425,7 @@ hu_in01,386,373,4	script	Hunter Guildsman#hnt	4_F_JOB_HUNTER,{
 			mes "Just give the item to the Demon Hunter, the guy who's all the way to the left in this area~";
 			next;
 			mes "[Hunter Sherin]";
-			if (Sex)
+			if (Sex == SEX_MALE)
 				mes "If you decide to become a Hunter, promise to come visit me. I want to see you as a Hunter. You would look great!!";
 			else
 				mes "If you decide to become a Hunter, come and visit me, okay? You're pretty, but... You'd be even prettier as a Hunter. Hehe~";
diff --git a/npc/jobs/2-1/knight.txt b/npc/jobs/2-1/knight.txt
index b3caa8cf9..6914065dc 100644
--- a/npc/jobs/2-1/knight.txt
+++ b/npc/jobs/2-1/knight.txt
@@ -67,7 +67,7 @@ prt_in,88,101,4	script	Chivalry Captain#knt	1_M_KNIGHTMASTER,{
 				mes "[Captain Herman]";
 				mes "A-ha~";
 				mes "A Swordman, you say?";
-				mes "I'm sorry, "+((Sex)?"lad":"lass")+", but you've";
+				mes "I'm sorry, "+ (Sex == SEX_MALE ? "lad" : "lass") +", but you've";
 				mes "come to the wrong place!";
 				next;
 				mes "[Captain Herman]";
@@ -101,7 +101,7 @@ prt_in,88,101,4	script	Chivalry Captain#knt	1_M_KNIGHTMASTER,{
 		if (select("I want to change my job to a Knight.", "Just visiting.") == 1) {
 			mes "[Captain Herman]";
 			mes "Ohh...";
-			mes "A young "+((Sex)?"man":"lady")+" who wishes";
+			mes "A young "+ (Sex == SEX_MALE ? "man" : "lady") +" who wishes";
 			mes "to become a Knight!";
 			mes "Our Prontera Chivalry";
 			mes "will assist you.";
@@ -335,7 +335,7 @@ prt_in,88,101,4	script	Chivalry Captain#knt	1_M_KNIGHTMASTER,{
 			mes "gathered items";
 			mes "that are troublesome";
 			mes "to obtain. I approve!";
-			mes "I believe "+((Sex)?"":"s")+"he will continue to be loyal after becoming a Knight.";
+			mes "I believe "+ (Sex == SEX_MALE ? "he" : "she") +" will continue to be loyal after becoming a Knight.";
 		}
 		next;
 		mes "[Captain Herman]";
@@ -372,7 +372,7 @@ prt_in,88,101,4	script	Chivalry Captain#knt	1_M_KNIGHTMASTER,{
 		mes "to Amy's opinion.";
 		next;
 		mes "[Lady Amy]";
-		if (Sex) {
+		if (Sex == SEX_MALE) {
 			mes "Mmm~ He's so polite!";
 			mes "He'll grow to be a wonderful Knight. And he's got such cute widdle cheeeeks~ Hee hee!";
 		}
@@ -391,7 +391,7 @@ prt_in,88,101,4	script	Chivalry Captain#knt	1_M_KNIGHTMASTER,{
 		mes "your mind.";
 		next;
 		mes "[Sir Edmond]";
-		if (Sex) {
+		if (Sex == SEX_MALE) {
 			mes "He seems a little rough, but something bright shines within him. With polish and refinement, his true value will shine forth";
 			mes "as the sun.";
 		}
@@ -406,7 +406,7 @@ prt_in,88,101,4	script	Chivalry Captain#knt	1_M_KNIGHTMASTER,{
 		mes "to hear your thoughts.";
 		next;
 		mes "[Gray]";
-		mes "A young "+((Sex)?"gentleman":"lady")+" coming here with the determination to become a Knight is enough...";
+		mes "A young "+ (Sex == SEX_MALE ? "gentleman" : "lady") +" coming here with the determination to become a Knight is enough...";
 		next;
 		mes "[Captain Herman]";
 		mes "Everyone";
@@ -749,7 +749,7 @@ prt_in,71,91,0	script	Sir Siracuse#knt	1_M_YOUNGKNIGHT,{
 			mes "Oh, to become";
 			mes "a Knight? Come to";
 			mes "think of it, aren't";
-			mes "you the "+((Sex)?"guy":"girl")+" that";
+			mes "you the "+ (Sex == SEX_MALE ? "guy" : "girl") +" that";
 			mes "just applied?";
 			next;
 			mes "[Sir Siracuse]";
@@ -2350,7 +2350,7 @@ prt_in,87,92,4	script	Sir Gray#knt	2_M_SWORDMASTER,{
 				mes "Oh, youth!";
 				mes "Becoming a Knight";
 				mes "for your beloved!";
-				mes "Always protect "+((Sex)?"her":"him")+"...";
+				mes "Always protect "+ (Sex == SEX_MALE ? "her" : "him") +"...";
 				mes "Even at the sacrifice";
 				mes "of your own life!";
 				next;
diff --git a/npc/jobs/2-1/priest.txt b/npc/jobs/2-1/priest.txt
index 0f5d811f2..b3cd7167b 100644
--- a/npc/jobs/2-1/priest.txt
+++ b/npc/jobs/2-1/priest.txt
@@ -62,7 +62,7 @@ prt_church,16,41,4	script	High Bishop#prst	1_M_PASTOR,{
 		if (BaseJob == Job_Priest) {
 			mes "[Bishop Paul]";
 			mes "Ah...";
-			if (Sex)
+			if (Sex == SEX_MALE)
 				mes "It is good to see you again, Brother " + strcharinfo(0) + ". Once again, God's grace has caused our paths to cross.";
 			else
 				mes "It is good to see you once again, Sister " + strcharinfo(0) + ". The grace of God has brought you once more before me.";
@@ -129,7 +129,7 @@ prt_church,16,41,4	script	High Bishop#prst	1_M_PASTOR,{
 		else if (BaseClass == Job_Novice) {
 			mes "[Bishop Paul]";
 			mes "May God be";
-			if (Sex)
+			if (Sex == SEX_MALE)
 				mes "with you, brother.";
 			else
 				mes "with you, sister.";
@@ -162,7 +162,7 @@ prt_church,16,41,4	script	High Bishop#prst	1_M_PASTOR,{
 		else {
 			mes "[Bishop Paul]";
 			mes "May God be";
-			if (Sex)
+			if (Sex == SEX_MALE)
 				mes "with you, brother.";
 			else
 				mes "with you, sister.";
@@ -217,7 +217,7 @@ prt_church,16,41,4	script	High Bishop#prst	1_M_PASTOR,{
 	if (PRIEST_Q == 0) {
 		mes "[Bishop Paul]";
 		mes "May God bless";
-		if (Sex)
+		if (Sex == SEX_MALE)
 			mes "you, Brother.";
 		else
 			mes "you, Sister.";
@@ -257,7 +257,7 @@ prt_church,16,41,4	script	High Bishop#prst	1_M_PASTOR,{
 				PRIEST_Q = 1;
 				setquest 8009;
 					mes "[Bishop Paul]";
-				if (Sex)
+				if (Sex == SEX_MALE)
 					mes "Now I will explain the Three Trials of Priesthood. These tribulations will bring you much suffering, but I hope you can complete them, Brother " + strcharinfo(0) + ".";
 				else
 					mes "Now I will explain the Three Trials of Priesthood. These tribulations will bring you much suffering, but I hope you can complete them, Sister " + strcharinfo(0) + ".";
@@ -342,7 +342,7 @@ prt_church,16,41,4	script	High Bishop#prst	1_M_PASTOR,{
 			mes "Thank you for asking.";
 			next;
 			mes "[Bishop Paul]";
-			if (Sex)
+			if (Sex == SEX_MALE)
 				mes "I hope you will continue to go on your mission as God's servant, brother.";
 			else
 				mes "I hope you will continue to go on your mission as God's servant, sister.";
@@ -514,7 +514,7 @@ prt_church,16,41,4	script	High Bishop#prst	1_M_PASTOR,{
 		mes "[Bishop Paul]";
 		mes "God, grant your power to your servant standing before you.";
 		changequest 8015,8016;
-		if (Sex)
+		if (Sex == SEX_MALE)
 			mes "Let him send your message throughout the ends of the earth.";
 		else
 			mes "Let her send your message throughout the ends of the earth.";
@@ -549,9 +549,9 @@ prt_church,27,24,1	script	Sister Cecilia	1_F_PRIEST,{
 	mes "[Sister Cecilia]";
 	if (BaseJob != Job_Acolyte) {
 		if (BaseJob == Job_Priest) {
-			mes "May god bless you, "+ (Sex ? "brother":"sister") +". It brings my heart joy to see that you working hard to carry out the will of God.";
+			mes "May god bless you, "+ (Sex == SEX_MALE ? "brother":"sister") +". It brings my heart joy to see that you working hard to carry out the will of God.";
 		} else if (Class == Job_Novice) {
-			mes "May god bless you, "+ (Sex ? "brother":"sister") +".";
+			mes "May god bless you, "+ (Sex == SEX_MALE ? "brother":"sister") +".";
 			mes "Prontera parish welcomes you.";
 			next;
 			mes "[Sister Cecilia]";
@@ -570,7 +570,7 @@ prt_church,27,24,1	script	Sister Cecilia	1_F_PRIEST,{
 			mes "But please...";
 			mes "Take your time, and decide what job will be the best for you.";
 		} else {
-			mes "May god bless you, "+ (Sex ? "brother":"sister") +".";
+			mes "May god bless you, "+ (Sex == SEX_MALE ? "brother":"sister") +".";
 			mes "Welcome to Prontera parish. How may I help you?";
 			next;
 			if (select("Tell me more about Priests.", "Nothing.") == 1) {
@@ -590,7 +590,7 @@ prt_church,27,24,1	script	Sister Cecilia	1_F_PRIEST,{
 		close;
 	}
 	if (PRIEST_Q == 0) {
-		if (Sex)
+		if (Sex == SEX_MALE)
 			mes "May God bless you, brother.";
 		else
 			mes "May God bless you, sister.";
@@ -671,7 +671,7 @@ prt_church,27,24,1	script	Sister Cecilia	1_F_PRIEST,{
 		mes "Welcome. You demonstrated great effort to accomplish your first trial. Now, speak to Bishop Paul so that you can begin your next trial on your path to Priesthood.";
 		next;
 		mes "[Sister Cecilia]";
-		if (Sex)
+		if (Sex == SEX_MALE)
 			mes "Brother "+ strcharinfo(0) +"...";
 		else
 			mes "Sister "+ strcharinfo(0) +"...";
@@ -717,14 +717,14 @@ prt_church,27,24,1	script	Sister Cecilia	1_F_PRIEST,{
 		}
 		next;
 		mes "[Sister Cecilia]";
-		if (Sex)
+		if (Sex == SEX_MALE)
 			mes "Brother "+ strcharinfo(0) +"...";
 		else
 			mes "Sister "+ strcharinfo(0) +"...";
 		mes "We will now begin your formal oath for the Priesthood. Make yourself comfortable, and just answer with your heart.";
 		next;
 		mes "[Sister Cecilia]";
-		if (Sex)
+		if (Sex == SEX_MALE)
 			mes "Brother "+ strcharinfo(0) +",";
 		else
 			mes "Sister "+ strcharinfo(0) +",";
@@ -815,7 +815,7 @@ prt_church,27,24,1	script	Sister Cecilia	1_F_PRIEST,{
 			close;
 		}
 		mes "[Sister Cecilia]";
-		if (Sex)
+		if (Sex == SEX_MALE)
 			mes "Brother "+ strcharinfo(0) +"...";
 		else
 			mes "Sister "+ strcharinfo(0) +"...";
@@ -860,7 +860,7 @@ job_prist,24,187,4	script	Peter S. Alberto	4_M_MINISTER,{
 	mes "[Father Peter]";
 	if (BaseJob == Job_Priest) {
 		mes "Welcome!";
-		if (Sex)
+		if (Sex == SEX_MALE)
 			mes "Brother "+ strcharinfo(0) +"!";
 		else
 			mes "Sister "+ strcharinfo(0) +"!";
@@ -1048,7 +1048,7 @@ job_prist,23,187,1	script	Peter S. Alberto#2	4_M_MINISTER,{
 	mes "[Father Peter]";
 	if (BaseJob == Job_Priest) {
 		mes "Welcome!";
-		if (Sex)
+		if (Sex == SEX_MALE)
 			mes "Brother "+ strcharinfo(0) +"!";
 		else
 			mes "Sister "+ strcharinfo(0) +"!";
diff --git a/npc/jobs/2-1/wizard.txt b/npc/jobs/2-1/wizard.txt
index e81b7a4b0..fdbbcef25 100644
--- a/npc/jobs/2-1/wizard.txt
+++ b/npc/jobs/2-1/wizard.txt
@@ -61,7 +61,7 @@ gef_tower,111,37,4	script	Wizard Guildsman	1_F_GYPSY,{
 			mes "Now, excuse me.";
 			next;
 			mes "[Catherine]";
-			if (Sex)
+			if (Sex == SEX_MALE)
 				mes "Well, If you intended to ask me on a date... I appreciate it...hohoho.";
 			else
 				mes "Well, if you fix me up with a cute guy... I'd appreciate it...hohoho!.";
@@ -389,7 +389,7 @@ gef_tower,111,37,4	script	Wizard Guildsman	1_F_GYPSY,{
 		mes "You...*sigh*...I didn't think you would do such a dishonorable thing.";
 		next;
 		mes "[Catherine]";
-		if (Sex) {
+		if (Sex == SEX_MALE) {
 			mes "Granted you're a mage, but how could a guy be so weak?!";
 			mes "Well, at least your alive still. Go back and try harder this time. ~tehehehe";
 		}
@@ -471,7 +471,7 @@ gef_tower,102,24,2	script	Gloomy Wizard	4_M_JOB_WIZARD,{
 			next;
 			mes "[Raulel]";
 			mes "Don't live dishonestly, or impolitely, or else one day you'll be caught in a spell you can't control, and BOOM, your dead!";
-			if (Sex) {
+			if (Sex == SEX_MALE) {
 				mes "If you don't want that to happen, then learn how to use spells properly!";
 				next;
 				mes "[Raulel]";
diff --git a/npc/jobs/2-1e/StarGladiator.txt b/npc/jobs/2-1e/StarGladiator.txt
index 311acb6a6..b48011dad 100644
--- a/npc/jobs/2-1e/StarGladiator.txt
+++ b/npc/jobs/2-1e/StarGladiator.txt
@@ -40,7 +40,7 @@ payon,215,102,3	script	Moohyun#job_star	4_M_ROGUE,3,3,{
 	if (Class == Job_Taekwon) {
 		if (STGL_Q == 0) {
 			mes "[Moohyun]";
-			if (Sex)
+			if (Sex == SEX_MALE)
 				mes "Hey, Taekwon Boy!";
 			else
 				mes "Hey, Taekwon Girl!";
@@ -315,7 +315,7 @@ payon,215,102,3	script	Moohyun#job_star	4_M_ROGUE,3,3,{
 	mes "[Moohyun]";
 	mes "Dude...";
 	mes "Whaddya want?";
-	if (Sex) {
+	if (Sex == SEX_MALE) {
 		mes "You wanna join up";
 		mes "with my martial arts";
 		mes "school? It's too late";
@@ -396,7 +396,7 @@ comodo,172,230,3	script	Wandering Master#job_sta	4_M_JOB_ASSASSIN,{
 					mes "Hm? You still have Skill";
 					mes "Points that you haven't yet";
 					mes "allocated. Use them, learn";
-					if (Sex == 0)
+					if (Sex == SEX_FEMALE)
 						mes "and improve your Taekwon Girl";
 					else
 						mes "and improve your Taekwon Boy";
diff --git a/npc/jobs/2-2/alchemist.txt b/npc/jobs/2-2/alchemist.txt
index 51a307e4f..c3d1f9479 100644
--- a/npc/jobs/2-2/alchemist.txt
+++ b/npc/jobs/2-2/alchemist.txt
@@ -461,7 +461,7 @@ alde_alche,175,107,3	script	Fastidious Alchemist#am	4_M_ALCHE_B,{
 				mes "Wait...";
 				mes "Maybe I've";
 				mes "misjudged you.";
-				if (Sex) {
+				if (Sex == SEX_MALE) {
 					mes "You might be a pretty boy,";
 					mes "but I can tell you're smart";
 					mes "from your eyes.";
diff --git a/npc/jobs/2-2/bard.txt b/npc/jobs/2-2/bard.txt
index 0def0ce9d..e44299193 100644
--- a/npc/jobs/2-2/bard.txt
+++ b/npc/jobs/2-2/bard.txt
@@ -93,7 +93,7 @@ comodo,226,123,5	script	Wandering Bard	2_M_BARD_ORIENT,{
 			mes "Always full of happy moments~";
 			next;
 			mes "[Lalo]";
-			if (Sex) {
+			if (Sex == SEX_MALE) {
 				mes "Forget about your worries~";
 				mes "And enjoy everything~";
 			}
@@ -107,8 +107,10 @@ comodo,226,123,5	script	Wandering Bard	2_M_BARD_ORIENT,{
 	else if(BARD_Q == 0) {
 		cutin "job_bard_aiolo01",2;
 		mes "[Lalo]";
-		if (Sex) mes "Hi! Delightful Archer.";
-		else mes "Hello! Beautiful Archer Lady.";
+		if (Sex == SEX_MALE)
+			mes "Hi! Delightful Archer.";
+		else
+			mes "Hello! Beautiful Archer Lady.";
 		mes "How can a wanderer like me help you?";
 		next;
 		switch(select("You have a nice voice.", "Could you sing for me, please?", "Nothing.")) {
@@ -160,7 +162,7 @@ comodo,226,123,5	script	Wandering Bard	2_M_BARD_ORIENT,{
 				mes "[Lalo]";
 				mes "Thanks! if you enjoyed my song, it makes me happy, too.";
 				next;
-				if (Sex == 1 && JobLevel > 39) {
+				if (Sex == SEX_MALE && JobLevel > 39) {
 					mes "[Lalo]";
 					mes "It would be nice if more people went around and sang...";
 					mes "Well, it's quite ok as it is now... hmmhmm.";
diff --git a/npc/jobs/2-2/crusader.txt b/npc/jobs/2-2/crusader.txt
index 77f85a8fd..d3afbd9d1 100644
--- a/npc/jobs/2-2/crusader.txt
+++ b/npc/jobs/2-2/crusader.txt
@@ -214,8 +214,10 @@ prt_castle,45,169,5	script	Senior Crusader	4_M_CRU_OLD,{
 			close;
 		}
 		mes "[Michael Halig]";
-		if (Sex) mes "If you, too, are a man of the sword, constantly train and prepare yourself. No one knows when the Holy War may begin.";
-		else mes "As a woman of the sword, you must train diligently and constantly. Prepare yourself, for no one knows when the Holy War may be coming.";
+		if (Sex == SEX_MALE)
+			mes "If you, too, are a man of the sword, constantly train and prepare yourself. No one knows when the Holy War may begin.";
+		else
+			mes "As a woman of the sword, you must train diligently and constantly. Prepare yourself, for no one knows when the Holy War may be coming.";
 		close;
 	}
 	else if(CRUS_Q >= 1 && CRUS_Q <= 3) {
@@ -302,8 +304,10 @@ prt_castle,45,169,5	script	Senior Crusader	4_M_CRU_OLD,{
 		mes "[Michael Halig]";
 		mes "Now you are";
 		mes "one of us!";
-		if (Sex) mes "...Brother.";
-		else mes "...Comrade.";
+		if (Sex == SEX_MALE)
+			mes "...Brother.";
+		else
+			mes "...Comrade.";
 		next;
 		if(.@Joblevel != 50) getitem 504, 6;
 		else getitem 504, 12;
@@ -353,8 +357,10 @@ prt_castle,164,32,1	script	Man in Anguish	4_M_JOB_KNIGHT1,{
 	else if(CRUS_Q == 4) {
 		mes "What is it...?";
 		mes "Do you have business";
-		if (Sex) mes "with me, man of the sword?";
-		else mes "with me, woman of the sword?";
+		if (Sex == SEX_MALE)
+			mes "with me, man of the sword?";
+		else
+			mes "with me, woman of the sword?";
 		next;
 		if (select("I'd like to take the Crusader test.", "Nothing.") == 1) {
 			mes "[Murnak Mijoul]";
diff --git a/npc/jobs/2-2/dancer.txt b/npc/jobs/2-2/dancer.txt
index b2c38dfd9..9aa3f3d5f 100644
--- a/npc/jobs/2-2/dancer.txt
+++ b/npc/jobs/2-2/dancer.txt
@@ -153,7 +153,7 @@ job_duncer,43,93,4	script	Aile#da	4_F_07,{
 		cutin "",255;
 		end;
 	}
-	if (DANC_Q == 0 && Sex == 0 && BaseJob == Job_Archer) {
+	if (DANC_Q == 0 && Sex == SEX_FEMALE && BaseJob == Job_Archer) {
 		cutin "job_dancer_eir01",2;
 		mes "[Aile]";
 		mes "Welcome~!";
@@ -228,8 +228,7 @@ job_duncer,43,93,4	script	Aile#da	4_F_07,{
 		close2;
 		cutin "",255;
 		end;
-	}
-	else if (Sex == 1) {
+	} else if (Sex == SEX_MALE) {
 		cutin "job_dancer_eir03",2;
 		mes "[Aile]";
 		mes "Welco--Mmm?";
diff --git a/npc/jobs/2-2/monk.txt b/npc/jobs/2-2/monk.txt
index 99f008834..95360f295 100644
--- a/npc/jobs/2-2/monk.txt
+++ b/npc/jobs/2-2/monk.txt
@@ -370,7 +370,7 @@ monk_in,99,58,1	script	Sensei Moohae#mk	1_M_PASTOR,{
 		}
 		mes "[Sensei Moohae]";
 		mes "There are still those who wish to follow the old ways.";
-		if (Sex)
+		if (Sex == SEX_MALE)
 			mes "A strong young man. I am pleased of your will to join us.";
 		else
 			mes "Such a delicate flower. I am pleased to see your will to join us.";
@@ -796,7 +796,7 @@ monk_in,99,58,1	script	Sensei Moohae#mk	1_M_PASTOR,{
 				next;
 				mes "[Sensei Moohae]";
 				mes "Then your training isn't completed.";
-				if (Sex)
+				if (Sex == SEX_MALE)
 					mes "You will not be accepted as a monk my boy.";
 				else
 					mes "You will not be accepted as a monk little girl.";
@@ -808,7 +808,7 @@ monk_in,99,58,1	script	Sensei Moohae#mk	1_M_PASTOR,{
 				mes "Come back later when you're ready...";
 				next;
 				mes "[Sensei Moohae]";
-				if (Sex)
+				if (Sex == SEX_MALE)
 					mes "I hope that you are able to realize what you are to become soon my boy...";
 				else
 					mes "I hope that you are able to realize what you are to become soon my girl...";
@@ -817,13 +817,13 @@ monk_in,99,58,1	script	Sensei Moohae#mk	1_M_PASTOR,{
 			mes "[Sensei Moohae]";
 			mes "Then your training is complete...";
 			mes "Please come closer.";
-			if (Sex)
+			if (Sex == SEX_MALE)
 				mes "We welcome you brother, in our holy battle against evil!";
 			else
 				mes "We welcome you sister, in our holy battle against evil!";
 			next;
 			mes "[Sensei Moohae]";
-			if (Sex)
+			if (Sex == SEX_MALE)
 				mes "My brother, your oath has been heard by all around us.";
 			else
 				mes "My sister, your oath has been heard by all around us.";
diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt
index ac5a96919..dc600a837 100644
--- a/npc/jobs/2-2/rogue.txt
+++ b/npc/jobs/2-2/rogue.txt
@@ -101,7 +101,7 @@ in_rogue,363,122,4	script	Rogue Guildsman#rg	4_F_ROGUE,{
 				mes "[Rogue Guildsman]";
 				mes "So what's a kid";
 				mes "like you doin' here?";
-				if (Sex) {
+				if (Sex == SEX_MALE) {
 					mes "Oh, I get it now...";
 					mes "The widdle boy wants";
 				}
diff --git a/npc/jobs/2-2e/SoulLinker.txt b/npc/jobs/2-2e/SoulLinker.txt
index 3bd026a32..f08015193 100644
--- a/npc/jobs/2-2e/SoulLinker.txt
+++ b/npc/jobs/2-2e/SoulLinker.txt
@@ -52,7 +52,7 @@ morocc_in,174,30,6	script	Kid#link1	4_M_KID2,{
 	}
 	if (Class == Job_Star_Gladiator) {
 		mes "[Kid]";
-		if (Sex == 1) {
+		if (Sex == SEX_MALE) {
 			mes "Aren't you a warrior";
 			mes "of the sun? I'm familiar";
 		}
diff --git a/npc/jobs/novice/supernovice.txt b/npc/jobs/novice/supernovice.txt
index 654138e10..ebe4ef8e2 100644
--- a/npc/jobs/novice/supernovice.txt
+++ b/npc/jobs/novice/supernovice.txt
@@ -406,7 +406,7 @@ aldeba_in,216,169,5	script	Esseray#sn	4_M_04,{
 aldebaran,54,238,5	script	Kafra Employee#sn	4_F_KAFRA1,{
 	if (BaseJob == Job_SuperNovice) {
 		mes "[Kafra Employee]";
-		if (Sex )
+		if (Sex == SEX_MALE)
 			mes "Hello, Mister Super Novice~";
 		else
 			mes "Hello, Super Novice, Ma'am.";