Replaced hardcoded genders with constants (#1730)

* Replaced hardcoded gender codes in source

Introduced a new constant for the account based gender and replaced all hardcoded gender references to code 99 with it.

* Replaced hardcoded gender codes in npcs

Exported the gender constants into the script engine and replaced all usages with references to the constants instead of expecting a value behind them.

* Corrected a typo

Thanks to Machiezmo from Discord.

* Fixed an inverted gender logic

Thanks to @secretdataz

npc/cities/aldebaran.txt

@@ -688,7 +688,7 @@ aldeba_in,156,179,4	script	Master#alde	61,{
 	mes "Who's your";
 	mes "favorite Kafra girl?";
 	next;
-	if (Sex == 0) {
+	if (Sex == SEX_FEMALE) {
 		mes "[Master]";
 		mes "Oh, and don't worry. I know that girls have some kind of opinion about how pretty other girls are.";
 		next;

npc/cities/amatsu.txt

@@ -383,7 +383,7 @@ amatsu,243,202,3	script	Drama Teacher#ama	760,{
 	mes "Also, this town is the origin of";
 	mes "legendary play, 'White Dryad.' ";
 	next;
-	if (Sex) {
+	if (Sex == SEX_MALE) {
 		mes "[Garakame sensei]";
 		mes "If you know a girl who is";
 		mes "talented in acting, please";
@@ -531,7 +531,7 @@ amatsu,262,197,1	script	Legendary Tree	111,{
 		mes "Nymph of cherry tree... What would";
 		mes "be her position in the play?^000000";
 		next;
-		if (Sex) {
+		if (Sex == SEX_MALE) {
 			mes "^3355FFI would like to find";
 			mes "a person who is talented";
 			mes "in acting and help her until";

npc/cities/einbech.txt

@@ -516,7 +516,7 @@ einbech,46,107,6	script	Shena#ein::EinMonsters	846,{
 		mes "adorable little girl?";
 		mes "Hello, dearie~";
 		next;
-		if (Sex) {
+		if (Sex == SEX_MALE) {
 			select("Excuse me, but I'm actually a guy.");
 			mes "[Shena]";
 			mes "Oh, oh are you now?";
@@ -542,7 +542,7 @@ einbech,46,107,6	script	Shena#ein::EinMonsters	846,{
 		mes "about the monsters around";
 		mes "here, young lady?";
 		next;
-		if (Sex) {
+		if (Sex == SEX_MALE) {
 			select("I told you, I'm a dude...!");
 			mes "[Shena]";
 			mes "Hmm. ''Dude.'' I think";

npc/cities/geffen.txt

@@ -131,7 +131,7 @@ geffen,111,48,0	script	Stacey	101,{
 		mes "Is that an Orc Helm you're wearing?! That's so cool! Wow...";
 		next;
 		mes "[Stacey]";
-		if (Sex) {
+		if (Sex == SEX_MALE) {
 			mes "You look so...";
 			mes "Rugged and manly~";
 		}
@@ -152,7 +152,7 @@ geffen,111,48,0	script	Stacey	101,{
 		mes "of Orc Hero!";
 		next;
 		mes "[Stacey]";
-		if (Sex) {
+		if (Sex == SEX_MALE) {
 			mes "It's...";
 			mes "It's like you're surrounded by this incredibly masculine aura! Oooh~! You must be irresistable to all the girls!";
 			next;
@@ -226,7 +226,7 @@ OnTouch_:
 	mes "You wanna get your hands on some great stuff? Come on over!^000000";
 	next;
 	mes "[Suspicious Guy]";
-	if (Sex)
+	if (Sex == SEX_MALE)
 		mes "Hey there tough guy. You look smart enough to recognize a bargain when it's right in front of your eyes.";
 	else
 		mes "Well, well, well. Aren't you a pretty girl. Today just happens to be your lucky day!";
@@ -261,7 +261,7 @@ OnTouch_:
 			input .@input;
 			if (.@input == 0) {
 				mes "[Suspicious Guy]";
-				if (Sex)
+				if (Sex == SEX_MALE)
 					mes "Ah duuuuuude~ You're breakin' my heart! I mean, at these prices, I'm practically performing charity!";
 				else
 					mes "W-waaaait! You didn't let me tell you the part about how Red Potions help you lose and gain weight in all the right places! Waaaaait!";
@@ -293,7 +293,7 @@ OnTouch_:
 		break;
 	case 2:
 		mes "[Suspicious Guy]";
-		if (Sex) {
+		if (Sex == SEX_MALE) {
 			mes "What would a strong guy like you want a knife for? Those will just break under the force of your incredibly powerful swings!";
 			next;
 			mes "[Suspicious Guy]";
@@ -358,7 +358,7 @@ OnTouch_:
 		break;
 	case 3:
 		mes "[Suspicious Guy]";
-		if (Sex)
+		if (Sex == SEX_MALE)
 			mes "A Manteau? That's old news! You know what's the latest in protective armors?";
 		else
 			mes "Now why would such a beautiful woman wear something out of style? You know what would make you look even better?";
@@ -612,7 +612,7 @@ geffen_in,27,134,5	script	Waitress#elen	91,{
 		mes "I hear there's this person somewhere in Rune-Midgard...";
 		next;
 		mes "[Elenore]";
-		if (Sex)
+		if (Sex == SEX_MALE)
 			mes "Tell me, have you ever heard of "+strcharinfo(0)+"? He's supposed to be the suavest hero around!";
 		else
 			mes "Have you ever heard of "+strcharinfo(0)+"? People say she's one of the prettiest girls in all of Rune-Midgard!";
@@ -652,7 +652,7 @@ geffen_in,27,134,5	script	Waitress#elen	91,{
 			mes "^990000Hey you sex crazed bastard!! Stop looking at my daughter like that before I rip out your eyes, and eat them with pasta!^000000";
 			next;
 			mes "["+strcharinfo(0)+"]";
-			if (Sex) {
+			if (Sex == SEX_MALE) {
 				mes "Huh...?";
 				mes "C-come again?";
 				next;
@@ -768,7 +768,7 @@ geffen_in,70,67,3	script	Waitress#elise	90,{
 			mes "^990000Stay away from my daughter, or I'll beat your brains out, punk! Elisa's gonna marry a doctor! Or a lawyer!^000000";
 			next;
 			mes "["+strcharinfo(0)+"]";
-			if (Sex) {
+			if (Sex == SEX_MALE) {
 				mes "Y-y-y-yes, sir!";
 				next;
 				mes "^3355FFThat was scary...!";
@@ -1039,7 +1039,7 @@ geffen_in,39,127,2	script	Psychic Advisor	704,{
 			break;
 		case 3:
 			mes "Um...";
-			if (Sex)
+			if (Sex == SEX_MALE)
 				mes "The girl that you";
 			else
 				mes "The boy that you";
@@ -1057,7 +1057,7 @@ geffen_in,39,127,2	script	Psychic Advisor	704,{
 				mes "You didn't let me finish my sentence. What I meant to say was...";
 				next;
 				mes "[Psychic Advisor]";
-				if (Sex)
+				if (Sex == SEX_MALE)
 					mes "The girl that you";
 				else
 					mes "The boy that you";
@@ -1076,7 +1076,7 @@ geffen_in,39,127,2	script	Psychic Advisor	704,{
 				mes "Sometimes, I get the future and the present mixed up. You know, since I'm always looking into the future...?";
 				next;
 				mes "[Psychic Advisor]";
-				if (Sex) {
+				if (Sex == SEX_MALE) {
 					mes "What I meant to say was";
 					mes "^3355FFyou and the perfect woman will soon fall in love^000000. Yes, that's what I meant!";
 				}

npc/cities/jawaii.txt

@@ -503,7 +503,7 @@ jawaii_in,25,98,0	script	Employee#jaw3	724,{
 		mes "Oh~";
 		mes "Look at you...";
 		mes "You look perfect";
-		if (Sex)
+		if (Sex == SEX_MALE)
 			mes "for your wife~";
 		else
 			mes "with your husband~";
@@ -517,7 +517,7 @@ jawaii_in,25,98,0	script	Employee#jaw3	724,{
 		mes "Hmm...?";
 		mes "You don't look like";
 		mes "you're married, are you?";
-		if (Sex) {
+		if (Sex == SEX_MALE) {
 			next;
 			mes "[Employee Buffy]";
 			mes "I'm pretty good";
@@ -1176,7 +1176,7 @@ jawaii_in,41,106,3	script	Customer#Cage	98,{
 		mes "After all, everyone knows marriage is a sham for desperate, lonely people!";
 		next;
 		mes "[Cage]";
-		if (Sex) {
+		if (Sex == SEX_MALE) {
 			mes "I don't trust anybody!";
 			mes "You're a fool for chaining";
 			mes "yourself to some gorgeous";
@@ -1356,7 +1356,7 @@ prt_in,173,13,4	script	Customer#SoloHan	86,{
 		mes "...Wha!?";
 		mes "Oh man!";
 		mes "Get outta my face!";
-		if (Sex) {
+		if (Sex == SEX_MALE) {
 			mes "You smell like,";
 			mes "whupped boyfriend";
 			mes "or something!";

npc/cities/lighthalzen.txt

@@ -892,7 +892,7 @@ lhz_in02,283,276,4	script	Customer#amano12	815,{
 	mes "to ask me out or something?";
 	next;
 	mes "[Sei]";
-	if (Sex == 1) {
+	if (Sex == SEX_MALE) {
 		mes "Well, if he does,";
 		mes "shouldn't he have";
 		mes "more guts? Or are ";
@@ -1546,7 +1546,7 @@ lhz_in03,192,19,3	script	Haggar#zen1	855,{
 
 lhz_in03,193,25,2	script	Bartender#12	61,{
 	mes "[Tony]";
-	if (Sex) {
+	if (Sex == SEX_MALE) {
 		mes "Hey man, I know this";
 	}
 	else {
@@ -2949,7 +2949,7 @@ lhz_in01,139,48,7	script	Leimi#mimir	73,{
 	mes "Um, may I help you?";
 	emotion e_omg;
 	if (BaseJob == Job_Assassin) {
-		if (Sex) {
+		if (Sex == SEX_MALE) {
 			next;
 			mes "[Leimi]";
 			mes "Oh, you're an Assassin!";
@@ -2972,7 +2972,7 @@ lhz_in01,139,48,7	script	Leimi#mimir	73,{
 lhz_in01,138,47,0	script	#mimir_camera	-1,2,2,{
 OnTouch_:
 	if (BaseJob == Job_Assassin) {
-		if (Sex) {
+		if (Sex == SEX_MALE) {
 			mes "^3355FF*Click*^000000";
 			next;
 			mes "["+strcharinfo(0)+"]";

npc/cities/louyang.txt

@@ -121,7 +121,7 @@ lou_fild01,190,100,7	script	Girl#1lou	815,{
 	mes "stay and enjoy the";
 	mes "the food and the sights!";
 	next;
-	if (Sex) {
+	if (Sex == SEX_MALE) {
 		mes "[Girl]";
 		mes "And by sights...";
 		mes "I mean girls!";
@@ -138,7 +138,7 @@ lou_fild01,190,100,7	script	Girl#1lou	815,{
 // Generic Louyang NPCs
 //============================================================
 louyang,297,167,2	script	Muscular Woman#lou	815,{
-	if (!Sex) {
+	if (Sex == SEX_FEMALE) {
 		mes "[Zhi Ching Li]";
 		mes "All the members of the Maiden Palace, including myself and our master, are all female.";
 		next;

npc/cities/payon.txt

@@ -142,7 +142,7 @@ payon,249,156,1	script	Woman#payon	66,{
 	mes " To be honest, things are getting tough because of all those monsters. ^666666*Sigh...*^000000";
 	next;
 	mes "[Woman]";
-	if (Sex == 1)
+	if (Sex == SEX_MALE)
 		mes "Whoa~! I just noticed those arms of yours look pretty solid. You look pretty strong, guy. Just how many monsters have you killed?!";
 	else
 		mes "Oooh! I didn't notice before, but you look pretty strong beneath all of that feminine charm.";
@@ -191,7 +191,7 @@ payon,246,158,5	script	Woman#2payon	66,0,0,{
 	mes "of the people living in Payon by her behavior. She's the only loudmouth. I guess she's just too excited about what the fortune teller told her.";
 	next;
 	mes "[Jim's Mother]";
-	if (Sex == 1) {
+	if (Sex == SEX_MALE) {
 		mes "Ooh...!";
 		mes "You've got";
 		mes "such broad shoulders!";
@@ -387,7 +387,7 @@ payon_in01,180,7,2	script	Waitress#payon	90,{
 	mes "And lonely...";
 	next;
 	mes "[Pub Lady]";
-	if (Sex == 1)
+	if (Sex == SEX_MALE)
 		mes "Where I can find the right person, a hot and Sexy hunk who can take me away from here? Um, hey mister, are you listening?";
 	else {
 		mes "Where I can find the right person, a cute, yet hard-bodied hunk who can take me away from here?";

npc/cities/prontera.txt

@@ -469,7 +469,7 @@ prt_in,177,18,2	script	Marvin#pront	80,{
 	mes "Whether it's schmoozing with a member of the opposite sex, or battling monsters, I gotta say, it's all about ^333399skills^000000.";
 	next;
 	mes "[Marvin]";
-	if (Sex)
+	if (Sex == SEX_MALE)
 		mes "I can't help you much when it comes to the subject of talking to attractive women such as myself, but I can tell you a little more about skills that help in battle.";
 	else
 		mes "I don't really have any advice for skills when it comes to talking to a cute guy, but I can let you in on what I know about skills that help in battle.";

npc/custom/etc/airplane.txt

@@ -254,8 +254,8 @@ L_Nope:
 
 Notime:
 	mes "^FF0000[Porter]^000000";
-	if(Sex==0) mes "Sorry, ma'am, but the plane currently isn't ported.  However, you can view the airplane's hourly itinerary.";
+	if(Sex==SEX_FEMALE) mes "Sorry, ma'am, but the plane currently isn't ported.  However, you can view the airplane's hourly itinerary.";
-	if(Sex==1) mes "Sorry, sir, but the plane currently isn't ported.  However, you can view the airplane's hourly itinerary.";
+	else mes "Sorry, sir, but the plane currently isn't ported.  However, you can view the airplane's hourly itinerary.";
 	next;
 	menu "Yes, please.",Itin,"No thanks.",L_Nope;
 	close;
@@ -365,8 +365,8 @@ Lnope:
 
 Notime:
 	mes "^FF0000[Airplane Attendant]^000000";
-	if(Sex==0) mes "Sorry, ma'am, but the plane currently isn't docked.  Please wait.";
+	if(Sex==SEX_FEMALE) mes "Sorry, ma'am, but the plane currently isn't docked.  Please wait.";
-	if(Sex==1) mes "Sorry, sir, but the plane currently isn't docked.  Please wait.";
+	else mes "Sorry, sir, but the plane currently isn't docked.  Please wait.";
 	close;
 
 Nowhere:

npc/custom/etc/marriage.txt

@@ -394,19 +394,19 @@ OnTimer55000:
 
 //Subfunction: Checks that the groom/bride is still wearing their stuff.
 function SF_equip_check {
-	if (Sex && getequipid(EQI_ARMOR) != 7170) {
+	if (Sex == SEX_MALE && getequipid(EQI_ARMOR) != 7170) {
 		mes "["+@name$+"]";
 		mes "Child, what did you do with your "+getitemname(7170)+"?";
 		emotion e_dots;
 		return 0;
 	}
-	if (Sex == 0 && getequipid(EQI_ARMOR) != 2338) {
+	if (Sex == SEX_FEMALE && getequipid(EQI_ARMOR) != 2338) {
 		mes "["+@name$+"]";
 		mes "Child, you are supposed to wear a "+getitemname(2338)+" at all times during the ceremony...";
 		emotion e_dots;
 		return 0;
 	}
-	if (Sex == 0 && $@wed_veil && getequipid(EQI_HEAD_TOP) != 2206) {
+	if (Sex == SEX_FEMALE && $@wed_veil && getequipid(EQI_HEAD_TOP) != 2206) {
 		mes "["+@name$+"]";
 		mes "Child, you can't take off your "+getitemname(2206)+" yet....";
 		emotion e_dots;
@@ -489,7 +489,7 @@ function SF_Register {
 		mes "Very well, whom would you like to register as?";
 		next;
 		set @submenu, select("Groom","Bride","Cancel");
-	} else if (Sex) { //Groom
+	} else if (Sex == SEX_MALE) { //Groom
 		mes "["+@name$+"]";
 		mes "Very well, will you register as the Groom?";
 		next;
@@ -549,7 +549,7 @@ function SF_WedProgress {
 			mes "Tell your groom to register, what is taking so long? Time is running out.";
 		close;
 	}
-	if (($wed_groom_progress == 0) && (Sex == 1 || $@wed_allow == 1)) {
+	if (($wed_groom_progress == 0) && (Sex == SEX_MALE || $@wed_allow == 1)) {
 		mes "["+@name$+"]";
 		mes $wed_bride$+" is waiting for the groom to register. Are you the one who came to register as groom?";
 		next;
@@ -571,7 +571,7 @@ function SF_WedProgress {
 		}
 
 	}
-	if (($wed_bride_progress == 0) && (Sex == 0 || $@wed_allow == 1)) {
+	if (($wed_bride_progress == 0) && (Sex == SEX_FEMALE || $@wed_allow == 1)) {
 		mes "["+@name$+"]";
 		mes $wed_groom$+" is waiting for the bride to register. Are you the one who came to register as the bride?";
 		next;
@@ -687,7 +687,7 @@ function SF_TryRegister {
 		emotion e_gasp;
 		close;
 	}
-	if (Sex)
+	if (Sex == SEX_MALE)
 		set @item, 7170;
 	else
 		set @item, 2338;
@@ -697,7 +697,7 @@ function SF_TryRegister {
 		mes "You should be wearing a "+getitemname(@item)+" if you want to get married.";
 		close;
 	}
-	if (Sex == 0 && $@wed_veil && getequipid(EQI_HEAD_TOP) != 2206) {
+	if (Sex == SEX_FEMALE && $@wed_veil && getequipid(EQI_HEAD_TOP) != 2206) {
 		mes "["+@name$+"]";
 		mes "Where is your "+getitemname(2206)+"? It's a necessary complement to your dress.";
 		close;

npc/custom/etc/penal_servitude.txt

@@ -19,7 +19,7 @@
 sec_pri,36,58,1	script	Chief Warder	105,{ 
 	mes "[Saddeus]";
 	emotion e_what;
-	mes (Sex?"Mr.":"Ms.")+" Prisoner #"+BaseLevel+JobLevel+",";
+	mes (Sex==SEX_MALE?"Mr.":"Ms.")+" Prisoner #"+BaseLevel+JobLevel+",";
 	mes "what's the noise over there?";
 	next;
 	menu "Let me free, I'll pay!",-, "Let me to work off my freedom!",M_Q1, "Nothing",M_NO_THANKS;

npc/custom/events/holiday/uneasy_cemetery.txt

@@ -47,8 +47,8 @@ OnZombieDead:
 	if ($@UNEASY_MOB>0) end;
 	set $UNEASY_DL,0;
 	set $UNEASY_H$,strcharinfo(0);
-	if (Sex==1) mapannounce "prontera","[Mother Mathana]: Brave "+$UNEASY_H$+" has just killed the last undead in Prontera!",0;
+	if (Sex==SEX_MALE) mapannounce "prontera","[Mother Mathana]: Brave "+$UNEASY_H$+" has just killed the last undead in Prontera!",0;
-	if (Sex==0) mapannounce "prontera","[Mother Mathana]: Lady "+$UNEASY_H$+" has just killed the last undead in Prontera!",0;
+	else mapannounce "prontera","[Mother Mathana]: Lady "+$UNEASY_H$+" has just killed the last undead in Prontera!",0;
 	set JobExp,JobExp+100;
 	set BaseExp,BaseExp+50;
 	end;
@@ -105,8 +105,8 @@ L_Undead_Walk:
 	mes "[Mother Mathana]";
 	mes "Our Church is going to thank you personally...";
 	next;
-	if (Sex==1) mapannounce "prontera","[Mother Mathana]: In the name of Odin we declare handsom "+$UNEASY_H$+" as a Prontera savior!",0;
+	if (Sex==SEX_MALE) mapannounce "prontera","[Mother Mathana]: In the name of Odin we declare handsom "+$UNEASY_H$+" as a Prontera savior!",0;
-	if (Sex==0) mapannounce "prontera","[Mother Mathana]: In the name of Odin we declare beautiful "+$UNEASY_H$+" as a Prontera savior!",0;
+	else mapannounce "prontera","[Mother Mathana]: In the name of Odin we declare beautiful "+$UNEASY_H$+" as a Prontera savior!",0;
 	mes "[Mother Mathana]";
 	mes "In the name of Odin we bless you and decently present a modest gift just from Mareusis' wine-cellar.";
 	getitem 505,1; //Blue_Potion

npc/custom/events/holiday/valentinesdayexp.txt

@@ -62,9 +62,9 @@ M_INFO:
 
 OnInit:
 	//559,Hand-made_Chocolate
-	setitemscript 559,"{ itemheal 50,50; if(Sex==0 || @dsv == gettime(3)+1 || ispartneron()==0)end; set @dsv,gettime(3)+1; misceffect 113; }";
+	setitemscript 559,"{ itemheal 50,50; if(Sex==SEX_FEMALE || @dsv == gettime(3)+1 || ispartneron()==0)end; set @dsv,gettime(3)+1; misceffect 113; }";
 	//560,Hand-made_White_Chocolate
-	setitemscript 560,"{ itemheal 50,50; if(Sex || @dsv == gettime(3)+1 || ispartneron()==0)end; set @dsv,gettime(3)+1; misceffect 113; }";
+	setitemscript 560,"{ itemheal 50,50; if(Sex==SEX_MALE || @dsv == gettime(3)+1 || ispartneron()==0)end; set @dsv,gettime(3)+1; misceffect 113; }";
 
 	//2634,Wedding_Ring_M,Wedding Ring,5,,10,0,,0,,0,127918079,7,1,136,,0,0,0,{ skill 334,1; skill 335,1; skill 336,1; }
 	setitemscript 2634,"{ skill 334,1; skill 335,1; skill 336,1; if(@dsv == gettime(3)+1 && ispartneron()){ bonus2 bExpAddRace,5,50; bonus2 bExpAddRace,6,50; bonus2 bExpAddRace,7,50; bonus2 bExpAddRace,8,50; bonus2 bExpAddRace,1,50; } }";

npc/events/christmas_2005.txt

@@ -924,7 +924,7 @@ prontera,156,242,0	script	Oholy#pron::OholyDup	79,{
 		mes "The Lord has come.";
 		specialeffect EF_GLORIA;
 		next;
-		if (Sex) {
+		if (Sex == SEX_MALE) {
 			mes "[Oholy]";
 			mes "Merry Christmas!";
 			mes "Dear brother, what comes in";

npc/events/christmas_2008.txt

@@ -41,7 +41,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 			next;
 			mes "[Caroller]";
 			mes "Merry Christmas!";
-			if (Sex) {
+			if (Sex == SEX_MALE) {
 				mes "Hey, boy! What comes to mind when";
 			} else {
 				mes "Hey, girl! What comes to mind when";
@@ -454,7 +454,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 
 	case 2:
 		mes "[Santa Claus]";
-		if (Sex) {
+		if (Sex == SEX_MALE) {
 			mes "Ho ho ho! What a good boy!";
 		} else {
 			mes "Ho ho ho! What a good girl!";
@@ -687,7 +687,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 		next;
 		mes "[Santa Claus]";
 		mes "........................";
-		if (Sex) {
+		if (Sex == SEX_MALE) {
 			mes "Oh! Poor boy...";
 		} else {
 			mes "Oh! Poor girl...";
@@ -695,7 +695,7 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 		next;
 		mes "[Santa Claus]";
 		mes "........................";
-		if (Sex) {
+		if (Sex == SEX_MALE) {
 			mes "Oh! Poor boy...";
 		} else {
 			mes "Oh! Poor girl...";

npc/events/valentinesday_2009.txt

@@ -380,7 +380,7 @@ prontera,154,185,5	script	Event Ring Maker#Val09	721,{
 	delitem 7948,1;
 	set Zeny,Zeny-1000;
 	set iROval09ring,1;
-	if (Sex) {
+	if (Sex == SEX_MALE) {
 		getnameditem 12742,strcharinfo(0);
 	} else {
 		getnameditem 12743,strcharinfo(0);
@@ -438,7 +438,7 @@ prontera,157,185,4	script	Valentine Vote Manager#v	113,{
 					break;
 				}
 				
-				if (Sex) {
+				if (Sex == SEX_MALE) {
 					if (countitem(7947) > .@input) {
 						mes "[Valentine Vote Manager]";
 						mes "Seems like the value you entered is too small.";
@@ -522,7 +522,7 @@ prontera,157,185,4	script	Valentine Vote Manager#v	113,{
 // Charles Orleans (Makes Home-Made Chocolates)
 //============================================================
 prt_castle,42,35,3	script	Dessert Manager#Val09	47,{
-	if (Sex) {
+	if (Sex == SEX_MALE) {
 		mes "[Charles Orleans]";
 		mes "Monsieur~! What brings you to my beautiful atelier?";
 		mes "What is it that you want?";

npc/jobs/1-1e/taekwon.txt

@@ -381,7 +381,7 @@ payon,157,141,5	script	Phoenix#TKJobChange	753,{
 			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 {
 				mes "are now a ^FF0000Taekwon Boy^000000.";

npc/jobs/2-1/assassin.txt

@@ -385,7 +385,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']";
@@ -1887,7 +1887,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.";

npc/jobs/2-1/blacksmith.txt

@@ -86,7 +86,7 @@ ein_in01,18,28,4	script	Guildsman#BLS	731,{
 
 	if (BaseClass == Job_Novice) {
 		mes "[Altiregen]";
-		if (Sex == 0) {
+		if (Sex == SEX_FEMALE) {
 			mes "Oh~";
 			mes "what a very";
 			mes "pretty lady!";

npc/jobs/2-1/hunter.txt

@@ -438,7 +438,7 @@ hu_in01,386,373,4	script	Hunter Guildsman#hnt	727,{
 			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~";

npc/jobs/2-1/knight.txt

@@ -68,7 +68,7 @@ prt_in,88,101,4	script	Chivalry Captain#knt	56,{
 				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]";
@@ -102,7 +102,7 @@ prt_in,88,101,4	script	Chivalry Captain#knt	56,{
 		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.";
@@ -336,7 +336,7 @@ prt_in,88,101,4	script	Chivalry Captain#knt	56,{
 			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)?"":"s")+"he will continue to be loyal after becoming a Knight.";
 		}
 		next;
 		mes "[Captain Herman]";
@@ -373,7 +373,7 @@ prt_in,88,101,4	script	Chivalry Captain#knt	56,{
 		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!";
 		}
@@ -392,7 +392,7 @@ prt_in,88,101,4	script	Chivalry Captain#knt	56,{
 		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.";
 		}
@@ -407,7 +407,7 @@ prt_in,88,101,4	script	Chivalry Captain#knt	56,{
 		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";
@@ -750,7 +750,7 @@ prt_in,71,91,0	script	Sir Siracuse#knt	65,{
 			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]";
@@ -2358,7 +2358,7 @@ prt_in,87,92,4	script	Sir Gray#knt	119,{
 				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;

npc/jobs/2-1/priest.txt

@@ -49,7 +49,7 @@ prt_church,16,41,4	script	High Bishop#prst	60,{
 		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.";
@@ -116,7 +116,7 @@ prt_church,16,41,4	script	High Bishop#prst	60,{
 		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.";
@@ -149,7 +149,7 @@ prt_church,16,41,4	script	High Bishop#prst	60,{
 		else {
 			mes "[Bishop Paul]";
 			mes "May God be";
-			if (Sex)
+			if (Sex == SEX_MALE)
 				mes "with you, brother.";
 			else
 				mes "with you, sister.";
@@ -204,7 +204,7 @@ prt_church,16,41,4	script	High Bishop#prst	60,{
 	if (PRIEST_Q == 0) {
 		mes "[Bishop Paul]";
 		mes "May God bless";
-		if (Sex)
+		if (Sex == SEX_MALE)
 			mes "you, Brother.";
 		else
 			mes "you, Sister.";
@@ -244,7 +244,7 @@ prt_church,16,41,4	script	High Bishop#prst	60,{
 				set 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) + ".";
@@ -329,7 +329,7 @@ prt_church,16,41,4	script	High Bishop#prst	60,{
 			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.";
@@ -501,7 +501,7 @@ prt_church,16,41,4	script	High Bishop#prst	60,{
 		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.";
@@ -536,9 +536,9 @@ prt_church,27,24,1	script	Sister Cecilia	79,{
 	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]";
@@ -557,7 +557,7 @@ prt_church,27,24,1	script	Sister Cecilia	79,{
 			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) {
@@ -577,7 +577,7 @@ prt_church,27,24,1	script	Sister Cecilia	79,{
 		close;
 	}
 	if (PRIEST_Q == 0) {
-		if (Sex)
+		if (Sex == SEX_MALE)
 			mes "May God bless you, brother.";
 		else
 			mes "May God bless you, sister.";
@@ -658,7 +658,7 @@ prt_church,27,24,1	script	Sister Cecilia	79,{
 		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) +"...";
@@ -704,14 +704,14 @@ prt_church,27,24,1	script	Sister Cecilia	79,{
 		}
 		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) +",";
@@ -802,7 +802,7 @@ prt_church,27,24,1	script	Sister Cecilia	79,{
 			close;
 		}
 		mes "[Sister Cecilia]";
-		if (Sex)
+		if (Sex == SEX_MALE)
 			mes "Brother "+ strcharinfo(0) +"...";
 		else
 			mes "Sister "+ strcharinfo(0) +"...";
@@ -848,7 +848,7 @@ job_prist,24,187,4	script	Peter S. Alberto	110,{
 	mes "[Father Peter]";
 	if (BaseJob == Job_Priest) {
 		mes "Welcome!";
-		if (Sex)
+		if (Sex == SEX_MALE)
 			mes "Brother "+ strcharinfo(0) +"!";
 		else
 			mes "Sister "+ strcharinfo(0) +"!";
@@ -1036,7 +1036,7 @@ job_prist,23,187,1	script	Peter S. Alberto#2	110,{
 	mes "[Father Peter]";
 	if (BaseJob == Job_Priest) {
 		mes "Welcome!";
-		if (Sex)
+		if (Sex == SEX_MALE)
 			mes "Brother "+ strcharinfo(0) +"!";
 		else
 			mes "Sister "+ strcharinfo(0) +"!";

npc/jobs/2-1/wizard.txt

@@ -47,7 +47,7 @@ gef_tower,111,37,4	script	Wizard Guildsman	70,{
 			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!.";
@@ -375,7 +375,7 @@ gef_tower,111,37,4	script	Wizard Guildsman	70,{
 		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";
 		}
@@ -457,7 +457,7 @@ gef_tower,102,24,2	script	Gloomy Wizard	735,{
 			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]";

npc/jobs/2-1e/StarGladiator.txt

@@ -23,7 +23,7 @@ payon,215,102,3	script	Moohyun#job_star	828,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!";
@@ -298,7 +298,7 @@ payon,215,102,3	script	Moohyun#job_star	828,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";
@@ -379,7 +379,7 @@ comodo,172,230,3	script	Wandering Master#job_sta	730,{
 					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";

npc/jobs/2-2/alchemist.txt

@@ -443,7 +443,7 @@ alde_alche,175,107,3	script	Fastidious Alchemist#am	749,{
 				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.";

npc/jobs/2-2/bard.txt

@@ -82,7 +82,7 @@ comodo,226,123,5	script	Wandering Bard	741,{
 			mes "Always full of happy moments~";
 			next;
 			mes "[Lalo]";
-			if (Sex) {
+			if (Sex == SEX_MALE) {
 				mes "Forget about your worries~";
 				mes "And enjoy everything~";
 			}
@@ -96,7 +96,7 @@ comodo,226,123,5	script	Wandering Bard	741,{
 	else if(BARD_Q == 0) {
 		cutin "job_bard_aiolo01",2;
 		mes "[Lalo]";
-		if (Sex) mes "Hi! Delightful Archer.";
+		if (Sex == SEX_MALE) mes "Hi! Delightful Archer.";
 		else mes "Hello! Beautiful Archer Lady.";
 		mes "How can a wanderer like me help you?";
 		next;
@@ -149,7 +149,7 @@ comodo,226,123,5	script	Wandering Bard	741,{
 				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.";

npc/jobs/2-2/crusader.txt

@@ -207,7 +207,7 @@ prt_castle,45,169,5	script	Senior Crusader	752,{
 			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.";
+		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;
 	}
@@ -295,7 +295,7 @@ prt_castle,45,169,5	script	Senior Crusader	752,{
 		mes "[Michael Halig]";
 		mes "Now you are";
 		mes "one of us!";
-		if (Sex) mes "...Brother.";
+		if (Sex == SEX_MALE) mes "...Brother.";
 		else mes "...Comrade.";
 		next;
 		if(.@JobLevel != 50) getitem 504, 6;
@@ -347,7 +347,7 @@ prt_castle,164,32,1	script	Man in Anguish	733,{
 	else if(CRUS_Q == 4) {
 		mes "What is it...?";
 		mes "Do you have business";
-		if (Sex) mes "with me, man 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) {

npc/jobs/2-2/dancer.txt

@@ -133,7 +133,7 @@ job_duncer,43,93,4	script	Aile#da	724,{
 		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~!";
@@ -209,7 +209,7 @@ job_duncer,43,93,4	script	Aile#da	724,{
 		cutin "",255;
 		end;
 	}
-	else if (Sex == 1) {
+	else if (Sex == SEX_MALE) {
 		cutin "job_dancer_eir03",2;
 		mes "[Aile]";
 		mes "Welco--Mmm?";

npc/jobs/2-2/monk.txt

@@ -347,7 +347,7 @@ monk_in,99,58,1	script	Sensei Moohae#mk	60,{
 		}
 		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.";
@@ -773,7 +773,7 @@ monk_in,99,58,1	script	Sensei Moohae#mk	60,{
 				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.";
@@ -785,7 +785,7 @@ monk_in,99,58,1	script	Sensei Moohae#mk	60,{
 				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...";
@@ -794,13 +794,13 @@ monk_in,99,58,1	script	Sensei Moohae#mk	60,{
 			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.";

npc/jobs/2-2/rogue.txt

@@ -84,7 +84,7 @@ in_rogue,363,122,4	script	Rogue Guildsman#rg	747,{
 				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";
 				}

npc/jobs/2-2e/SoulLinker.txt

@@ -36,7 +36,7 @@ morocc_in,174,30,6	script	Kid#link1	716,{
 	}
 	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";
 		}

npc/jobs/novice/supernovice.txt

@@ -387,7 +387,7 @@ aldeba_in,216,169,5	script	Esseray#sn	86,{
 aldebaran,54,238,5	script	Kafra Employee#sn	117,{
 	if (BaseJob == Job_Super_Novice) {
 		mes "[Kafra Employee]";
-		if (Sex )
+		if (Sex == SEX_MALE)
 			mes "Hello, Mister Super Novice~";
 		else
 			mes "Hello, Super Novice, Ma'am.";

npc/merchants/cash_hair.txt

@@ -21,7 +21,7 @@ itemmall,19,74,5	script	Stylist#cash	91,{
 	mes "Give me a ^FF0000New Style Coupon^000000,";
 	mes "and I'll change your hair~";
 	next;
-	if (Sex == 1) {
+	if (Sex == SEX_MALE) {
 		mes "[Kaniki]";
 		mes "I have two special";
 		mes "hairstyles for men, the";
@@ -81,7 +81,7 @@ itemmall,19,74,5	script	Stylist#cash	91,{
 			mes "Alright, which hairstyle";
 			mes "did you want to have?";
 			next;
-			if (Sex == 1) {
+			if (Sex == SEX_MALE) {
 				if(select("Emergency Heal Perm:Aura Blade Cut") == 1) {
 					delitem 7622,1;	// New_Style_Coupon
 					setlook 1,24;

npc/merchants/clothes_dyer.txt

@@ -73,40 +73,40 @@ function Dyes;
 			// Colors: [1]Orange, [2]Violet, [3]Red, [4]Black, [5]Green, [6]Blue, [7]White, [8]Yellow
 			switch(BaseJob) {
 			case Job_Novice:
-				if (Sex) Dyes(4,1,6,2,5,3); else Dyes(6,1,3,2,5,3,4,4);
+				if (Sex == SEX_MALE) Dyes(4,1,6,2,5,3); else Dyes(6,1,3,2,5,3,4,4);
 			case Job_Swordman:
-				if (Sex) Dyes(4,1,6,2,5,3); else Dyes(3,1,5,3,4,4);
+				if (Sex == SEX_MALE) Dyes(4,1,6,2,5,3); else Dyes(3,1,5,3,4,4);
 			case Job_Mage:
-				if (Sex) Dyes(3,1,2,2,1,3,7,4); else Dyes(3,1,2,2,7,3,4,4);
+				if (Sex == SEX_MALE) Dyes(3,1,2,2,1,3,7,4); else Dyes(3,1,2,2,7,3,4,4);
 			case Job_Archer:
-				if (Sex) Dyes(4,1,2,2,5,3); else Dyes(3,1,5,2,7,3,4,4);
+				if (Sex == SEX_MALE) Dyes(4,1,2,2,5,3); else Dyes(3,1,5,2,7,3,4,4);
 			case Job_Acolyte:
-				if (Sex) Dyes(6,1,3,2,7,3,4,4); else Dyes(3,1,5,3,4,4);
+				if (Sex == SEX_MALE) Dyes(6,1,3,2,7,3,4,4); else Dyes(3,1,5,3,4,4);
 			case Job_Merchant:
-				if (Sex) Dyes(4,1,6,2,5,3); else Dyes(2,1,5,3,4,4);
+				if (Sex == SEX_MALE) Dyes(4,1,6,2,5,3); else Dyes(2,1,5,3,4,4);
 			case Job_Thief:
-				if (Sex) Dyes(5,1,3,2,7,4); else Dyes(3,1,7,3,4,4);
+				if (Sex == SEX_MALE) Dyes(5,1,3,2,7,4); else Dyes(3,1,7,3,4,4);
 			case Job_Knight:
 			case Job_Crusader:
-				if (Sex) Dyes(2,1,3,3,4,4); else Dyes(6,1,7,3,4,4);
+				if (Sex == SEX_MALE) Dyes(2,1,3,3,4,4); else Dyes(6,1,7,3,4,4);
 			case Job_Priest:
 			case Job_Monk:
-				if (Sex) Dyes(6,1,5,2,3,3,7,4); else Dyes(3,1,5,2,7,3,4,4);
+				if (Sex == SEX_MALE) Dyes(6,1,5,2,3,3,7,4); else Dyes(3,1,5,2,7,3,4,4);
 			case Job_Wizard:
 			case Job_Sage:
-				if (Sex) Dyes(6,1,5,3,4,4); else Dyes(3,1,6,2,7,3,5,4);
+				if (Sex == SEX_MALE) Dyes(6,1,5,3,4,4); else Dyes(3,1,6,2,7,3,5,4);
 			case Job_Blacksmith:
 			case Job_Alchemist:
-				if (Sex) Dyes(4,4,5,2,7,3); else Dyes(3,1,5,2,2,3,4,4);
+				if (Sex == SEX_MALE) Dyes(4,4,5,2,7,3); else Dyes(3,1,5,2,2,3,4,4);
 			case Job_Hunter:
 			case Job_Bard:
 			case Job_Dancer:
-				if (Sex) Dyes(4,1,6,2,5,3); else Dyes(6,1,5,3,2,4);
+				if (Sex == SEX_MALE) Dyes(4,1,6,2,5,3); else Dyes(6,1,5,3,2,4);
 			case Job_Assassin:
 			case Job_Rogue:
-				if (Sex) Dyes(6,1); else Dyes(4,1,8,2,7,3);
+				if (Sex == SEX_MALE) Dyes(6,1); else Dyes(4,1,8,2,7,3);
 			case Job_Super_Novice:
-				if (Sex) Dyes(2,1,6,2,5,3,4,4); else Dyes(6,1,3,2,5,3,4,4);
+				if (Sex == SEX_MALE) Dyes(2,1,6,2,5,3,4,4); else Dyes(6,1,3,2,5,3,4,4);
 			default: 
 				mes "Wow, I've never seen clothes like that before! I'm sorry, but I don't think I can paint it.";
 				close;

npc/merchants/hair_dyer.txt

@@ -23,7 +23,7 @@ prt_in,243,168,4	script	Jovovich	91,{
 	mes "How may I help you?";
 	next;
 	mes "[Hairdresser Jovovich]";
-	if (Sex) mes "Oh, no! Your hair is damaged. It seems as if you may need professional treatment. Come sit over here, please. Come.";
+	if (Sex == SEX_MALE) mes "Oh, no! Your hair is damaged. It seems as if you may need professional treatment. Come sit over here, please. Come.";
 	else {
 		if (rand(20) > 11) {
 			mes "Eh!? Oh my! Oh no no no no! Your hair is sooo damaged! It's not good if you leave your hair like this.";
@@ -158,7 +158,7 @@ S_NoDye:
 // Lighthalzen
 lhz_in02,100,134,3	script	Hair Dyer#lich	850,{
 	mes "[Rossa]";
-	if (Sex == 1) {
+	if (Sex == SEX_MALE) {
 		mes "Welcome, come in~";
 		mes "Oh, I see that you take";
 		mes "much better care of your";

npc/merchants/hair_style.txt

@@ -52,7 +52,7 @@ alberta_in,55,142,7	script	Hair Dresser	91,{
 			mes "[Veronica]";
 			switch(.@style) {
 			case 1:
-				if(Sex == 1) {
+				if(Sex == SEX_MALE) {
 					mes "Oh, that's 'Play Dead' style!";
 					mes "It's a nice, basic haircut.";
 					mes "I notice that usually the";
@@ -68,7 +68,7 @@ alberta_in,55,142,7	script	Hair Dresser	91,{
 					mes "choice for Novices.";
 					close2; cutin "",255; end;
 			case 2:
-				if(Sex == 1) {
+				if(Sex == SEX_MALE) {
 					mes "Oh, that's the 'Two Handed Sword";
 					mes "Mastery' style! It's perfect for";
 					mes "for Swordmen who might muss their";
@@ -84,7 +84,7 @@ alberta_in,55,142,7	script	Hair Dresser	91,{
 					mes "while wildly flailing a sword.";
 					close2; cutin "",255; end;
 			case 3:
-				if(Sex == 1) {
+				if(Sex == SEX_MALE) {
 					mes "Oh, that's 'Napalm Beat' style!";
 					mes "It's a unique look with a hint";
 					mes "of eccentricity that's offset";
@@ -98,7 +98,7 @@ alberta_in,55,142,7	script	Hair Dresser	91,{
 					mes "off the boys with their spells.";
 					close2; cutin "",255; end;
 			case 4:
-				if(Sex == 1) {
+				if(Sex == SEX_MALE) {
 					mes "Oh, that's the 'Double Strafe'";
 					mes "style! The arrangement of the";
 					mes "hair conducts ambient static";
@@ -115,7 +115,7 @@ alberta_in,55,142,7	script	Hair Dresser	91,{
 					mes "granny-style hairbuns.";
 					close2; cutin "",255; end;
 			case 5:
-				if(Sex == 1) {
+				if(Sex == SEX_MALE) {
 					mes "Oh, that's 'Angelus' style!";
 					mes "It's for calm and devout people,";
 					mes "as well as those bashful,";
@@ -130,7 +130,7 @@ alberta_in,55,142,7	script	Hair Dresser	91,{
 					mes "is also practical in battle.";
 					close2; cutin "",255; end;
 			case 6:
-				if(Sex == 1) {
+				if(Sex == SEX_MALE) {
 					mes "Oh, that's 'Push Cart' style!";
 					mes "It was based on the design of a";
 					mes "cart...at least, that's what";
@@ -143,7 +143,7 @@ alberta_in,55,142,7	script	Hair Dresser	91,{
 					mes "it's also economical.";
 					close2; cutin "",255; end;
 			case 7:
-				if(Sex == 1) {
+				if(Sex == SEX_MALE) {
 					mes "Ooh, that's 'Envenom' style!";
 					mes "It looks great on Thieves and";
 					mes "and Assassins when they're";
@@ -159,7 +159,7 @@ alberta_in,55,142,7	script	Hair Dresser	91,{
 					mes "some cute guy.";
 					close2; cutin "",255; end;
 			case 8:
-				if(Sex == 1) {
+				if(Sex == SEX_MALE) {
 					mes "Oh, that's 'Bowling Bash' style!";
 					mes "A popular style for Knights, its";
 					mes "manly, rugged look tends to";
@@ -176,7 +176,7 @@ alberta_in,55,142,7	script	Hair Dresser	91,{
 					mes "to fighting with their hands.";
 					close2; cutin "",255; end;
 			case 9:
-				if(Sex == 1) {
+				if(Sex == SEX_MALE) {
 					mes "Oh, that's 'Venom Dust' style!";
 					mes "Definitely a look for rebels,";
 					mes "the sweeping, yet decidedly";
@@ -192,7 +192,7 @@ alberta_in,55,142,7	script	Hair Dresser	91,{
 					mes "...Although, it acutally doesn't.";
 					close2; cutin "",255; end;
 			case 10:
-				if(Sex == 1) {
+				if(Sex == SEX_MALE) {
 					mes "Oh, that's 'Turn Undead' style!";
 					mes "This is popular among Priests";
 					mes "that want a serious, yet a bit";
@@ -208,7 +208,7 @@ alberta_in,55,142,7	script	Hair Dresser	91,{
 					mes "make their hair to stick out anyway.";
 					close2; cutin "",255; end;
 			case 11:
-				if(Sex == 1) {
+				if(Sex == SEX_MALE) {
 					mes "Oh, that's 'Dragonology' style!";
 					mes "It's neat and clean cut, perfect";
 					mes "for studious people and looks";
@@ -225,7 +225,7 @@ alberta_in,55,142,7	script	Hair Dresser	91,{
 					mes "religious services.";
 					close2; cutin "",255; end;
 			case 12:
-				if(Sex == 1) {
+				if(Sex == SEX_MALE) {
 					mes "Oh, that's 'Mace Mastery' style!";
 					mes "A lot of care goes into making";
 					mes "that tussled hair say, 'I don't";
@@ -240,7 +240,7 @@ alberta_in,55,142,7	script	Hair Dresser	91,{
 					mes "stockings...";
 					close2; cutin "",255; end;
 			case 13:
-				if(Sex == 1) {
+				if(Sex == SEX_MALE) {
 					mes "Oh, that's 'Thunder Storm' style!";
 					mes "This hot, flamboyant hairstyle";
 					mes "flares out wildly like thunder.";
@@ -255,7 +255,7 @@ alberta_in,55,142,7	script	Hair Dresser	91,{
 					mes "that it can't be cute.";
 					close2; cutin "",255; end;
 			case 14:
-				if(Sex == 1) {
+				if(Sex == SEX_MALE) {
 					mes "Oh, that's 'Encore' style!";
 					mes "The elegant, flowing locks";
 					mes "fit well with Bards, or men who";
@@ -270,7 +270,7 @@ alberta_in,55,142,7	script	Hair Dresser	91,{
 					mes "with glasses.";
 					close2; cutin "",255; end;
 			case 15:
-				if(Sex == 1) {
+				if(Sex == SEX_MALE) {
 					mes "Oh, that's 'Grimtooth' style!";
 					mes "Spiky and unkempt, this style";
 					mes "is a popular counterculture";
@@ -287,7 +287,7 @@ alberta_in,55,142,7	script	Hair Dresser	91,{
 					mes "foreheads and cheekbones.";
 					close2; cutin "",255; end;
 			case 16:
-				if(Sex == 1) {
+				if(Sex == SEX_MALE) {
 					mes "Oh, that's 'Blitz Beat' style!";
 					mes "A funky and lively fashion,";
 					mes "this style was developed for a";
@@ -304,7 +304,7 @@ alberta_in,55,142,7	script	Hair Dresser	91,{
 					mes "lets their hair get trapped?";
 					close2; cutin "",255; end;
 			case 17:
-				if(Sex == 1) {
+				if(Sex == SEX_MALE) {
 					mes "Oh, that's 'Find Ore' style!";
 					mes "It's a practical, economical look";
 					mes "that is popular among Blacksmiths.";
@@ -321,7 +321,7 @@ alberta_in,55,142,7	script	Hair Dresser	91,{
 					mes "Blacksmith favorite.";
 					close2; cutin "",255; end;
 			case 18:
-				if(Sex == 1) {
+				if(Sex == SEX_MALE) {
 					mes "Oh, that's 'Fire Pillar' style!";
 					mes "It's a trendy look, in which";
 					mes "you cover one eye for that";
@@ -338,7 +338,7 @@ alberta_in,55,142,7	script	Hair Dresser	91,{
 					mes "looks great with Mage Hats.";
 					close2; cutin "",255; end;
 			case 19:
-				if(Sex == 1) {
+				if(Sex == SEX_MALE) {
 					mes "Oh, that's 'Guillotine Fist'";
 					mes "style! The smooth, slicked back";
 					mes "pompadour shows that you're";
@@ -509,7 +509,7 @@ alberta_in,55,142,7	script	Hair Dresser	91,{
 
 L_cutin:
 	.@num = getarg(0);
-	if(Sex == 1) {
+	if(Sex == SEX_MALE) {
 		if (.@num  < 10)
 			cutin "hair_m_0"+ .@num,4;
 		else
@@ -706,7 +706,7 @@ lhz_in02,100,143,3	script	Hair Dresser#li	122,{
 		next;
 		switch(select("Old Hairstyles:New Hairstyles")) {
 		case 1:
-			if (Sex == 1) {
+			if (Sex == SEX_MALE) {
 				switch(select("Petite Style:Executioner Style:Prince Style:Deviace Style:Cancel")) {
 				case 1:
 					cutin "hair_m_20",4;
@@ -811,7 +811,7 @@ lhz_in02,100,143,3	script	Hair Dresser#li	122,{
 			}
 			break;
 		case 2:
-			if (Sex == 1) {
+			if (Sex == SEX_MALE) {
 				switch(select("Emergency Heal Perm:Aura Blade Cut:Power Swing:Renovatio Cut:Cancel")) {
 				case 1:
 					cutin "hair_m_24",4;
@@ -936,7 +936,7 @@ lhz_in02,100,143,3	script	Hair Dresser#li	122,{
 		mes "Here's a list of the style names just in case you need them~";
 		next;
 		mes "[Prince Shammi]";
-		if (Sex == 1) {
+		if (Sex == SEX_MALE) {
 			mes "No. 20: Petite Style";
 			mes "No. 21: Executioner Style";
 			mes "No. 22: Prince Style";
@@ -987,7 +987,7 @@ lhz_in02,100,143,3	script	Hair Dresser#li	122,{
 			close;
 		}
 		else {
-			if (Sex == 1)
+			if (Sex == SEX_MALE)
 				cutin "hair_m_"+.@input+".BMP",4;
 			else
 				cutin "hair_f_"+.@input+".BMP",4;
@@ -1060,7 +1060,7 @@ lhz_in02,100,143,3	script	Hair Dresser#li	122,{
 				mes "And my, oh my, you look even";
 				mes "more fabulous that I thought";
 				mes "you would! Oh, I can't believe";
-				if (Sex == 1) {
+				if (Sex == SEX_MALE) {
 					mes "how tough and elegant you are~";
 					mes "So ruggedly manly and handsome!";
 				}
@@ -1202,7 +1202,7 @@ lhz_in02,91,155,5	script	Assistant Beautician#li	862,{
 					mes "So this is the";
 					mes "style you want me";
 					mes "to try to do for you?";
-					if (Sex == 1) {
+					if (Sex == SEX_MALE) {
 						if (.@input < 10)
 							cutin "hair_m_0"+.@input+".BMP",4;
 						else

npc/other/divorce.txt

@@ -44,7 +44,7 @@ nif_in,190,112,5	script	Deviruchi#divorce	738,{
   	if (!getpartnerid()) {
 		mes "Bwah hah hah~!";
 		mes "That look in your eyes~!";
-		if (Sex) {
+		if (Sex == SEX_MALE) {
 			mes "Those are definitely the eyes";
 			mes "of a lonely male bachelor.";
 			mes "I'm almost 100 percent sure";
@@ -76,7 +76,7 @@ nif_in,190,112,5	script	Deviruchi#divorce	738,{
 	mes "I sense that you carry a";
 	mes "tiresome burden...";
 	mes "If I'm not wrong, you're";
-	if (Sex)
+	if (Sex == SEX_MALE)
 		mes "a married man, aren't you?";
 	else
 		mes "a married woman, aren't you?";
@@ -99,7 +99,7 @@ nif_in,190,112,5	script	Deviruchi#divorce	738,{
 	mes "At the end of the day, you and";
 	mes "your partner fight, and you feel";
 	mes "totally totally miserable.";
-	if (Sex)
+	if (Sex == SEX_MALE)
 		mes "...all because of HER.";
 	else
 		mes "...all because of HIM.";
@@ -123,7 +123,7 @@ nif_in,190,112,5	script	Deviruchi#divorce	738,{
 	mes "[Deviruchi]";
 	mes "*whispers*";
 	mes "^555555It's not like you're breaking^000000";
-	if (Sex) {
+	if (Sex == SEX_MALE) {
 		mes "^555555any promises, and it's not";
 		mes "like your wife will care if she";
 		mes "doesn't know... Don't you";
@@ -171,7 +171,7 @@ nif_in,190,112,5	script	Deviruchi#divorce	738,{
 		mes "[Deviruchi]";
 		mes "I understand. But if you think";
 		mes "about anything, think about";
-		if (Sex) {
+		if (Sex == SEX_MALE) {
 			mes "your wife's nagging, and";
 			mes "how great it would be to";
 			mes "finally free yourself of the";

npc/other/marriage.txt

@@ -205,7 +205,7 @@ prt_church,97,100,4	script	Wedding Staff#w	71,{
 			mes "^FF0000Please check the current state of your account, and the one of your lover, before register for a wedding.^000000";
 			next;
 		}
-		if (Sex) {
+		if (Sex == SEX_MALE) {
 			mes "[Marry Happy]";
 			mes "So you'd like to get married?";
 			mes "As a groom, you need to prepare";
@@ -290,7 +290,7 @@ prt_church,97,100,4	script	Wedding Staff#w	71,{
 				mes "back after you find it, okay?";
 				goto L_End;
 			}
-			else if (Sex == 0) {
+			else if (Sex == SEX_FEMALE) {
 				if (countitem(6026) == 0 && Zeny < 1200000) {
 					mes "[Marry Happy]";
 					mes "I'm sorry, but all brides";
@@ -313,7 +313,7 @@ prt_church,97,100,4	script	Wedding Staff#w	71,{
 					goto L_End;
 				}
 			}
-			else if (Sex == 1) {
+			else if (Sex == SEX_MALE) {
 				if (countitem(6026) == 0 && Zeny < 1300000) {
 					mes "[Marry Happy]";
 					mes "I'm sorry, but you don't";
@@ -379,7 +379,7 @@ prt_church,97,100,4	script	Wedding Staff#w	71,{
 			emotion e_lv;
 			next;
 			mes "[Marry Happy]";
-			if (Sex == 0) {
+			if (Sex == SEX_FEMALE) {
 				mes "Since you're the bride,";
 				mes "you need to wait for the";
 				mes "groom to speak to Bishop";
@@ -607,7 +607,7 @@ prt_church,100,128,4	script	Bishop#w	60,{
 				getpartymember(getcharid(1));
 				set .@partymembercount,$@partymembercount;
 				if (.@partymembercount == 2) {
-					if (Sex) {
+					if (Sex == SEX_MALE) {
 						set $@wedding,1;
 						initnpctimer;
 						mes "[Vomars]";
@@ -678,7 +678,7 @@ prt_church,100,128,4	script	Bishop#w	60,{
 				getpartymember(getcharid(1));
 				set .@partymembercount,$@partymembercount;
 				if (.@partymembercount == 2) {
-					if (Sex == 0) {
+					if (Sex == SEX_FEMALE) {
 						if (strcharinfo(0) == $@wed_bride$) {
 							mes "[Vomars]";
 							mes "Young lovers, please";
@@ -918,7 +918,7 @@ prt_church,20,179,4	script	Divorce Staff	71,{
 	next;
 	switch(select("Drop 1 Wedding Ring.:Keep it.")) {
 	case 1:
-		set .@ring, (Sex)?2634:2635; //Bridegroom_Ring, Bride_Ring
+		set .@ring, (Sex == SEX_MALE)?2634:2635; //Bridegroom_Ring, Bride_Ring
 		if (countitem(.@ring)) {
 			delitem .@ring,1;
 			mes "[Bad Ending]";
@@ -973,7 +973,7 @@ prt_church,22,179,4	script	Remarry Staff	71,{
 	next;
 	switch(select("Make new Wedding Ring.:Cancel.")) {
 	case 1:
-		set .@ring, (Sex)?2634:2635; //Bridegroom_Ring, Bride_Ring
+		set .@ring, (Sex == SEX_MALE)?2634:2635; //Bridegroom_Ring, Bride_Ring
 		if (countitem(.@ring) || isequipped(.@ring)) {
 			mes "[Wedding Again]";
 			mes "Wait, wait...";

npc/pre-re/jobs/1-1/mage.txt

@@ -87,7 +87,7 @@ geffen_in,164,124,4	script	Mage Guildsman	123,{
 		}
 		if (job_magician_q == 0) {
 			mes "Wanna be a Mage, eh...?";
-			if (Sex)
+			if (Sex == SEX_MALE)
 				mes "Hey, look at you! You're kinda cute~! Not my type though...";
 			else {
 				mes "Oooh, you're such a hot babe~!";
@@ -232,7 +232,7 @@ geffen_in,164,124,4	script	Mage Guildsman	123,{
 	case 2:
 		mes "[Mage Guildsman]";
 		mes "Wanna be a Mage, eh?";
-		if (Sex)
+		if (Sex == SEX_MALE)
 			mes "For a cutie like you, I'd be happy to explain the requirements!";
 		else
 			mes "I'd be happy to explain the requirements for a pretty girl like you!";

npc/pre-re/jobs/1-1/thief.txt

@@ -52,7 +52,7 @@ moc_prydb1,39,129,2	script	Thief Guide	69,{
 			}
 			else {
 				mes "[Thief Guide]";
-				if (Sex)
+				if (Sex == SEX_MALE)
 					mes "Hey, dude.";
 				else
 					mes "Hey, baby~";
@@ -61,7 +61,7 @@ moc_prydb1,39,129,2	script	Thief Guide	69,{
 		}
 		else {
 			mes "[Thief Guide]";
-			if (Sex)
+			if (Sex == SEX_MALE)
 				mes "Hey, dude.";
 			else
 				mes "Hey, baby.";

npc/quests/bard_quest.txt

@@ -515,7 +515,7 @@ geffen,132,38,3	script	Bard#2	51,{
 		mes "At Nine, love is reborn.";
 		mes "At Ten, my Love is gone.";
 		mes "At Eleven I find out why.";
-		if (Sex)
+		if (Sex == SEX_MALE)
 			mes "At Twelve I see his new girlfriend?";
 		else
 			mes "At Twelve I see her new boyfriend?";
@@ -849,7 +849,7 @@ geffen,132,38,3	script	Bard#2	51,{
 		mes "At Nine, love is reborn.";
 		mes "At Ten, my Love is gone.";
 		mes "At Eleven I find out why.";
-		if (Sex)
+		if (Sex == SEX_MALE)
 			mes "At Twelve I see her new boyfriend?";
 		else
 			mes "At Twelve I see his new girlfriend?";
@@ -1254,7 +1254,7 @@ S_StorySong:
 				// For 3 and 4 cases we set more chance earlier on .@random
 				if (.@num == 3 || .@num == 4){
 					mes "[Errende]";
-					if (Sex)
+					if (Sex == SEX_MALE)
 						mes "Heroic warrior,";
 					else
 						mes "My fair lady,";
@@ -2041,7 +2041,7 @@ morocc,134,111,3	script	Bard#3	741,{
 				}
 
 			} else {
-				if (Sex) {
+				if (Sex == SEX_MALE) {
 					mes "[Kino Kitty]";
 					mes "You're such a nice young man. I will remember your name. I would much appreciate it if you would also remember mine.";
 					next;
@@ -2907,7 +2907,7 @@ yuno_in04,33,119,3	script	Adventurer#1	828,{
 	mes "Err...?";
 	mes "What is it?";
 	next;
-	if (!Sex) {
+	if (Sex == SEX_FEMALE) {
 		emotion e_heh;
 		mes "[Energetic Young Man]";
 		mes "Oh...!";

npc/quests/cooking_quest.txt

@@ -43,7 +43,7 @@ prt_castle,43,30,3	script	Charles Orleans#cook	878,{
 		end;
 	}
 	if (BaseJob == Job_Novice) {
-		if (Sex) {
+		if (Sex == SEX_MALE) {
 			cutin "orleans_5",0;
 			mes "[Charles Orleans]";
 			mes "Excuse me, monsieur?";
@@ -80,7 +80,7 @@ prt_castle,43,30,3	script	Charles Orleans#cook	878,{
 		goto L_End;
 	}
 	else if (getequipid(EQI_HEAD_TOP) != 5026) {
-		if (Sex) {
+		if (Sex == SEX_MALE) {
 			cutin "orleans_5",0;
 			emotion e_an;
 			mes "[Charles Orleans]";

npc/quests/dandelion_request.txt

@@ -3610,7 +3610,7 @@ que_job01,84,17,3	script	Lin#2-1	885,{
 		mes "[Lin]";
 		mes "Ah, this is "+ strcharinfo(0) +",";
 		mes "my partner for this assignment.";
-		if(Sex == 1) mes "Don't worry, you can trust him.";
+		if(Sex == SEX_MALE) mes "Don't worry, you can trust him.";
 		else mes "Don't worry, you can trust her.";
 		next;
 		mes "[R.]";
@@ -3907,7 +3907,7 @@ que_job01,84,17,3	script	Lin#2-1	885,{
 		mes "[Lin]";
 		mes "I'm sending "+ strcharinfo(0) +"";
 		mes "on a snack errand and it won't";
-		if(Sex == 1) mes "take too long. Did you want him";
+		if(Sex == SEX_MALE) mes "take too long. Did you want him";
 		else mes "take too long. Did you want her";
 		mes "to bring you back anything?";
 		next;
@@ -4155,7 +4155,7 @@ que_job01,79,15,1	script	R	880,{
 		mes "[Lin]";
 		mes "Ah, this is "+ strcharinfo(0) +",";
 		mes "my partner for this assignment.";
-		if(Sex == 1) mes "Don't worry, you can trust him.";
+		if(Sex == SEX_MALE) mes "Don't worry, you can trust him.";
 		else mes "Don't worry, you can trust her.";
 		next;
 		mes "[R.]";

npc/quests/first_class/tu_archer.txt

@@ -67,7 +67,7 @@ payon_in02,67,65,3	script	Bard Jet#tu	1_M_BARD,{
 		mes "up a joke~!";
 		emotion e_gg;
 		next;
-		if (Sex == 1) {
+		if (Sex == SEX_MALE) {
 			select("A joke, eh?");
 			specialeffect2 EF_TALK_FROSTJOKE;
 			mes "[Jet]";
@@ -1430,7 +1430,7 @@ pay_arche,76,135,3	script	#Target	HIDDEN_NPC,{ end; }
 				mes "he already has a girlfriend...";
 				next;
 				mes "[Acolyte]";
-				if(Sex){
+				if(Sex == SEX_MALE){
 					mes "W-wait!";
 					mes "Y-you're a man!";
 					mes "D-d-d-don't tease me";

npc/quests/first_class/tu_sword.txt

@@ -46,7 +46,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 	if(BaseClass == Job_Swordman && (eaclass()&(EAJL_2|EAJL_UPPER|EAJL_THIRD))){
 		mes "From your raiment,";
 		mes "I see that you are";
-		if(Sex)
+		if(Sex == SEX_MALE)
 			mes "a man of the sword.";
 		else
 			mes "a woman of the sword.";

npc/quests/kiel_hyre_quest.txt

@@ -4655,7 +4655,7 @@ kh_mansion,22,28,4	script	Kiel Hyre#kh	903,{
 		getitem 7509,1; //Fancy_Key_Card
 		set KielHyreQuest,108;
 		next;
-		if (Sex == 0) {
+		if (Sex == SEX_FEMALE) {
 			if (getpartnerid() == 0) set .@KHTitle$,"Miss";
 			else set .@KHSTitle$,"Mrs";
 		}

npc/quests/monstertamers.txt

@@ -626,7 +626,7 @@ comodo,112,182,0	script	Munak's Grandma	103,{
 		mes "[Munak's grandma]";
 		mes "Oh my...";
 		mes "Have you seen my granddaughter,";
-		if (Sex == 1) {
+		if (Sex == SEX_MALE) {
 			mes "boy? My poor granddaughter";
 		}
 		else {
@@ -678,7 +678,7 @@ comodo,112,182,0	script	Munak's Grandma	103,{
 				mes "Th-This is her writing! Oh my...!";
 				next;
 				mes "[Munak's Grandma]";
-				if (Sex == 1) {
+				if (Sex == SEX_MALE) {
 					mes "Young man... I'll read this to you if";
 				}
 				else {
@@ -692,7 +692,7 @@ comodo,112,182,0	script	Munak's Grandma	103,{
 				case 1:
 					mes "[Munak's Grandma]";
 					mes "Oh...?";
-					if (Sex == 1) {
+					if (Sex == SEX_MALE) {
 						mes "Alright, young man.";
 						mes "Thank you anyway.";
 					}
@@ -710,7 +710,7 @@ comodo,112,182,0	script	Munak's Grandma	103,{
 					delitem 1558,1;
 					delitem 901,1;
 					mes "[Munak's Grandma]";
-					if (Sex == 1) {
+					if (Sex == SEX_MALE) {
 						mes "Oh!";
 						mes "Thank you,";
 						mes "young man~!";

npc/quests/newgears/2004_headgears.txt

@@ -125,7 +125,7 @@ geffen,129,148,3	script	Argen#1	779,{
 	mes "Impress the ladies...?";
 	next;
 	emotion e_gasp;
-	if (Sex) {
+	if (Sex == SEX_MALE) {
 		mes "[Argen]";
 		mes "Yeah dude. There are two things chicks dig. Small, adorable presents. And suave dudes.";
 		next;
@@ -435,7 +435,7 @@ prontera,165,232,3	script	Nephia#1	744,{
 	mes "[Nephia]";
 	mes "Ooh~! You know what would make your hair so much cuter? I think if you tied it back with a big, red ribbon, you would look sooo ^FF66CCadorable^000000!";
 	next;
-	if (Sex) {
+	if (Sex == SEX_MALE) {
 		if (select("Um, lady, I'm a dude.:^FF66CCOoh~! You're right!^000000") == 1) {
 			mes "["+ strcharinfo(0) +"]";
 			mes "Woman, can't you that I'm a man?";
@@ -1009,7 +1009,7 @@ xmas,183,267,3	script	Pretty Lindsay#1	793,{
 		mes "I made this hat with all my heart, so you gotta promise me you will take care of this, okay?";
 		close;
 	}
-	if (Sex == 1) {
+	if (Sex == SEX_MALE) {
 		mes "[Pretty Lindsay]";
 		mes "Hello, there?";
 		mes "Mister...?";
@@ -1130,7 +1130,7 @@ xmas,175,156,3	script	Fuzzy Fuzz#1	712,{
 	mes "My specialty is the 'Teddybear Hat.' When it's worn, it makes you as cute as a teddy bear, and your hugs twice as warm and cuddly.";
 	next;
 	mes "[Fuzzy Fuzz]";
-	if (Sex) {
+	if (Sex == SEX_MALE) {
 		mes "The 'Teddybear Hat' can't be worn by just anyone, since it's cuddling powers are easily abused.";
 		next;
 		mes "[Fuzzy Fuzz]";
@@ -3301,7 +3301,7 @@ OnTouch_:
 					next;
 					mes "[Orc Warrior]";
 					mes "You are now...";
-					if (Sex)
+					if (Sex == SEX_MALE)
 						mes "an Orc Warrior!!";
 					else
 						mes "an Orc Lady!!";

npc/quests/newgears/2005_headgears.txt

@@ -750,7 +750,7 @@ lighthalzen,143,68,0	script	Strange Guy#LhzHat	47,{
 
 lighthalzen,360,313,3	script	Kid#LhzHat	706,{
 	mes "[Kid]";
-	if(Sex)
+	if(Sex == SEX_MALE)
 		mes "Hello, mister!";
 	else
 		mes "Hello, ma'am!";

npc/quests/obb_quest.txt

@@ -738,7 +738,7 @@ moc_ruins,105,62,4	script	Jacob#thai	50,{
 				mes "to lie to nowadays...^000000";
 				next;
 				mes "[Tommy]";
-				if (Sex)
+				if (Sex == SEX_MALE)
 					mes "So, mister, do you think my Daddy can catch a Munak with this?";
 				else
 					mes "So, lady, do you think my Daddy can catch a Munak with this?";
@@ -755,7 +755,7 @@ moc_ruins,105,62,4	script	Jacob#thai	50,{
 					close;
 				case 2:
 					mes "[Tommy]";
-					if (Sex)
+					if (Sex == SEX_MALE)
 						mes "So tell me, mister. Did he lie to me, then?";
 					else
 						mes "So tell me, lady. Did he lie to me, then?";
@@ -953,7 +953,7 @@ moc_ruins,105,62,4	script	Jacob#thai	50,{
 			mes "to behave in front of other people?!";
 			next;
 			mes "[Jacob]";
-			if (Sex)
+			if (Sex == SEX_MALE)
 				mes "Say you're sorry to him!";
 			else
 				mes "Say you're sorry to her!";

npc/quests/quests_13_2.txt

@@ -2388,7 +2388,7 @@ spl_in02,236,92,5	script	Arc#ep13md_l02	447,{
 			mes "[Arc]";
 			mes "Ah, finally. I've been speaking with Terra while we waited for you.";
 			mes "Terra. This is who saved you...";
-			mes "You should thank "+((Sex)?"him.":"her.");
+			mes "You should thank "+((Sex == SEX_MALE)?"him.":"her.");
 			next;
 			mes "[Terra]";
 			mes "Thank you...";

npc/quests/quests_airship.txt

@@ -1097,7 +1097,7 @@ ein_in01,121,99,3	script	Mirror#ein	HIDDEN_NPC,{
 			mes "good. So this must be";
 			mes "why I get such great";
 			mes "service at restaurants...";
-		} else if (Sex) {
+		} else if (Sex == SEX_MALE) {
 			switch(.@r) {
 			case 1:
 				mes "["+strcharinfo(0)+"]";

npc/quests/quests_alberta.txt

@@ -44,7 +44,7 @@ alberta,117,135,0	script	Elin	96,{
 		close;
 	}
 	mes "[Elin]";
-	if (Sex == 1) {
+	if (Sex == SEX_MALE) {
 		mes "Hello~!";
 		mes "Heh heh, you're a boy, so you probably don't like dolls, right? Well, I like dolls very very much!";
 	} else {
@@ -64,7 +64,7 @@ alberta,117,135,0	script	Elin	96,{
 	case 2:
 		if (MaxWeight - Weight < 1000) {
 			mes "[Elin]";
-			if (Sex == 1) {
+			if (Sex == SEX_MALE) {
 				mes "Maybe you should put some of your stuff away first, you look like you're carrying too much, hee hee~";
 			} else {
 				mes "Do you always carry so much with you? Put some of your things away first, okay?";
@@ -72,7 +72,7 @@ alberta,117,135,0	script	Elin	96,{
 			close;
 		}
 		mes "[Elin]";
-		if (Sex == 1) {
+		if (Sex == SEX_MALE) {
 			mes "Oh my goodness!";
 			mes "Really? You're";
 			mes "such a sweetie~!";
@@ -95,7 +95,7 @@ alberta,117,135,0	script	Elin	96,{
 				mes "of Poring dolls...";
 				next;
 				mes "[Elin]";
-				if (Sex == 1) {
+				if (Sex == SEX_MALE) {
 					mes "But since a cute boy is giving it to me, I'll happily take it! Hee hee, soft and fluffy Poring doll~";
 				} else {
 					mes "But since a nice girl is giving it to me, I'll take it! Hee he, soft and fluffy Poring doll~";
@@ -106,7 +106,7 @@ alberta,117,135,0	script	Elin	96,{
 				next;
 				getitem 529,1; //Candy
 				mes "[Elin]";
-				if (Sex == 1) {
+				if (Sex == SEX_MALE) {
 					mes "I don't know if you're too old to like candy, but I guess it's okay.";
 				} else {
 					mes "So, try not to eat too much, okay? Otherwise, you might get in trouble!";
@@ -119,7 +119,7 @@ alberta,117,135,0	script	Elin	96,{
 				close;
 			} else {
 				mes "[Elin]";
-				if (Sex == 1) {
+				if (Sex == SEX_MALE) {
 					mes "Aww...?";
 					mes "Were you only teasing me?";
 				} else {
@@ -139,7 +139,7 @@ alberta,117,135,0	script	Elin	96,{
 				mes "A Ch-Ch, Chonchon doll?!";
 				next;
 				mes "[Elin]";
-				if (Sex == 1) {
+				if (Sex == SEX_MALE) {
 					mes "But since... You're... Such a nice guy... I better take it...!";
 				} else {
 					mes "But since... Since it's a gift... I guess I'll take it...";
@@ -275,7 +275,7 @@ alberta,117,135,0	script	Elin	96,{
 				getitem 522,2; //Fruit_Of_Mastela
 				mes "[Elin]";
 				mes "I found it when I secretly went to the forest. I took it because it has pretty colors!";
-				if (Sex == 1) {
+				if (Sex == SEX_MALE) {
 					mes "Since there's two, you can share it with your girlfriend. Hee hee~!";
 				} else {
 					mes "Since there's two, you can share it with your boyfriend. Hee hee~!";
@@ -1022,7 +1022,7 @@ alberta_in,23,104,4	script	Grandpa Turtle#tur	120,{
 		case 1:
 			mes "[Grandpa Turtle]";
 			mes "Ha ha ha~!";
-			if (Sex)
+			if (Sex == SEX_MALE)
 				mes "I like the shine in your eye, my boy! I can see a little bit of myself in those eyes. Yes...";
 			else
 				mes "No use hiding the glint in your eyes, my dear! It's adventure you wish for, that much I can tell...";
@@ -2415,7 +2415,7 @@ alberta_in,131,95,5	script	Iromo#ep3_2	706,{
 		mes "...Thank you for telling me...";
 		mes "They are great friends...";
 		next;
-		if (Sex == 0) {
+		if (Sex == SEX_FEMALE) {
 			mes "[Iromo]";
 			mes "...And? ...What do you...";
 			mes "Want to say to me this time...";
@@ -2587,7 +2587,7 @@ alberta_in,131,95,5	script	Iromo#ep3_2	706,{
 			mes "It is frustrating. But...";
 			mes "Why do you care about me so much?";
 			next;
-			if (Sex == 0) {
+			if (Sex == SEX_FEMALE) {
 				mes "[Iromo]";
 				mes "Really, its not that bad...";
 				mes "I wish I could have a sister like you.";

npc/quests/quests_ayothaya.txt

@@ -263,7 +263,7 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	838,2,2,{
 					mes "[Powerful-Looking Woman]";
 					mes "I see. Hmmm...";
 					mes "You're kind of my type.";
-					if (Sex) {
+					if (Sex == SEX_MALE) {
 						mes "No no, that doesn't mean I'm interested in you. Plus I'm";
 						mes "already engaged.";
 					} else

npc/quests/quests_comodo.txt

@@ -35,7 +35,7 @@
 //============================================================ 
 comodo,228,159,3	script	Hair Ornament Girl	700,{
 	mes "[Hair Ornament Girl]";
-	if (Sex == 1) {
+	if (Sex == SEX_MALE) {
 		mes "Oh, hello!";
 		mes "Would you like to order a hairband? They're great presents to give to your girlfriend, and show that you're thinking of her.";
 	}
@@ -1579,7 +1579,7 @@ comodo,187,153,4	script	Hullaris#cmd	701,{
 		mes "Love together~";
 		mes "Love! Love!";
 		mes "Love togeth-hm?";
-		if (Sex) {
+		if (Sex == SEX_MALE) {
 			mes "Boy, you're ruining";
 			mes "my groove! Now beat it!";
 		}

npc/quests/quests_ein.txt

@@ -587,7 +587,7 @@ einbroch,215,180,6	script	Uwe Kleine#ein	85,{
 						mes "some. I guess you can";
 						mes "still give them to me, but";
 						mes "you'd get less of a reward";
-						if (Sex) {
+						if (Sex == SEX_MALE) {
 							mes "...you ^EEA9B8naughty boy^000000.";
 						}
 						else {
@@ -653,7 +653,7 @@ einbroch,215,180,6	script	Uwe Kleine#ein	85,{
 								mes "a Black Smith!!";
 							}
 							mes "This is my present for it.";
-							if (Sex) {
+							if (Sex == SEX_MALE) {
 								mes "...you ^EEA9B8naughty boy^000000.";
 							}
 							else {
@@ -708,7 +708,7 @@ einbroch,215,180,6	script	Uwe Kleine#ein	85,{
 					mes "That doesn't change";
 					mes "the fact that you've";
 					mes "been very, very bad.";
-					if (Sex) {
+					if (Sex == SEX_MALE) {
 						mes "...You ^EEA9B8naughty boy^000000.";
 					}
 					else {
@@ -753,7 +753,7 @@ einbroch,215,180,6	script	Uwe Kleine#ein	85,{
 							mes "some. I guess you can";
 							mes "still give them to me, but";
 							mes "you'd get less of a reward";
-							if (Sex) {
+							if (Sex == SEX_MALE) {
 								mes "...You ^EEA9B8naughty boy^000000.";
 							}
 							else {
@@ -805,7 +805,7 @@ einbroch,215,180,6	script	Uwe Kleine#ein	85,{
 								mes "When you do get all";
 								mes "that Large Jellopy,";
 								mes "just come back to me.";
-								if (Sex) {
+								if (Sex == SEX_MALE) {
 									mes "...you ^EEA9B8naughty boy^000000.";
 								}
 								else {
@@ -853,7 +853,7 @@ einbroch,215,180,6	script	Uwe Kleine#ein	85,{
 						else {
 							mes "a Black Smith!!";
 							mes "This is my present for it. Huhuhu.";
-							if (Sex) {
+							if (Sex == SEX_MALE) {
 								mes "...You ^EEA9B8naughty boy^000000.";
 							}
 							else {
@@ -896,7 +896,7 @@ einbroch,215,180,6	script	Uwe Kleine#ein	85,{
 				mes "a craftsman can enjoy. Ooh,";
 				mes "what do you think is the most";
 				mes "important factor in cooking,";
-				if (Sex) {
+				if (Sex == SEX_MALE) {
 					mes "you ^EEA9B8naughty little man^000000?";
 				}
 				else {
@@ -2126,7 +2126,7 @@ einbroch,215,180,6	script	Uwe Kleine#ein	85,{
 				next;
 				mes "[Uwe]";
 				mes "What brings to";
-				if (Sex) {
+				if (Sex == SEX_MALE) {
 					mes "me, you ^EEA9B8naughty boy^000000?";
 				}
 				else {
@@ -3034,7 +3034,7 @@ einbroch,215,180,6	script	Uwe Kleine#ein	85,{
 				mes "So, how can";
 				mes "I help you, you";
 				mes "adooooooooorable";
-				if (Sex) {
+				if (Sex == SEX_MALE) {
 					mes "hunk of a man?";
 				}
 				else {
@@ -4564,7 +4564,7 @@ einbech,165,105,7	script	Buender Hikeman#ein	847,{
 		mes "[Buender Hikeman]";
 		mes "Huh.";
 		next;
-		if (Sex == 0) {
+		if (Sex == SEX_FEMALE) {
 			mes "["+strcharinfo(0)+"]";
 			mes "And...";
 			mes "I'm a cute girl!";

npc/quests/quests_gonryun.txt

@@ -2075,7 +2075,7 @@ gon_in,18,27,5	script	Madam#gnbs	771,{
 		mes "Hello, darling~";
 		close;
 	}
-	if (Sex == 0) {
+	if (Sex == SEX_FEMALE) {
 		mes "[Shang Hua Yen]";
 		mes "Hoho~ he's upstairs.";
 		mes "My, are you such a pretty lady~";
@@ -3029,7 +3029,7 @@ geffen_in,106,106,7	script	Girl#gnbs2	716,{
 	else if (b_sword == 24 || b_sword == 25 || b_sword == 26) {
 		mes "[Lyroo]";
 		mes "Ahh...ahh....";
-		if (Sex == 0)
+		if (Sex == SEX_FEMALE)
 			mes "It's ..you.. pretty...sister..";
 		else
 			mes "It's ..you.. handsome...brother..";
@@ -3077,7 +3077,7 @@ geffen_in,106,106,7	script	Girl#gnbs2	716,{
 	else if (b_sword == 27) {
 		mes "[Lyroo]";
 		mes "uh...umm?";
-		if (Sex == 0)
+		if (Sex == SEX_FEMALE)
 			mes "Ah....It's you, pretty sister...";
 		else
 			mes "Ah....It's you, handsome brother...";
@@ -3107,7 +3107,7 @@ geffen_in,106,106,7	script	Girl#gnbs2	716,{
 	}
 	mes "[Lyroo]";
 	mes "Heehehe...";
-	if (Sex == 0)
+	if (Sex == SEX_FEMALE)
 		mes "Thank you my pretty sister.";
 	else 
 		mes "Thank you handsome brother~";

npc/quests/quests_hugel.txt

@@ -5818,7 +5818,7 @@ hugel,76,134,3	script	Neha	101,{
 			mes "this soup isn't good if it";
 			mes "isn't steaming hot?";
 			next;
-			if (Sex) {
+			if (Sex == SEX_MALE) {
 				mes "[Neha]";
 				mes "But... You're a handsome";
 				mes "fellow, so I'll forgive you...";

npc/quests/quests_lighthalzen.txt

@@ -1095,7 +1095,7 @@ lhz_cube,234,200,0	script	Desk#cube	111,{
 			mes "the clutter on the desk";
 			mes "proves to be useless to you.^000000";
 			next;
-			if (Sex) {
+			if (Sex == SEX_MALE) {
 				mes "^3355FFAn issue of the";
 				mes "Dancer magazine,";
 				mes "''Harmonic Lick'' catches";
@@ -5585,7 +5585,7 @@ lhz_in01,273,121,1	script	Mad Scientist#li	865,{
 			while (1) {
 				switch(select("Ask about hobbies:Ask about work")) {
 				case 1:
-					if (Sex == 1) {
+					if (Sex == SEX_MALE) {
 						mes "[Wolfchev]";
 						mes "Hyuu~ I think you're";
 						mes "just a little too innocent";
@@ -6688,7 +6688,7 @@ lighthalzen,179,170,4	script	Ordinary Man	98,{
 		next;
 		mes "[??????]";
 		mes "^666666Now...^000000";
-		if(Sex == 1) mes "^666666Make him^000000";
+		if(Sex == SEX_MALE) mes "^666666Make him^000000";
 		else mes "^666666Make her^000000";
 		mes "^666666swallow this pill.^000000";
 		next;
@@ -7408,7 +7408,7 @@ yuno_pre,69,20,4	script	Secretary#1	862,{
 		mes "Oh, the president";
 		mes "is expecting you.";
 		mes "Please, go right";
-		if(Sex == 1) mes "on ahead, sir.";
+		if(Sex == SEX_MALE) mes "on ahead, sir.";
 		else mes "on ahead, ma'am.";
 		close2;
 		warp "yuno_pre",113,53;
@@ -7499,7 +7499,7 @@ yuno_pre,95,71,5	script	Guard	852,{
 			mes "Yes, it's about time";
 			mes "for me to depart. Ah,";
 			mes "and may I ask who this";
-			if(Sex == 1) mes "young gentleman here is?";
+			if(Sex == SEX_MALE) mes "young gentleman here is?";
 			else mes "lovely young lady is?";
 			next;
 			mes "[Guard]";
@@ -7541,7 +7541,7 @@ yuno_pre,95,71,5	script	Guard	852,{
 		switch( select( "Thank you.","Who was that gentleman...?" ) )
 		{
 			case 1:
-				if(Sex == 1) mes "A Mister "+strcharinfo(0)+"";
+				if(Sex == SEX_MALE) mes "A Mister "+strcharinfo(0)+"";
 				else
 				{
 					if(getpartnerid()) mes "A Missis "+strcharinfo(0)+"";

npc/quests/quests_morocc.txt

@@ -2214,7 +2214,7 @@ moc_ruins,137,70,3	script	Book-Touching Man#garas	48,{
 				mes "All I'm asking is to check out a book from Prontera Library for me. It sounds easy, doesn't it?";
 				mes "Well, you don't look like someone who loves reading, but I hope you at least know how to check out a book from a library.";
 				next;
-				if (Sex == 1) {
+				if (Sex == SEX_MALE) {
 					mes "[Benjamin]";
 					mes "If you help me, I'll show you a limited picture book edition of Mammi... Once. Hehehehe.";
 					mes "What do you say? You do want to help me, right?";

npc/quests/quests_moscovia.txt

@@ -3388,12 +3388,12 @@ mosk_in,135,191,5	script	Landlord#mos	4_F_RUSWOMAN3,{
 	case 3:
 		mes "[Landlord]";
 		emotion e_lv;
-		mes "Oh~! You look great! Look at the "+((Sex)?"solid muscle":"fair skin")+"!";
+		mes "Oh~! You look great! Look at the "+((Sex == SEX_MALE)?"solid muscle":"fair skin")+"!";
 		mes "But you look tired. Is it because of a long journey?";
 		next;
 		mes "[Landlord]";
-		mes "We've got a room available just for you. "+((Sex)?"It's the best in town. How about staying the night?":"It's like a princess' room.");
+		mes "We've got a room available just for you. "+((Sex == SEX_MALE)?"It's the best in town. How about staying the night?":"It's like a princess' room.");
-		mes (Sex)?"I'll charge you at reasonable price for you, handsome guy.":"How about staying the night? I'll mark down the price for you, beautiful lady.";
+		mes (Sex == SEX_MALE)?"I'll charge you at reasonable price for you, handsome guy.":"How about staying the night? I'll mark down the price for you, beautiful lady.";
 		next;
 		mes "["+strcharinfo(0)+"]";
 		mes "Oh, I'm sorry but I didn't come to stay here.";
@@ -4901,7 +4901,7 @@ OnTouch:
 				mes "I need to kick your ass more.";
 				next;
 				mes "[Baba Yaga, the Horrible]";
-				if (Sex) {
+				if (Sex == SEX_MALE) {
 					mes "I will bewitch";
 					mes "and enslave you.";
 					mes "Come here, Heeee!";
@@ -7755,7 +7755,7 @@ moscovia,213,216,3	script	Ryubaba#rus08	4_F_RUSWOMAN2,{
 				mes "Are you crazy!? Don't you know how wide the world is and how many beautiful people there are? You're pretty full of it, country girl!";
 				next;
 				mes "["+ strcharinfo(0) +"]";
-				if (!Sex)
+				if (Sex == SEX_FEMALE)
 					mes "Besides, if there was a most beautiful girl in the world it would be me, me, me!";
 				else {
 					mes "Have you seen dancers dancing? Have you seen beautiful and pure priests?!";

npc/quests/quests_nameless.txt

@@ -3608,7 +3608,7 @@ alberta,127,143,3	script	Belder	85,{
 		next;
 		switch(select("I'll promote your loans!:Uh...")) {
 		case 1:
-			if (Sex == 1) {
+			if (Sex == SEX_MALE) {
 				mes "[Belder]";
 				mes "You? But you're a dude!";
 				mes "No sweaty, stinky, sleazy";
@@ -4002,7 +4002,7 @@ cmd_fild01,55,160,0	script	Heap of Earth	844,{
 				close;
 			}
 		case 2:
-			if (Sex == 1) {
+			if (Sex == SEX_MALE) {
 				mes "[Dorian]";
 				mes "Ah, my apologies.";
 				mes "Too many have asked, so";
@@ -5259,7 +5259,7 @@ alberta,102,80,3	script	Jhonnita	86,{
 				mes "I doubt you can afford them.";
 				mes "Jewels aren't cheap, you know?";
 				next;
-				if (Sex) {
+				if (Sex == SEX_MALE) {
 					mes "[Jhonnita]";
 					mes "Oh, I get it now. You want";
 					mes "to give one as a present to";
@@ -5855,7 +5855,7 @@ payon_in03,167,149,3	script	Wola	75,2,2,{
 			next;
 			switch(select("Will you go out with me?:Leblo's back medicine?")) {
 			case 1:
-				if (Sex) {
+				if (Sex == SEX_MALE) {
 					mes "[Wola]";
 					mes "^666666*Blush*^000000 But it's too";
 					mes "early for us to just go";
@@ -5944,7 +5944,7 @@ payon_in03,167,149,3	script	Wola	75,2,2,{
 		next;
 		switch(select("Will you go out with me?:Leblo's back medicine?")) {
 		case 1:
-			if (Sex == 1) {
+			if (Sex == SEX_MALE) {
 				mes "^666666*Blush*^000000 But it's too";
 				mes "early for us to just go";
 				mes "on a date. I'm sorry, it's...";
@@ -6961,7 +6961,7 @@ in_rogue,359,116,3	script	Marybell	747,{
 				mes "Can't tell what";
 				mes "you're saying exactly.";
 				next;
-				if (Sex) {
+				if (Sex == SEX_MALE) {
 					mes "[Marybell]";
 					mes "If this is some kind";
 					mes "of weird come-on, you'd";

npc/quests/quests_niflheim.txt

@@ -575,7 +575,7 @@ umbala,215,181,3	script	Billik	733,{
 niflheim,153,215,3	script	Feylin	794,{
 	if (nif_revive == 2) {
 		mes "[Feylin]";
-		mes "Poor "+((Sex)?"guy":"girl")+"...";
+		mes "Poor "+((Sex == SEX_MALE)?"guy":"girl")+"...";
 		mes "Dying at such a young age...";
 		mes "I am always sorry to see the";
 		mes "young pass away.";

npc/quests/quests_prontera.txt

@@ -276,7 +276,7 @@ prontera,248,212,3	script	Busy Boy#prt	706,3,3,{
 				mes ".........?";
 				next;
 				mes "[Busy-Looking Boy]";
-				if (Sex) {
+				if (Sex == SEX_MALE) {
 					mes "Ack! You're that clumsy";
 					mes "dude who made me drop";
 				}
@@ -302,7 +302,7 @@ prontera,248,212,3	script	Busy Boy#prt	706,3,3,{
 			next;
 			select("Well, I, um...");
 			mes "[Busy-Looking Boy]";
-			if (Sex) {
+			if (Sex == SEX_MALE) {
 				mes "Yeah... A real";
 				mes "man wouldn't have";
 				mes "ditched back then";
@@ -2259,7 +2259,7 @@ prt_church,185,106,3	script	Father Bamph	60,{
 		mes "sent this adventurer here";
 		mes "for a favor, it probably means";
 		mes "she trusts this person. Besides, we need somebody to carry out";
-		if (Sex)
+		if (Sex == SEX_MALE)
 			mes "this task for us. Why not him?";
 		else
 			mes "this task for us. Why not her?";

npc/quests/quests_veins.txt

@@ -7339,7 +7339,7 @@ ve_in,237,131,1	script	Female Customer#ve1	940,{
 	mes "men? You know, I've been";
 	mes "pretty lonely lately...";
 	next;
-	if (Sex == 0) {
+	if (Sex == SEX_FEMALE) {
 		mes "[Bartender]";
 		mes "Haha, well,";
 		mes "I'm not so sure..";

npc/quests/seals/brisingamen_seal.txt

@@ -593,7 +593,7 @@ prt_fild08,175,374,3	script	Bard#brising	51,{
 		mes "do you not?";
 		next;
 		mes "[Nelliorde]";
-		if (Sex) {
+		if (Sex == SEX_MALE) {
 			mes "Hahahaha, forgive my rudeness,";
 			mes "but I fail to remember your name, although your face does seem rather familiar.";
 		}
@@ -2301,7 +2301,7 @@ prt_castle,84,51,5	script	Librarian#2	105,{
 		next;
 		switch(select("Lowen, Sibling:Lowen, Spouse:Lowen, Enemy:Lowen, a Friend")) {
 		case 1:
-			if (Sex) {
+			if (Sex == SEX_MALE) {
 				mes "[Librarian]";
 				mes "How dare you";
 				mes "lie to the royal";
@@ -2348,7 +2348,7 @@ prt_castle,84,51,5	script	Librarian#2	105,{
 				close;
 			}
 		case 2:
-			if (Sex) {
+			if (Sex == SEX_MALE) {
 				mes "[Librarian]";
 				mes "Spouse...?";
 				mes "Well, I guess you look like a husband. Heh, I've got a girlfriend myself. Well, at least I think so. Anyway...";

npc/quests/seals/megingard_seal.txt

@@ -636,7 +636,7 @@ prt_in,172,109,0	script	A File#megin1	111,{
 	}
 	else if (god_eremes < 7) {
 		mes "[Librarian Jekan]";
-		mes "I'm sorry "+((Sex)?"sir":"ma'am")+",";
+		mes "I'm sorry "+((Sex == SEX_MALE)?"sir":"ma'am")+",";
 		mes "but special authorization is required to browse that section. Otherwise, it's off limits.";
 		close;
 	}

npc/quests/skills/alchemist_skills.txt

@@ -292,7 +292,7 @@ yuno_in04,33,108,4	script	Pisruik#qsk_al	883,{
 							mes "The doctor tells me to avoid";
 							mes "stress and hard work, but";
 							mes "researching is my life.";
-							if (Sex == 0) {
+							if (Sex == SEX_FEMALE) {
 								next;
 								mes "[Pisruik]";
 								mes "I wonder...";
@@ -353,7 +353,7 @@ yuno_in04,33,108,4	script	Pisruik#qsk_al	883,{
 							mes "The doctor tells me to avoid";
 							mes "stress and hard work, but";
 							mes "researching is my life.";
-							if (Sex == 0) {
+							if (Sex == SEX_FEMALE) {
 								next;
 								mes "[Pisruik]";
 								mes "I wonder...";
@@ -532,7 +532,7 @@ yuno_in04,33,108,4	script	Pisruik#qsk_al	883,{
 				mes "The doctor tells me to avoid";
 				mes "stress and hard work, but";
 				mes "researching is my life.";
-				if (Sex == 0) {
+				if (Sex == SEX_FEMALE) {
 					next;
 					mes "[Pisruik]";
 					mes "I wonder...";
@@ -593,7 +593,7 @@ yuno_in04,33,108,4	script	Pisruik#qsk_al	883,{
 				mes "The doctor tells me to avoid";
 				mes "stress and hard work, but";
 				mes "researching is my life.";
-				if (Sex == 0) {
+				if (Sex == SEX_FEMALE) {
 					next;
 					mes "[Pisruik]";
 					mes "I wonder...";
@@ -646,7 +646,7 @@ yuno_in04,33,108,4	script	Pisruik#qsk_al	883,{
 			set ALCHE_SK,6;
 			next;
 			mes "[Pisruik]";
-			if (Sex == 0) {
+			if (Sex == SEX_FEMALE) {
 				mes "I... I really";
 				mes "appreciate your";
 				mes "willingness to help";
@@ -668,7 +668,7 @@ yuno_in04,33,108,4	script	Pisruik#qsk_al	883,{
 				mes "Thanks so much for";
 				mes "bringing me these";
 				mes "Maneater Blossoms.";
-				if (Sex == 0) {
+				if (Sex == SEX_FEMALE) {
 					mes "You don't know how";
 					mes "much this means to me~";
 				}
@@ -695,7 +695,7 @@ yuno_in04,33,108,4	script	Pisruik#qsk_al	883,{
 				mes "Your glasses...";
 				mes "They're broken...";
 				next;
-				if (Sex == 0) {
+				if (Sex == SEX_FEMALE) {
 					mes "^3355FFThe explosion destroyed";
 					mes "Pisruik's glasses, revealing";
 					mes "the beautiful face of a";
@@ -773,7 +773,7 @@ yuno_in04,33,108,4	script	Pisruik#qsk_al	883,{
 				mes "Now I finally have the";
 				mes "exact amount of Maneater";
 				mes "Blossoms that I'll need.";
-				if (Sex == 0) {
+				if (Sex == SEX_FEMALE) {
 					mes "I'm really sorry for putting";
 					mes "your through all this trouble.";
 				}
@@ -799,7 +799,7 @@ yuno_in04,33,108,4	script	Pisruik#qsk_al	883,{
 				mes "Your glasses...";
 				mes "They're broken...";
 				next;
-				if (Sex == 0) {
+				if (Sex == SEX_FEMALE) {
 					mes "^3355FFThe explosion destroyed";
 					mes "Pisruik's glasses, revealing";
 					mes "the beautiful face of a";
@@ -935,7 +935,7 @@ yuno_in04,33,108,4	script	Pisruik#qsk_al	883,{
 						mes "thesis as a ready reference.";
 						next;
 						mes "[Pisruik]";
-						if (Sex == 1) {
+						if (Sex == SEX_MALE) {
 							mes "Hopefully, we'll";
 							mes "meet again sometime";
 							mes "in the future. Good luck on";
@@ -958,7 +958,7 @@ yuno_in04,33,108,4	script	Pisruik#qsk_al	883,{
 					mes "Well, if you ever change";
 					mes "your mind, feel free to come";
 					mes "back for me to teach you.";
-					if (Sex == 0) {
+					if (Sex == SEX_FEMALE) {
 						mes "And it's no trouble at all!";
 						mes "I really enjoy your company...";
 					}
@@ -1022,7 +1022,7 @@ yuno_in04,33,108,4	script	Pisruik#qsk_al	883,{
 				mes "thesis as a ready reference.";
 				next;
 				mes "[Pisruik]";
-				if (Sex == 1) {
+				if (Sex == SEX_MALE) {
 					mes "Hopefully, we'll";
 					mes "meet again sometime";
 					mes "in the future. Good luck on";
@@ -1045,7 +1045,7 @@ yuno_in04,33,108,4	script	Pisruik#qsk_al	883,{
 			mes "Well, if you ever change";
 			mes "your mind, feel free to come";
 			mes "back for me to teach you.";
-			if (Sex == 0) {
+			if (Sex == SEX_FEMALE) {
 				mes "And it's no trouble at all!";
 				mes "I really enjoy your company...";
 			}
@@ -1766,7 +1766,7 @@ lhz_in01,225,122,5	script	Skrajjad#qsk_al	754,{
 		mes "to ask Kellasus to teach";
 		mes "you Alchemy. I must say";
 		mes "that I admire your attitude,";
-		if (Sex)
+		if (Sex == SEX_MALE)
 			mes "young lad. Now, don't worry...";
 		else
 			mes "young lass. Now, don't worry...";

npc/quests/skills/archer_skills.txt

@@ -120,7 +120,7 @@ moc_ruins,118,99,5	script	Roberto	88,{
 				close;
 			case 2:
 				mes "[Roberto]";
-				mes "...hey "+((Sex)?"mister":"miss")+".";
+				mes "...hey "+((Sex == SEX_MALE)?"mister":"miss")+".";
 				mes "...be careful at night.";
 				close;
 			}

npc/quests/skills/dancer_skills.txt

@@ -376,7 +376,7 @@ comodo,204,172,5	script	Canell#qsk_dan01	724,{
 	}
 
 	else if (BaseJob != Job_Dancer) {
-		if (Sex == 0) {
+		if (Sex == SEX_FEMALE) {
 			mes "[Canell]";
 			mes "Oh, what a cute";
 			mes "little girl~! Such";

npc/quests/skills/merchant_skills.txt

@@ -701,7 +701,7 @@ alberta,119,221,6	script	Charlron	107,{
 				close;
 			case 2:
 				mes "[Sushi King Gershaun]";
-				if (Sex > 1) {
+				if (Sex == SEX_FEMALE) {
 					mes "Stupid girl!";
 				}
 				else {

npc/quests/skills/swordman_skills.txt

@@ -98,7 +98,7 @@ OnTouch:
 		mes "Being a swordsman must come with a lot of responsibility and sacrifice.";
 		next;
 		mes "[De Thomas]";
-		if (Sex == 0)
+		if (Sex == SEX_MALE)
 			mes "For these swordsmen and knights, there is a wonderful skill.";
 		else
 			mes "For these swordswomen and knights, there is a wonderful skill young lady.";
@@ -209,7 +209,7 @@ prt_in,75,88,5	script	Leon Von Frich	85,3,3,{
 		next;
 		select("Eh, I... just...");
 		mes "[Leon]";
-		if (Sex == 0) {
+		if (Sex == SEX_FEMALE) {
 			mes "No need to be surprised.";
 			mes "If you use a sword, of course you ought to have a good arm!";
 		}

npc/quests/the_sign_quest.txt

@@ -788,7 +788,7 @@ prt_in,228,26,5	script	Steward#sign	55,{
 			close;
 		case 2:
 			mes "[Vandez]";
-			mes "Very good, "+((Sex)?"sir.":"madam.");
+			mes "Very good, "+((Sex == SEX_MALE)?"sir.":"madam.");
 			mes "Please wait a moment";
 			mes "while I consult with";
 			mes "the master in his study.";
@@ -981,7 +981,7 @@ prt_in,248,23,0	script	Maid#sign2	111,{
 		mes "Is there anything that";
 		mes "I can help you with?";
 		next;
-		if (Sex == 1) {
+		if (Sex == SEX_MALE) {
 			switch(select("You wanna have coffee sometime?:Tell me about Metz.")) {
 			case 1:
 				mes "[Elle]";
@@ -1738,7 +1738,7 @@ payon,154,170,3	script	Hagin#sign	78,{
 		select("I'd like to meet this Daewoon.");
 		mes "[Hagin]";
 		mes "Oh, I see~";
-		if (Sex) {
+		if (Sex == SEX_MALE) {
 			mes "You plan to ask him";
 			mes "to show you some fighting";
 			mes "pointers, do you? You men";
@@ -1885,7 +1885,7 @@ payon_in03,11,31,4	script	Daewoon#sign	808,{
 		mes "Oh, a visitor?";
 		mes "I'm sorry, but I believe";
 		mes "you're an uninvited guest~";
-		if (Sex) {
+		if (Sex == SEX_MALE) {
 			mes "You'll have to forgive me";
 			mes "if I wish to spend my time with maidens as opposed to men.";
 		}
@@ -2220,7 +2220,7 @@ payon_in03,11,31,4	script	Daewoon#sign	808,{
 				mes "[Daewoon]";
 				mes "Hmm. You have a truly";
 				mes "strong will. Then again,";
-				if (Sex == 1) {
+				if (Sex == SEX_MALE) {
 					mes "perhaps you lack a true";
 					mes "appreciation for beauty.";
 					mes "Even in Emperium form, how";
@@ -3440,7 +3440,7 @@ geffen_in,59,74,4	script	Jesqurienne#sign	803,{
 			mes "[Jesqurienne]";
 			mes "Ahhhhhh~";
 			mes "Hm? Why hello there,";
-			if (Sex) mes "you fine speciman of a man~";
+			if (Sex == SEX_MALE) mes "you fine speciman of a man~";
 			else mes "you precious, adorable girl~";
 			mes "I'm Jesqurienne. You've heard";
 			mes "of me, haven't you? Aren't you surprised to see me?";
@@ -4382,7 +4382,7 @@ geffen_in,61,72,7	script	Aaron#sign	754,{
 		mes "or you're the most gorgeous";
 		mes "woman I've seen in my life!";
 		next;
-		if (Sex == 1) {
+		if (Sex == SEX_MALE) {
 			select("Um, I'm a dude...");
 			emotion e_sob;
 			mes "[Aaron]";
@@ -6117,7 +6117,7 @@ prt_castle,107,58,5	script	Soldier#s11	105,{
 		mes "again for helping";
 		mes "out my sister, we";
 		mes "really appreciate it.";
-		if (Sex == 1) {
+		if (Sex == SEX_MALE) {
 			if (rand(1,5) == 5) {
 				next;
 				mes "[Maruin]";
@@ -7065,7 +7065,7 @@ geffen_in,171,42,3	script	Cute Girl	703,{
 			mes "[Liana]";
 			mes "Oh, this?";
 			mes "It's a letter for my daddy.";
-			mes "Mom said that some "+((Sex)?"guy":"lady")+" is gonna try to find my dad, so I'm making this so "+((Sex)?"":"s")+"he can take it him~";
+			mes "Mom said that some "+((Sex == SEX_MALE)?"guy":"lady")+" is gonna try to find my dad, so I'm making this so "+((Sex == SEX_MALE)?"":"s")+"he can take it him~";
 			close;
 		case 2:
 			mes "[Liana]";
@@ -7093,7 +7093,7 @@ geffen_in,171,42,3	script	Cute Girl	703,{
 				case 1:
 					mes "[Brenda Howard]";
 					mes "Liana~";
-					mes "This nice "+((Sex)?"man":"lady")+" is going to look for your dad. Why don't you ask "+((Sex)?"him":"her")+" to take your letter to him for you?";
+					mes "This nice "+((Sex == SEX_MALE)?"man":"lady")+" is going to look for your dad. Why don't you ask "+((Sex == SEX_MALE)?"him":"her")+" to take your letter to him for you?";
 					next;
 					mes "[Liana]";
 					mes "You are...?";
@@ -9103,7 +9103,7 @@ niflheim,313,70,4	script	Pleasant-Featured Lady#s	90,{
 		mes "You're the one I'm looking";
 		mes "for, the one who's been on";
 		mes "a long journey to prove";
-		if (Sex == 1) {
+		if (Sex == SEX_MALE) {
 			mes "his courage.";
 		}
 		else {
@@ -10839,7 +10839,7 @@ que_sign01,45,227,4	script	Queen of the Dead	856,{
 			mes "^8C1717Yes, that's it!";
 			mes "I never expected a mortal";
 			mes "to have such an interesting";
-			mes "artifact in "+((Sex)?"his":"her")+" possession.^000000";
+			mes "artifact in "+((Sex == SEX_MALE)?"his":"her")+" possession.^000000";
 			next;
 			mes "[Lady Hell]";
 			mes "^8C1717As queen of Niflheim,";

npc/re/cities/dewata.txt

@@ -537,7 +537,7 @@ dewata,89,191,6	script	Small Shrine#dew1	844,{
 			next;
 		} else if (.@stat & 128) {
 			mes "- The shrine envelops you in a loving aura. -";
-			if ((Sex == 0 && compare(.@wish$,.@wishes$[26])) || (Sex == 1 && compare(.@wish$,.@wishes$[27])))
+			if ((Sex == SEX_FEMALE && compare(.@wish$,.@wishes$[26])) || (Sex == SEX_MALE && compare(.@wish$,.@wishes$[27])))
 				specialeffect2 EF_LIGHTSPHERE;
 			next;
 		}
@@ -738,7 +738,7 @@ OnTouch:
 dewata,269,208,4	script	Little Kid in Town#dew	538,2,3,{
 OnTouch:
 	mes "[Kid]";
-	mes "Hey "+((Sex)?"bro":"sis")+", look at that man!";
+	mes "Hey "+((Sex == SEX_MALE)?"bro":"sis")+", look at that man!";
 	next;
 	mes "[Kid]";
 	mes "He's been lying there for a week doin' nothin'...";

npc/re/instances/WolfchevLaboratory.txt

@@ -23,7 +23,7 @@ lighthalzen,303,303,6	script	Giacomo Girolamo#kiup2	4_M_KHMAN,3,3,{
 	}
 	if (lhz_boss > 30) {
 		if (!lght_duk01) {
-			if (Sex) {
+			if (Sex == SEX_MALE) {
 				emotion e_pif, "Giacomo Girolamo#kiup2";
 				mes "[Giacomo Girolamo]";
 				mes "....a guy....?";
@@ -166,7 +166,7 @@ lighthalzen,303,303,6	script	Giacomo Girolamo#kiup2	4_M_KHMAN,3,3,{
 			close;
 		} else {
 			mes "[Giacomo Girolamo]";
-			if (Sex) {
+			if (Sex == SEX_MALE) {
 				emotion e_paper, "Giacomo Girolamo#kiup2";
 				mes "Take care yourself and don't disappear!";
 			} else {
@@ -176,7 +176,7 @@ lighthalzen,303,303,6	script	Giacomo Girolamo#kiup2	4_M_KHMAN,3,3,{
 			close;
 		}
 	} else {
-		if (Sex) {
+		if (Sex == SEX_MALE) {
 			emotion e_ho, "Giacomo Girolamo#kiup2";
 			mes "[Giacomo Girolamo]";
 			mes "Only those beautiful ladies are the reason of my life~!";
@@ -288,7 +288,7 @@ lighthalzen,303,303,6	script	Giacomo Girolamo#kiup2	4_M_KHMAN,3,3,{
 
 OnTouch:
 	if (!lght_duk01)
-		emotion (Sex ? e_pif : e_lv2), "Giacomo Girolamo#kiup2";
+		emotion (Sex == SEX_MALE? e_pif : e_lv2), "Giacomo Girolamo#kiup2";
 	end;
 }
 

npc/re/jobs/1-1/mage.txt

@@ -70,7 +70,7 @@ geffen_in,164,124,4	script	Mage Guildsman#mage	123,{
 			mes "Wanna be a Mage? Eh...";
 			next;
 			mes "[Mage Guildsman]";
-			if (Sex) {
+			if (Sex == SEX_MALE) {
 				mes "Hey, look at you! You're kinda cute~! Not my type though...";
 			}else{
 				mes "Oooh, you're such a hot babe~!";

npc/re/jobs/1-1/thief.txt

@@ -41,7 +41,7 @@ moc_prydb1,39,129,2	script	Thief Guide#thief	69,{
 				close;
 			}else{
 				mes "[Thief Guide]";
-				if (Sex)
+				if (Sex == SEX_MALE)
 					mes "Hey, dude.";
 				else
 					mes "Hey, baby~";
@@ -49,7 +49,7 @@ moc_prydb1,39,129,2	script	Thief Guide#thief	69,{
 			}
 		}else{
 			mes "[Thief Guide]";
-			if (Sex)
+			if (Sex == SEX_MALE)
 				mes "Hey, dude.";
 			else
 				mes "Hey, baby.";
@@ -59,7 +59,7 @@ moc_prydb1,39,129,2	script	Thief Guide#thief	69,{
 	}
 	if(q_job_thief == 1) {
 		mes "[Thief Guildsman]";
-		mes "Ehh... Seems like a beloved "+(Sex?"son":"daughter")+" of a rich family, but why are you here in this dirty place?";
+		mes "Ehh... Seems like a beloved "+(Sex == SEX_MALE?"son":"daughter")+" of a rich family, but why are you here in this dirty place?";
 		next;
 		mes "[Thief Guildsman]";
 		mes "Well, I'm not in charge of making you a Thief. I just accept applications, get it?";
@@ -73,7 +73,7 @@ moc_prydb1,39,129,2	script	Thief Guide#thief	69,{
 			close;
 		}else{
 			mes "What the heck...?";
-			if(Sex) {
+			if(Sex == SEX_MALE) {
 				mes "Huh... you are a "+jobname(Class)+", blockhead!";
 				next;
 				mes "[Thief Guildsman]";
@@ -87,7 +87,7 @@ moc_prydb1,39,129,2	script	Thief Guide#thief	69,{
 			close;
 		}
 	}
-	mes "Ehh... Seems like a beloved "+(Sex?"son":"daughter")+" of a rich family, but why are you here in this dirty place?";
+	mes "Ehh... Seems like a beloved "+(Sex == SEX_MALE?"son":"daughter")+" of a rich family, but why are you here in this dirty place?";
 	next;
 	if(select("I want to be a Thief.:Nothing.") == 2) {
 		mes "[Thief Guildsman]";

npc/re/jobs/2e/kagerou_oboro.txt

@@ -258,7 +258,7 @@ job_ko,25,115,4	script	Old Man#ko	588,{
 		mes "Sorry I am not a teacher. But!";
 		next;
 		mes "[Guide Gion]";
-		mes "I can help you on the path you've chosen, the ^33CC71"+((Sex)?"Kagerou":"Oboro")+"^000000 path.";
+		mes "I can help you on the path you've chosen, the ^33CC71"+((Sex == SEX_MALE)?"Kagerou":"Oboro")+"^000000 path.";
 		next;
 		mes "^1A95E6You hear Guide Gion's voice faintly as you slip away.^1A95E6";
 		next;
@@ -266,14 +266,14 @@ job_ko,25,115,4	script	Old Man#ko	588,{
 		setquest 5134;
 		set job_kagero,4;
 		mes "[Guide Gion]";
-		mes "If you are prepared to follow me, Guide Gion, on the "+((Sex)?"Kagerou":"Oboro")+" path, we will meet again.";
+		mes "If you are prepared to follow me, Guide Gion, on the "+((Sex == SEX_MALE)?"Kagerou":"Oboro")+" path, we will meet again.";
 		close2;
 		warp "amatsu",147,136;
 		end;
 	} else if (job_kagero == 4) {
 		cutin "job_ko02",2;
 		mes "[Guide Gion]";
-		mes "I thought you were afraid of the ^33CC71path of the "+((Sex)?"Kagerou":"Oboro")+"^33CC71 and wouldn't come back.";
+		mes "I thought you were afraid of the ^33CC71path of the "+((Sex == SEX_MALE)?"Kagerou":"Oboro")+"^33CC71 and wouldn't come back.";
 		next;
 		mes "[Guide Gion]";
 		mes "But from the look of your eyes, I guess I misjudged you.";
@@ -663,7 +663,7 @@ job_ko,25,115,4	script	Old Man#ko	588,{
 		mes "And if you are lucky, there will be others targeting the monster.";
 		next;
 		mes "[Guide Gion]";
-		mes "May the blessings of '" + ((Sex)?"Kagerou, dancing sun":"Oboro, misty moonlight") + "' be with you.";
+		mes "May the blessings of '" + ((Sex == SEX_MALE)?"Kagerou, dancing sun":"Oboro, misty moonlight") + "' be with you.";
 		next;
 		setquest 5146;
 		set job_kagero,7;
@@ -2557,9 +2557,9 @@ job_ko,148,46,4	script	Guide Gion#ko2	588,{
 		mes "[Guide Gion]";
 		mes "The Test of Battle will be put off for a while. Don't worry because this does not have affect to other tests.";
 		next;
-		mapannounce "job_ko","[Gion] My Friend " + strcharinfo(0) + " made it to " + ((Sex)?"Kagerou":"Oboro") + " Path. Congratulations!!",bc_map;
+		mapannounce "job_ko","[Gion] My Friend " + strcharinfo(0) + " made it to " + ((Sex == SEX_MALE)?"Kagerou":"Oboro") + " Path. Congratulations!!",bc_map;
 		mes "[Guide Gion]";
-		mes "My friend " + strcharinfo(0) + " made it to " + ((Sex)?"Kagerou":"Oboro") + " Path. Congratulations!!";
+		mes "My friend " + strcharinfo(0) + " made it to " + ((Sex == SEX_MALE)?"Kagerou":"Oboro") + " Path. Congratulations!!";
 		next;
 		cutin "job_ko02",2;
 		mes "[Guide Gion]";
@@ -2623,7 +2623,7 @@ job_ko,148,46,4	script	Guide Gion#ko2	588,{
 			if (isbegin_quest(.@i)) erasequest .@i;
 		set job_kagero,9;
 		getnameditem .@item,strcharinfo(0);
-		jobchange (Sex)?Job_Kagerou:Job_Oboro;
+		jobchange (Sex == SEX_MALE)?Job_Kagerou:Job_Oboro;
 		donpcevent "Summon Target#ko::OnEnable";
 		mes "[Guide Gion]";
 		mes "I hope the blessings of Kagerou, dancing sun and Oboro, misty moonlight will be with you on your journey ahead.";

npc/re/jobs/3-1/archbishop.txt

@@ -76,7 +76,7 @@ prt_church,103,88,3	script	Praying Minister#arch	60,{
 			mes "All ministers of Odin should be diligent. They should never be too lazy to serve Odin.";
 			next;
 			mes "[Praying Minister]";
-			mes (Sex?"Brother":"Sister")+", how has your life been? Have you lived it to its fullest?";
+			mes (Sex == SEX_MALE?"Brother":"Sister")+", how has your life been? Have you lived it to its fullest?";
 			mes "Have you served your life in the light of Odin?";
 			next;
 			mes "[Praying Minister]";
@@ -88,7 +88,7 @@ prt_church,103,88,3	script	Praying Minister#arch	60,{
 			mes "We should not fall prey to lies and deceit.";
 			next;
 			mes "[Praying Minister]";
-			mes (Sex?"Brother":"Sister")+"...";
+			mes (Sex == SEX_MALE?"Brother":"Sister")+"...";
 			mes "Even though we serve Odin, we are normal people.";
 			mes "We can be degraded in spite of ourselves and we must realize that.";
 			next;
@@ -412,7 +412,7 @@ umbala,139,227,3	script	Priest#arch	60,{
 		next;
 		mes "[Priest Dayan]";
 		mes "Thank you very much.";
-		mes "Feel free to visit here when you want to pray, "+(Sex?"brother.":"sister.");
+		mes "Feel free to visit here when you want to pray, "+(Sex == SEX_MALE?"brother.":"sister.");
 		mes "A visit from a friend always makes me happy.";
 		set job_arch,4;
 		changequest 2188,2189;
@@ -596,7 +596,7 @@ hu_in01,205,204,7	script	Praying Nun#benew	79,{
 		mes "[Vinue]";
 		mes "Ah, Welcome.";
 		mes "It's not time to have a service yet...";
-		mes "Are you here to pray, "+(Sex?"brother":"sister")+"?";
+		mes "Are you here to pray, "+(Sex == SEX_MALE?"brother":"sister")+"?";
 		next;
 		mes "[" + strcharinfo(0) + "]";
 		mes "I came here to say hello from Priest Dayan from Prontera.";
@@ -615,7 +615,7 @@ hu_in01,205,204,7	script	Praying Nun#benew	79,{
 		next;
 		mes "[Vinue]";
 		mes "Ah...";
-		mes "He's very kind. As are you "+(Sex?"brother":"sister")+".";
+		mes "He's very kind. As are you "+(Sex == SEX_MALE?"brother":"sister")+".";
 		next;
 		mes "[Vinue]";
 		mes "But don't worry.";

npc/re/jobs/3-1/guillotine_cross.txt

@@ -242,7 +242,7 @@ job3_guil01,82,95,3	script	Daora#3rdgc02	940,{
 	mes "[Daora]";
 	if (Class == Job_Assassin || Class == Job_Assassin_Cross || Class == Job_Baby_Assassin) {
 		if (job_3rd_gc < 4) {
-			if (Sex) {
+			if (Sex == SEX_MALE) {
 				mes "Oh~ you're good-looking!";
 				mes "So, what do you want?";
 			} else {
@@ -739,7 +739,7 @@ job3_guil01,82,95,3	script	Daora#3rdgc02	940,{
 			close;
 		}
 	} else if (Class == Job_Guillotine_Cross || Class == Job_Guillotine_Cross_T || Class == Job_Baby_Cross) {
-		if (Sex) {
+		if (Sex == SEX_MALE) {
 			mes "Oh~ you're good-looking~!";
 			mes "It's worthwhile to open a pub~";
 			mes "I can feel fruitful labors whenever I see a guy like you~";
@@ -772,7 +772,7 @@ job3_guil01,82,95,3	script	Daora#3rdgc02	940,{
 			close;
 		case 3:
 			mes "[Daora]";
-			if (Sex) {
+			if (Sex == SEX_MALE) {
 				mes "Uh... Umm...";
 				mes "It's complicated order. but I don't have any choice since you want it.";
 				next;
@@ -797,7 +797,7 @@ job3_guil01,82,95,3	script	Daora#3rdgc02	940,{
 			}
 		}
 	} else {
-		if (Sex == 1) {
+		if (Sex == SEX_MALE) {
 			mes "Oh~ you're good-looking!";
 			mes "So, what do you want?";
 		}
@@ -1200,7 +1200,7 @@ ve_in,228,108,3	script	Waitress#3rdgc04	80,{
 					mes "What? My name?";
 					mes "Are you hitting on me?";
 					mes "Don't do that.";
-					if (Sex) mes "You are not my type.";
+					if (Sex == SEX_MALE) mes "You are not my type.";
 					else mes "I don't swing that way.";
 					close;
 				case 3:
@@ -2007,7 +2007,7 @@ veins,223,180,3	script	Girl#3rdgc09	941,{
 				}
 				next;
 				mes "[Melissa]";
-				mes "Hi, "+((Sex)?"brother":"sister")+"~ Let me collect all of the information you've provided...";
+				mes "Hi, "+((Sex == SEX_MALE)?"brother":"sister")+"~ Let me collect all of the information you've provided...";
 				next;
 				mes "- She begins to murmur and gestures toward the sky. Her hair springs up as she says... -";
 				next;

npc/re/jobs/3-1/mechanic.txt

@@ -76,7 +76,7 @@ yuno,129,156,3	script	Chainheart	923,{
 			next;
 			set job__mechanic,12;
 			completequest 10101;
-			if (Sex)
+			if (Sex == SEX_MALE)
 				getitem 5749,1; //Driver_Band
 			else
 				getitem 5760,1; //Driver_Band_

npc/re/jobs/novice/academy.txt

@@ -5730,7 +5730,7 @@ iz_ac01,69,36,3	script	Otter Samssoon#ac	4W_SAILOR,{
 				mes "[Otter Samssoon]";
 				switch(.@style) {
 				case 1:
-					if (Sex) {
+					if (Sex == SEX_MALE) {
 						mes "Oh my!!? 'Play Dead' cut?";
 						mes "This looks neat and relaxed.. So popular style.";
 					} else {
@@ -5740,7 +5740,7 @@ iz_ac01,69,36,3	script	Otter Samssoon#ac	4W_SAILOR,{
 					}
 					break;
 				case 2:
-					if (Sex) {
+					if (Sex == SEX_MALE) {
 						mes "Oh my!!? 'Two Handed Sword Mastery' cut?";
 						mes "You... You know the famous D..? He has exactly the same style!";
 					} else {
@@ -5749,7 +5749,7 @@ iz_ac01,69,36,3	script	Otter Samssoon#ac	4W_SAILOR,{
 					}
 					break;
 				case 3:
-					if (Sex) {
+					if (Sex == SEX_MALE) {
 						mes "Oh my!!? 'Napalm Beat' cut?";
 						mes "It has well arranges hair line that makes feel charisma.";
 					} else {
@@ -5758,7 +5758,7 @@ iz_ac01,69,36,3	script	Otter Samssoon#ac	4W_SAILOR,{
 					}
 					break;
 				case 4:
-					if (Sex) {
+					if (Sex == SEX_MALE) {
 						mes "Oh my!!? 'Double Strafe' cut?";
 						mes "Natural hair is shaking by wind.. Clean and good feeling.";
 					} else {
@@ -5767,7 +5767,7 @@ iz_ac01,69,36,3	script	Otter Samssoon#ac	4W_SAILOR,{
 					}
 					break;
 				case 5:
-					if (Sex) {
+					if (Sex == SEX_MALE) {
 						mes "Oh my!!? 'Angelus' cut?";
 						mes "Calm and piety feeling.. Not boring style.";
 					} else {
@@ -5776,7 +5776,7 @@ iz_ac01,69,36,3	script	Otter Samssoon#ac	4W_SAILOR,{
 					}
 					break;
 				case 6:
-					if (Sex) {
+					if (Sex == SEX_MALE) {
 						mes "Oh my!!? 'Push Cart' cut?";
 						mes "Big Kar is motivated for this style with a romance of a man.";
 					} else {
@@ -5785,7 +5785,7 @@ iz_ac01,69,36,3	script	Otter Samssoon#ac	4W_SAILOR,{
 					}
 					break;
 				case 7:
-					if (Sex) {
+					if (Sex == SEX_MALE) {
 						mes "Oh my!!? 'Envenom' cut?";
 						mes "Tough style makes addicted.";
 					} else {
@@ -5795,7 +5795,7 @@ iz_ac01,69,36,3	script	Otter Samssoon#ac	4W_SAILOR,{
 					}
 					break;
 				case 8:
-					if (Sex) {
+					if (Sex == SEX_MALE) {
 						mes "Oh my!!? 'Bowling Bash' cut?";
 						mes "This style makes a nice guy to challenge.";
 						mes "Just a giving a glance can steal the heart.";
@@ -5805,7 +5805,7 @@ iz_ac01,69,36,3	script	Otter Samssoon#ac	4W_SAILOR,{
 					}
 					break;
 				case 9:
-					if (Sex) {
+					if (Sex == SEX_MALE) {
 						mes "Oh my!!? 'Venom Dust' cut?";
 						mes "This style has special ending line that looks fatal.";
 					} else {
@@ -5814,7 +5814,7 @@ iz_ac01,69,36,3	script	Otter Samssoon#ac	4W_SAILOR,{
 					}
 					break;
 				case 10:
-					if (Sex) {
+					if (Sex == SEX_MALE) {
 						mes "Oh my!!? 'Turn Undead' cut?";
 						mes "This style is like a cold city man who is strong enough to kill a monster.";
 					} else {
@@ -5823,7 +5823,7 @@ iz_ac01,69,36,3	script	Otter Samssoon#ac	4W_SAILOR,{
 					}
 					break;
 				case 11:
-					if (Sex) {
+					if (Sex == SEX_MALE) {
 						mes "Oh my!!? 'Dragonology' cut?";
 						mes "This style is intelligent style of mysterious dragon.";
 					} else {
@@ -5832,7 +5832,7 @@ iz_ac01,69,36,3	script	Otter Samssoon#ac	4W_SAILOR,{
 					}
 					break;
 				case 12:
-					if (Sex) {
+					if (Sex == SEX_MALE) {
 						mes "Oh my!!? 'Mace Mastery' cut?";
 						mes "Look fresh and look neat with wax treatment.";
 					} else {
@@ -5841,7 +5841,7 @@ iz_ac01,69,36,3	script	Otter Samssoon#ac	4W_SAILOR,{
 					}
 					break;
 				case 13:
-					if (Sex) {
+					if (Sex == SEX_MALE) {
 						mes "Oh my!!? 'Thunder Storm' cut?";
 						mes "This style has natural attractive perm which is like hitting by thunder storm.";
 					} else {
@@ -5850,7 +5850,7 @@ iz_ac01,69,36,3	script	Otter Samssoon#ac	4W_SAILOR,{
 					}
 					break;
 				case 14:
-					if (Sex) {
+					if (Sex == SEX_MALE) {
 						mes "Oh my!!? 'Encore' cut?";
 						mes "Rocker's favorite style.. Even the name itself..";
 					} else {
@@ -5859,7 +5859,7 @@ iz_ac01,69,36,3	script	Otter Samssoon#ac	4W_SAILOR,{
 					}
 					break;
 				case 15:
-					if (Sex) {
+					if (Sex == SEX_MALE) {
 						mes "Oh my!!? 'Grimtooth' cut?";
 						mes "The style with edge.";
 					} else {
@@ -5869,7 +5869,7 @@ iz_ac01,69,36,3	script	Otter Samssoon#ac	4W_SAILOR,{
 					}
 					break;
 				case 16:
-					if (Sex) {
+					if (Sex == SEX_MALE) {
 						mes "Oh my!!? 'Blitz Beat' cut?";
 						mes "It is the style my senior invented after he broke up with his girlfriends 5 times.";
 					} else {
@@ -5878,7 +5878,7 @@ iz_ac01,69,36,3	script	Otter Samssoon#ac	4W_SAILOR,{
 					}
 					break;
 				case 17:
-					if (Sex) {
+					if (Sex == SEX_MALE) {
 						mes "Oh my!!? 'Find Ore' cut?";
 						mes "This style seems to bring encounter or find unexpected things while walking on the street.";
 					} else {
@@ -5887,7 +5887,7 @@ iz_ac01,69,36,3	script	Otter Samssoon#ac	4W_SAILOR,{
 					}
 					break;
 				case 18:
-					if (Sex) {
+					if (Sex == SEX_MALE) {
 						mes "Oh my!!? 'Fire Pillar' cut?";
 						mes "Everyone used to have this hair style.. Which means that was a trend of an era.";
 					} else {
@@ -5896,7 +5896,7 @@ iz_ac01,69,36,3	script	Otter Samssoon#ac	4W_SAILOR,{
 					}
 					break;
 				case 19:
-					if (Sex) {
+					if (Sex == SEX_MALE) {
 						mes "Oh my!!? 'Guillotine Fist'";
 						mes "It is like one-shot style.. Like a real man. Right?";
 					} else {
@@ -6035,7 +6035,7 @@ iz_ac01,69,36,3	script	Otter Samssoon#ac	4W_SAILOR,{
 	}
 
 L_cutin:
-	if (Sex) {
+	if (Sex == SEX_MALE) {
 		if (getarg(0) < 10)
 			cutin "hair_m_0"+getarg(0),4;
 		else
@@ -7136,7 +7136,7 @@ iz_ac02,142,85,6	script	Lusa#ac	4_F_GUNSLINGER,{
 			mes "You're so cute! A ^ff0000Gunslinger^000000 who has true grit wield his weapons bringing justice in these wild times.";
 			next;
 			mes "[Lusa]";
-			if (Sex == 1)
+			if (Sex == SEX_MALE)
 				mes "Ya, know you remind me of my little brother, that varmint couldn't shoot the broadside of a barn.. at least not until I taught him.";
 			else
 				mes "Ya, know you remind me of my little sister, that scamp couldn't shoot the broadside of barn.. At least not until I taught her.";
@@ -8187,7 +8187,7 @@ iz_ac02,70,85,5	script	Arang#ac	4_F_TAEKWON,{
 				if (JobLevel >= 10) {
 					cutin "arang01.bmp", 0;
 					mes "[Arang]";
-					mes "It's time to choose your job? How about Taekwon "+(Sex ? "boy" : "girl")+"? You may be a nice adult like me.";
+					mes "It's time to choose your job? How about Taekwon "+(Sex == SEX_MALE ? "boy" : "girl")+"? You may be a nice adult like me.";
 					next;
 				}
 				while (1) {

npc/re/jobs/novice/supernovice_ex.txt

@@ -664,7 +664,7 @@ airplane,33,47,5	script	Nudor#sp2	729,{
 		}
 		next;
 		mes "[Nudor]";
-		if (Sex) mes "Did you know? You're really handsome~";
+		if (Sex == SEX_MALE) mes "Did you know? You're really handsome~";
 		else mes "I need to tell you, you are really... really~ beautiful.";
 		next;
 		mes "[Nudor]";

npc/re/quests/eden/eden_100_111.txt

@@ -682,7 +682,7 @@ moc_para01,37,95,5	script	Gelkah#1	4_F_GELKA,{
 						emotion e_heh;
 						break;
 					case 2:
-						if (Sex == 1)
+						if (Sex == SEX_MALE)
 							mes "I'm not sure if I'm cut out for that job. Besides...";
 						else
 							mes "I am sorry to say this but I am the only pupil of master now and forever... He said ^FF0000I don't need an ugly female pupil^000000 but I still stick to him.";

npc/re/quests/quests_dewata.txt

@@ -1680,7 +1680,7 @@ dew_fild01,127,240,4	script	Gatti#weapon	813,{
 	}
 	if (dew_weapon == 0) {
 		mes "[Gatti]";
-		mes "Hey there, young "+((Sex)?"man":"lady")+"~ Are you from around here?";
+		mes "Hey there, young "+((Sex == SEX_MALE)?"man":"lady")+"~ Are you from around here?";
 		next;
 		select("No, I'm not.");
 		mes "[Gatti]";
@@ -1796,7 +1796,7 @@ dew_fild01,127,240,4	script	Gatti#weapon	813,{
 			end;
 		}
 		mes "[Gatti]";
-		if(Sex == 0)
+		if(Sex == SEX_FEMALE)
 			mes "Lady, you possess a strong energy.";
 		else
 			mes "You possess a strong energy.";
@@ -1841,7 +1841,7 @@ dew_fild01,127,240,4	script	Gatti#weapon	813,{
 		next;
 		mes "[Gatti]";
 		mes "Oh yes! Finally.";
-		if (Sex == 0)
+		if (Sex == SEX_FEMALE)
 			mes "Lady, you also possess a strong energy.";
 		else
 			mes "You also possess a strong energy.";

npc/re/quests/quests_dicastes.txt

@@ -1329,7 +1329,7 @@ OnTouch:
 		mes "Hold up your head and come closer.";
 		mes "Conversations are meant to have with eye contact.";
 		next;
-		cutin (Sex?"ep13_ahat_f":"ep13_ahat_m"),1;
+		cutin (Sex == SEX_MALE?"ep13_ahat_f":"ep13_ahat_m"),1;
 		mes "You hold up your head at the sound of Ahat's voice";
 		mes "But you see a human in high-ranking Sapha clothing in front of you.";
 		sc_end SC_Blind;
@@ -1369,7 +1369,7 @@ dic_in01,294,276,5	script	Secret Adjutant#ep133_2	498,{
 		mes ".. Hey, what are you talking about?";
 		mes "What do you want to say?";
 		next;
-		cutin (Sex?"ep13_ahat_f":"ep13_ahat_m"),2;
+		cutin (Sex == SEX_MALE?"ep13_ahat_f":"ep13_ahat_m"),2;
 		mes "[Ahat]";
 		mes "" + strcharinfo(0) + "....";
 		mes "All you need to do is follow Cheshire's orders.";
@@ -1534,7 +1534,7 @@ dic_in01,300,280,5	script	Minister Ahat#ep133_21	493,{
 		mes "Hold up your head and come closer.";
 		mes "Conversations are meant to have with eye contact.";
 		next;
-		cutin (Sex?"ep13_ahat_f":"ep13_ahat_m"),2;
+		cutin (Sex == SEX_MALE?"ep13_ahat_f":"ep13_ahat_m"),2;
 		mes "You hold up your head at the sound of Ahat's voice";
 		mes "But you see a human in high-ranking Sapha clothing in front of you.";
 		SC_End SC_Blind;
@@ -1544,7 +1544,7 @@ dic_in01,300,280,5	script	Minister Ahat#ep133_21	493,{
 		close2;
 	}
 	else if (ep13_3_secret == 14) {
-		cutin (Sex?"ep13_ahat_f":"ep13_ahat_m"),2;
+		cutin (Sex == SEX_MALE?"ep13_ahat_f":"ep13_ahat_m"),2;
 		mes "[Ahat]";
 		mes "Surprised?";
 		mes "Because I look like a human just like you?";
@@ -1683,7 +1683,7 @@ dic_in01,300,280,5	script	Minister Ahat#ep133_21	493,{
 		close2;
 	}
 	else if (ep13_3_secret == 15) {
-		cutin (Sex?"ep13_ahat_f":"ep13_ahat_m"),2;
+		cutin (Sex == SEX_MALE?"ep13_ahat_f":"ep13_ahat_m"),2;
 		mes "[Ahat]";
 		mes "My loyal evil servant.";
 		mes "Come closer.";
@@ -1734,7 +1734,7 @@ dic_in01,300,280,5	script	Minister Ahat#ep133_21	493,{
 		close2;
 	}
 	else if (ep13_3_secret == 16) {
-		cutin (Sex?"ep13_ahat_f":"ep13_ahat_m"),2;
+		cutin (Sex == SEX_MALE?"ep13_ahat_f":"ep13_ahat_m"),2;
 		mes "[Ahat]";
 		mes "You must follow Cheshire's orders from now on.";
 		mes "Go now.";
@@ -1744,7 +1744,7 @@ dic_in01,300,280,5	script	Minister Ahat#ep133_21	493,{
 		close2;
 	}
 	else if (ep13_3_secret == 17) {
-		cutin (Sex?"ep13_ahat_f":"ep13_ahat_m"),2;
+		cutin (Sex == SEX_MALE?"ep13_ahat_f":"ep13_ahat_m"),2;
 		mes "[Ahat]";
 		mes "Cheshire's orders are important for future plans.";
 		mes "Make no mistakes and never leave traces that may lead to me.";
@@ -1752,7 +1752,7 @@ dic_in01,300,280,5	script	Minister Ahat#ep133_21	493,{
 		close2;
 	}
 	else if (ep13_3_secret == 18) {
-		cutin (Sex?"ep13_ahat_f":"ep13_ahat_m"),2;
+		cutin (Sex == SEX_MALE?"ep13_ahat_f":"ep13_ahat_m"),2;
 		mes "[Ahat]";
 		mes "Do you have something to say?";
 		mes "You've done well in the crack area.";
@@ -1781,7 +1781,7 @@ dic_in01,300,280,5	script	Minister Ahat#ep133_21	493,{
 		close2;
 	}
 	else {
-		cutin (Sex?"ep13_ahat_f":"ep13_ahat_m"),2;
+		cutin (Sex == SEX_MALE?"ep13_ahat_f":"ep13_ahat_m"),2;
 		mes "[Ahat]";
 		mes "Follow Cheshire's orders for the time being and clear the area nearby the crack.";
 		next;

npc/re/quests/quests_eclage.txt

@@ -4431,10 +4431,10 @@ OnTouch:
 		mes "who robbed our house.";
 		next;
 		mes "[Mother Rosa]";
-		mes "How can you believe what "+ (Sex?"he's":"she's") +" saying?";
+		mes "How can you believe what "+ (Sex == SEX_MALE?"he's":"she's") +" saying?";
-		mes "How do you know "+ (Sex?"he's":"she's") +" not lying";
+		mes "How do you know "+ (Sex == SEX_MALE?"he's":"she's") +" not lying";
-		mes "after robbing our stuff "+ (Sex?"himself":"herself") +"?";
+		mes "after robbing our stuff "+ (Sex == SEX_MALE?"himself":"herself") +"?";
-		mes "Search "+ (Sex?"his":"her") +" possessions immediately!!";
+		mes "Search "+ (Sex == SEX_MALE?"his":"her") +" possessions immediately!!";
 		next;
 		mes "[Father Dames]";
 		mes "No, how could you say such things?";

npc/re/quests/quests_malangdo.txt

@@ -6628,7 +6628,7 @@ mal_in01,31,210,2	script	Cat Gamers Director	549,{
 		mes "I should remember it and";
 		mes "tell it to my kids. Heh~";
 		next;
-		if (Sex == 0)
+		if (Sex == SEX_FEMALE)
 			setarray .@sex$[0],"Mr.","boy";
 		else
 			setarray .@sex$[0],"Miss","girl";

npc/re/quests/quests_malaya.txt

@@ -3161,7 +3161,7 @@ ma_fild01,251,93,3	script	Lost Child#malaya01	576,{
 			next;
 			mes "[Little Kid]";
 			mes "Why~ Do I always go in circles here?";
-			mes "Do you why, " + ((Sex) ? "mister" : "ma'am") + "?";
+			mes "Do you why, " + ((Sex == SEX_MALE) ? "mister" : "ma'am") + "?";
 			mes "What's with this road?";
 			mes "Is somebody trying to trick me?";
 			close;
@@ -4216,11 +4216,11 @@ ma_in01,47,101,3	script	Totoy#buwaya	577,7,7,{
 		mes "[Totoy]";
 		mes "Um... hey!";
 		next;
-		select("You are a " + ((Sex) ? "boy" : "girl") + ", aren't you?");
+		select("You are a " + ((Sex == SEX_MALE) ? "boy" : "girl") + ", aren't you?");
 		emotion e_omg,1;
 		mes "[Totoy]";
 		mes "Huh?";
-		if (!Sex) {
+		if (Sex == SEX_FEMALE) {
 			mes "Totoy is a girl, and you are a boy.";
 			mes "You're not a boy?";
 		} else {
@@ -4369,7 +4369,7 @@ malaya,290,152,5	script	Master of Hunting#buwaya	578,{
 		mes "Try collecting 10 Animal Samples from where the kid saw the monster. I will look for traces of that monster from the samples.";
 		next;
 		mes "[Master of Hunting]";
-		mes (Sex) ? "It won't be pleasant but any brave man could easily do it, don't you agree?" : "I don't want the hands of a pretty girl to smell bad but I could care less with someone like you. Ha ha!";
+		mes (Sex == SEX_MALE) ? "It won't be pleasant but any brave man could easily do it, don't you agree?" : "I don't want the hands of a pretty girl to smell bad but I could care less with someone like you. Ha ha!";
 		set malaya_buwaya,7;
 		erasequest 2273;
 		setquest 2274;
@@ -4393,7 +4393,7 @@ malaya,290,152,5	script	Master of Hunting#buwaya	578,{
 		mes "Try collecting 10 Animal Samples from where the kid saw the monster. I will look for traces of that monster from the samples.";
 		next;
 		mes "[Master of Hunting]";
-		mes (Sex) ? "It won't be pleasant but any brave man could easily do it, don't you agree?" : "I don't want the hands of a pretty girl to smell bad but I could care less with someone like you. Ha ha!";
+		mes (Sex == SEX_MALE) ? "It won't be pleasant but any brave man could easily do it, don't you agree?" : "I don't want the hands of a pretty girl to smell bad but I could care less with someone like you. Ha ha!";
 		set malaya_buwaya,7;
 		erasequest 2273;
 		setquest 2274;
@@ -7235,7 +7235,7 @@ malaya,55,72,4	script	Nurse#ma_n1	569,{
 		emotion e_what;
 		next;
 		mes "[???]";
-		mes "Hey "+((Sex)?"dude":"missy")+",";
+		mes "Hey "+((Sex == SEX_MALE)?"dude":"missy")+",";
 		mes "You're not getting in the hospital.";
 		next;
 		mes "["+strcharinfo(0)+"]";
@@ -7780,7 +7780,7 @@ malaya,53,68,4	script	Bushes#ma	844,{
 	if (malaya_bang == 13) {
 		mes "[???]";
 		mes "Don't come any closer!";
-		mes "Old "+((Sex)?"man":"lady")+"!";
+		mes "Old "+((Sex == SEX_MALE)?"man":"lady")+"!";
 		mes "How'd you know I was here?";
 		emotion e_omg;
 		next;
@@ -7864,7 +7864,7 @@ malaya,53,68,4	script	Bushes#ma	844,{
 	} else if (malaya_bang == 15) {
 		mes "[???]";
 		mes "Don't come any closer!";
-		mes "Old "+((Sex)?"man":"lady")+"!";
+		mes "Old "+((Sex == SEX_MALE)?"man":"lady")+"!";
 		mes "How'd you know I was here?";
 		emotion e_omg;
 		next;
@@ -8485,7 +8485,7 @@ ma_fild01,179,260,2	script	Festival Helper Boy#pin	577,{
 		mes "Sigh... We are still short of materials to start the '^7A96E0Pintados Festival^000000'.";
 		close;
 	case 3:
-		set .@str$, (Sex)?"Bro":"Sis";
+		set .@str$, (Sex == SEX_MALE)?"Bro":"Sis";
 		break;
 	}
 	emotion e_lv;

src/char/char.c

@@ -846,7 +846,7 @@ bool char_memitemdata_from_sql(struct s_storage* p, int max, int id, enum storag
  *
  * @retval SEX_MALE if the per-character sex is male
  * @retval SEX_FEMALE if the per-character sex is female
- * @retval 99 if the per-character sex is not defined or the current PACKETVER doesn't support it.
+ * @retval SEX_ACCOUNT if the per-character sex is not defined or the current PACKETVER doesn't support it.
  */
 int char_mmo_gender(const struct char_session_data *sd, const struct mmo_charstatus *p, char sex)
 {
@@ -859,7 +859,7 @@ int char_mmo_gender(const struct char_session_data *sd, const struct mmo_charsta
 			return SEX_FEMALE;
 		case 'U':
 		default:
-			return 99;
+			return SEX_ACCOUNT;
 	}
 #else
 	if (sex == 'M' || sex == 'F') {
@@ -867,7 +867,7 @@ int char_mmo_gender(const struct char_session_data *sd, const struct mmo_charsta
 			// sd is not available, there isn't much we can do. Just return and print a warning.
 			ShowWarning("Character '%s' (CID: %d, AID: %d) has sex '%c', but PACKETVER does not support per-character sex. Defaulting to 'U'.\n",
 					p->name, p->char_id, p->account_id, sex);
-			return 99;
+			return SEX_ACCOUNT;
 		}
 		if ((sex == 'M' && sd->sex == SEX_FEMALE)
 		 || (sex == 'F' && sd->sex == SEX_MALE)) {
@@ -880,7 +880,7 @@ int char_mmo_gender(const struct char_session_data *sd, const struct mmo_charsta
 			Sql_ShowDebug(sql_handle);
 		}
 	}
-	return 99;
+	return SEX_ACCOUNT;
 #endif
 }
 

src/char/char_clif.c

@@ -836,7 +836,7 @@ int chclif_parse_charselect(int fd, struct char_session_data* sd,uint32 ipl){
 
 		//Have to switch over to the DB instance otherwise data won't propagate [Kevin]
 		cd = (struct mmo_charstatus *)idb_get(char_db_, char_id);
-		if (cd->sex == 99)
+		if (cd->sex == SEX_ACCOUNT)
 			cd->sex = sd->sex;
 
 		if (charserv_config.log_char) {

src/char/char_mapif.c

@@ -1039,7 +1039,7 @@ int chmapif_parse_reqauth(int fd, int id){
 		}
 		if( runflag == CHARSERVER_ST_RUNNING && autotrade && cd ){
 			uint16 mmo_charstatus_len = sizeof(struct mmo_charstatus) + 25;
-			if (cd->sex == 99)
+			if (cd->sex == SEX_ACCOUNT)
 				cd->sex = sex;
 
 			WFIFOHEAD(fd,mmo_charstatus_len);
@@ -1068,7 +1068,7 @@ int chmapif_parse_reqauth(int fd, int id){
 			)
 		{// auth ok
 			uint16 mmo_charstatus_len = sizeof(struct mmo_charstatus) + 25;
-			if (cd->sex == 99)
+			if (cd->sex == SEX_ACCOUNT)
 				cd->sex = sex;
 
 			WFIFOHEAD(fd,mmo_charstatus_len);

src/common/mmo.h

@@ -844,7 +844,8 @@ enum e_job {
 enum e_sex {
 	SEX_FEMALE = 0,
 	SEX_MALE,
-	SEX_SERVER
+	SEX_SERVER,
+	SEX_ACCOUNT = 99
 };
 
 /// Item Bound Type

src/map/script_constants.h

@@ -330,6 +330,10 @@
 
 	script_set_constant("EAJ_SUMMONER",MAPID_SUMMONER,false);
 
+	/* sex */
+	export_constant(SEX_FEMALE);
+	export_constant(SEX_MALE);
+
 	/* broadcasts */
 	export_constant(BC_ALL);
 	export_constant(BC_MAP);

src/map/vending.c

@@ -347,7 +347,7 @@ int8 vending_openvending(struct map_session_data* sd, const char* message, const
 
 	if( Sql_Query( mmysql_handle, "INSERT INTO `%s`(`id`, `account_id`, `char_id`, `sex`, `map`, `x`, `y`, `title`, `autotrade`, `body_direction`, `head_direction`, `sit`) "
 		"VALUES( %d, %d, %d, '%c', '%s', %d, %d, '%s', %d, '%d', '%d', '%d' );",
-		vendings_db, sd->vender_id, sd->status.account_id, sd->status.char_id, sd->status.sex == 0 ? 'F' : 'M', map[sd->bl.m].name, sd->bl.x, sd->bl.y, message_sql, sd->state.autotrade, at ? at->dir : sd->ud.dir, at ? at->head_dir : sd->head_dir, at ? at->sit : pc_issit(sd) ) != SQL_SUCCESS ) {
+		vendings_db, sd->vender_id, sd->status.account_id, sd->status.char_id, sd->status.sex == SEX_FEMALE ? 'F' : 'M', map[sd->bl.m].name, sd->bl.x, sd->bl.y, message_sql, sd->state.autotrade, at ? at->dir : sd->ud.dir, at ? at->head_dir : sd->head_dir, at ? at->sit : pc_issit(sd) ) != SQL_SUCCESS ) {
 		Sql_ShowDebug(mmysql_handle);
 	}