Follow-up to 857bdc4f98be6cd1e185a24565d6b6b54752b9b4

- Consolidated case in variables, labels, constants.

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

5 files changed, 20 insertions, 20 deletions

diff --git a/npc/jobs/2-1/priest.txt b/npc/jobs/2-1/priest.txt
index db88bc934..a06af96a1 100644
--- a/npc/jobs/2-1/priest.txt
+++ b/npc/jobs/2-1/priest.txt
@@ -1099,30 +1099,30 @@ OnEnable:
 	initnpctimer;
 	end;
 
-Onm1:
+OnM1:
 	set .MyMobs,13;
 	monster "job_prist",24,52,"Theft",1015,1,"Z_C#prst::OnMyMobDead";
 	monster "job_prist",18,52,"Want of Virtue",1015,1,"Z_C#prst::OnMyMobDead";
 	monster "job_prist",30,52,"Jealousy",1015,1,"Z_C#prst::OnMyMobDead";
 	end;
 
-Onm2:
+OnM2:
 	monster "job_prist",21,62,"Fury",1015,1,"Z_C#prst::OnMyMobDead";
 	monster "job_prist",27,62,"Envy",1015,1,"Z_C#prst::OnMyMobDead";
 	end;
 
-Onm3:
+OnM3:
 	monster "job_prist",24,72,"Arrogance",1015,1,"Z_C#prst::OnMyMobDead";
 	monster "job_prist",18,72,"Lewdness",1015,1,"Z_C#prst::OnMyMobDead";
 	monster "job_prist",30,72,"Sloth",1015,1,"Z_C#prst::OnMyMobDead";
 	end;
 
-Onm4:
+OnM4:
 	monster "job_prist",21,82,"Gluttony",1015,1,"Z_C#prst::OnMyMobDead";
 	monster "job_prist",27,82,"Greed",1015,1,"Z_C#prst::OnMyMobDead";
 	end;
 
-Onm5:
+OnM5:
 	monster "job_prist",24,92,"Despair",1015,1,"Z_C#prst::OnMyMobDead";
 	monster "job_prist",18,92,"Distrust",1015,1,"Z_C#prst::OnMyMobDead";
 	monster "job_prist",30,92,"Fear",1015,1,"Z_C#prst::OnMyMobDead";
@@ -1194,7 +1194,7 @@ OnInit:
 
 OnTouch:
 	if (BaseJob == Job_Acolyte) {
-		donpcevent "Zombie_Generator#prst::Onm1";
+		donpcevent "Zombie_Generator#prst::OnM1";
 		donpcevent "Zombie1_1::OnDisable";
 	}
 	end;
@@ -1215,7 +1215,7 @@ OnInit:
 
 OnTouch:
 	if (BaseJob == Job_Acolyte) {
-		donpcevent "Zombie_Generator#prst::Onm2";
+		donpcevent "Zombie_Generator#prst::OnM2";
 		donpcevent "Zombie2_1::OnDisable";
 	}
 	end;
@@ -1236,7 +1236,7 @@ OnInit:
 
 OnTouch:
 	if (BaseJob == Job_Acolyte) {
-		donpcevent "Zombie_Generator#prst::Onm3";
+		donpcevent "Zombie_Generator#prst::OnM3";
 		donpcevent "Zombie3_1::OnDisable";
 	}
 	end;
@@ -1257,7 +1257,7 @@ OnInit:
 
 OnTouch:
 	if (BaseJob == Job_Acolyte) {
-		donpcevent "Zombie_Generator#prst::Onm4";
+		donpcevent "Zombie_Generator#prst::OnM4";
 		donpcevent "Zombie4_1::OnDisable";
 	}
 	end;
@@ -1277,7 +1277,7 @@ OnInit:
 
 OnTouch:
 	if (BaseJob == Job_Acolyte) {
-		donpcevent "Zombie_Generator#prst::Onm5";
+		donpcevent "Zombie_Generator#prst::OnM5";
 		donpcevent "Zombie5_1::OnDisable";
 	}
 	end;
@@ -1618,17 +1618,17 @@ OnEnable:
 	donpcevent "Mummy3_1::OnEnable";
 	end;
 
-Onm1:
+OnM1:
 	monster "job_prist",90,55,"Khamoz",1041,1;
 	monster "job_prist",105,55,"Amocsis",1041,1;
 	end;
 
-Onm2:
+OnM2:
 	monster "job_prist",90,70,"Mentuhoteph",1041,1;
 	monster "job_prist",105,70,"Akenaten",1041,1;
 	end;
 
-Onm3:
+OnM3:
 	monster "job_prist",90,85,"Mehnes",1041,1;
 	monster "job_prist",105,85,"Snepheru",1041,1;
 	end;
@@ -1646,7 +1646,7 @@ OnInit:
 
 OnTouch:
 	if (BaseJob == Job_Acolyte) {
-		donpcevent "Mummy_Generator::Onm1";
+		donpcevent "Mummy_Generator::OnM1";
 		donpcevent "Mummy1_1::OnDisable";
 	}
 	end;
@@ -1667,7 +1667,7 @@ OnInit:
 
 OnTouch:
 	if (BaseJob == Job_Acolyte) {
-		donpcevent "Mummy_Generator::Onm2";
+		donpcevent "Mummy_Generator::OnM2";
 		donpcevent "Mummy2_1::OnDisable";
 	}
 	end;
@@ -1688,7 +1688,7 @@ OnInit:
 
 OnTouch:
 	if (BaseJob == Job_Acolyte) {
-		donpcevent "Mummy_Generator::Onm3";
+		donpcevent "Mummy_Generator::OnM3";
 		donpcevent "Mummy3_1::OnDisable";
 	}
 	end;
diff --git a/npc/jobs/2-1a/HighWizard.txt b/npc/jobs/2-1a/HighWizard.txt
index 12517e04c..ab5dc6424 100644
--- a/npc/jobs/2-1a/HighWizard.txt
+++ b/npc/jobs/2-1a/HighWizard.txt
@@ -60,7 +60,7 @@ valkyrie,44,47,5	script	High Wizard#Valkyrie	4_M_JOB_WIZARD,{
 			mes "all of your remaining Skill Points before returning to me.";
 			close;
 		}
-		jobchange Job_high_Wizard;
+		jobchange Job_High_Wizard;
 		set ADVJOB,0;
 		mes "[High Wizard]";
 		mes "Congratulations.";
diff --git a/npc/jobs/2-1a/WhiteSmith.txt b/npc/jobs/2-1a/WhiteSmith.txt
index d917d3988..590f68143 100644
--- a/npc/jobs/2-1a/WhiteSmith.txt
+++ b/npc/jobs/2-1a/WhiteSmith.txt
@@ -38,7 +38,7 @@ valkyrie,44,50,5	script	MasterSmith#Valkyrie	4_M_JOB_BLACKSMITH,{
 		mes "crafting...";
 		close;
 	}
-	else if (ADVJOB == Job_WhiteSmith && Class == Job_Merchant_High && JobLevel > 39) {
+	else if (ADVJOB == Job_Whitesmith && Class == Job_Merchant_High && JobLevel > 39) {
 		mes "[MasterSmith]";
 		mes "The time has come!";
 		mes "Our world needs brave,";
diff --git a/npc/jobs/2-2/crusader.txt b/npc/jobs/2-2/crusader.txt
index 98cb7841c..e7d938a4a 100644
--- a/npc/jobs/2-2/crusader.txt
+++ b/npc/jobs/2-2/crusader.txt
@@ -296,7 +296,7 @@ prt_castle,45,169,5	script	Senior Crusader	4_M_CRU_OLD,{
 		if (Sex) mes "...Brother.";
 		else mes "...Comrade.";
 		next;
-		if(.@JobLevel != 50) getitem 504, 6;
+		if(.@Joblevel != 50) getitem 504, 6;
 		else getitem 504, 12;
 		mes "[Michael Halig]";
 		mes "And use this in times of dire peril. It will give you strength when your wounds are most grievous.";
diff --git a/npc/jobs/valkyrie.txt b/npc/jobs/valkyrie.txt
index e105c2e4b..42c27551c 100644
--- a/npc/jobs/valkyrie.txt
+++ b/npc/jobs/valkyrie.txt
@@ -385,7 +385,7 @@ valkyrie,44,33,5	script	Teleporter	4_F_TELEPORTER,{
 		case 9: callsub S_Warpchar,"yuno",328,101;
 		}
 	}
-S_WarpChar:
+S_Warpchar:
 	mes "[Teleporter]";
 	mes "Have a nice trip.";
 	close2;