Follow-up to 857bdc4f98be6cd1e185a24565d6b6b54752b9b4

- Consolidated case in variables, labels, constants.

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

7 files changed, 19 insertions, 19 deletions

diff --git a/npc/other/arena/arena_room.txt b/npc/other/arena/arena_room.txt
index 163f531eb..3c4504d39 100644
--- a/npc/other/arena/arena_room.txt
+++ b/npc/other/arena/arena_room.txt
@@ -384,7 +384,7 @@ arena_room,158,82,1	script	Helper Lonik	4_M_ROGUE,{
 		mes "[Lonik]";
 		mes "You'd better wait a little bit longer!";
 	} else {
-		emotion e_x,0;
+		emotion e_X,0;
 		mes "No!";
 		mes "Go for it, good luck!";
 	}
diff --git a/npc/other/books.txt b/npc/other/books.txt
index 2b6df3654..6f83ace1b 100644
--- a/npc/other/books.txt
+++ b/npc/other/books.txt
@@ -23,7 +23,7 @@ prt_in,168,56,4	script	Monster Encyclopedia#prt	HIDDEN_NPC,{
 		set .@loop2,1;
 		switch(select("Water Property Monsters:Wind Property Monsters:Spritual Property Monsters:Cancel")) {
 		case 1:
-			while(.@Loop2) {
+			while(.@loop2) {
 				switch(select("Small Sized Monsters:Medium Sized Monsters:Great Sized Monsters:Cancel")) {
 				case 1:
 					mes "^FF0000[Vol. 1: Small Water Monsters]^000000";
diff --git a/npc/other/fortune.txt b/npc/other/fortune.txt
index 8b865577c..b0274f620 100644
--- a/npc/other/fortune.txt
+++ b/npc/other/fortune.txt
@@ -37,7 +37,7 @@ payon_in03,117,128,5	script	Fortune Teller	4_M_BIBI,{
 				mes "You have angered the monster spirits!";
 				close;
 			}
-			else if (.@input > zeny) {
+			else if (.@input > Zeny) {
 				mes "[Lhimetorra]";
 				mes "There's no need to overdo it. Just give with all your heart... *Tsk tsk*";
 				close;
diff --git a/npc/other/guildpvp.txt b/npc/other/guildpvp.txt
index 33ba49e47..debb96de9 100644
--- a/npc/other/guildpvp.txt
+++ b/npc/other/guildpvp.txt
@@ -14,9 +14,9 @@
 
 pvp_y_room,77,85,4	script	Guild Battle Guide	8W_SOLDIER,{
 
-	setarray .@map1X[1],7,9,16,8,20;
-	setarray .@map2X[1],91,90,83,91,79;
-	setarray .@mapY[1],49,49,50,49,50;
+	setarray .@map1x[1],7,9,16,8,20;
+	setarray .@map2x[1],91,90,83,91,79;
+	setarray .@mapy[1],49,49,50,49,50;
 
 	mes "[Guild Battle Guide]";
 	mes "How are you doing?";
@@ -49,6 +49,6 @@ pvp_y_room,77,85,4	script	Guild Battle Guide	8W_SOLDIER,{
 	mes "[Guild Battle Guide]";
 	mes "Great! Have a good time~";
 	close2;
-	warp "guild_vs"+.@i,getd(".@map"+.@j+"X["+.@i+"]"),.@mapY[.@i];
+	warp "guild_vs"+.@i,getd(".@map"+.@j+"x["+.@i+"]"),.@mapy[.@i];
 	end;
 }
diff --git a/npc/other/marriage.txt b/npc/other/marriage.txt
index c8ffb0a5d..0cfc8c8a6 100644
--- a/npc/other/marriage.txt
+++ b/npc/other/marriage.txt
@@ -681,11 +681,11 @@ prt_church,100,128,4	script	Bishop#w	1_M_PASTOR,{
 										//Call Wedding effect
 										wedding;
 										//Give ring to Bride, and change to wedding sprite.
-										sc_start SC_Wedding,3600000,1;
+										sc_start SC_WEDDING,3600000,1;
 										getitem 2635,1; //Bride_Ring
 										//Give ring to Groom, and change to wedding sprite.
 										attachrid(getcharid(3,$@wed_groom$));
-										sc_start SC_Wedding,3600000,1;
+										sc_start SC_WEDDING,3600000,1;
 										getitem 2634,1; //Bridegroom_Ring
 										detachrid;
 										//Switch Script progression back to Bride
diff --git a/npc/other/poring_war.txt b/npc/other/poring_war.txt
index 58db2edcf..507efe85d 100644
--- a/npc/other/poring_war.txt
+++ b/npc/other/poring_war.txt
@@ -1171,7 +1171,7 @@ OnMyMobDead:
 
 OnTimer120000:
 	set $@wop_deadcount_d,$@wop_deadcount_d - 1;
-	donpcevent "#wop_devillium1::OndevilingSpawn";
+	donpcevent "#wop_devillium1::OnDevilingSpawn";
 	mapannounce "poring_w02","Mr. Doppel: The Deviling on the 1st base has been revived! 1 point gained!!",0,0x00ff00;
 	stopnpctimer;
 	end;
@@ -1185,7 +1185,7 @@ OnReset:
 	stopnpctimer;
 	end;
 
-OndevilingSpawn:
+OnDevilingSpawn:
 	monster "poring_w02",98,124,"Deviling",1767,1,"#wop_devillium2::OnMyMobDead";
 	end;
 
@@ -1206,7 +1206,7 @@ OnMyMobDead:
 
 OnTimer120000:
 	set $@wop_deadcount_d,$@wop_deadcount_d - 1;
-	donpcevent "#wop_devillium2::OndevilingSpawn";
+	donpcevent "#wop_devillium2::OnDevilingSpawn";
 	mapannounce "poring_w02","Mr. Doppel: The deviling on the 2nd base has been revived! 1 point gained!!",0,0x00ff00;
 	stopnpctimer;
 }
diff --git a/npc/other/pvp.txt b/npc/other/pvp.txt
index 22e5698a6..bf98fb55a 100644
--- a/npc/other/pvp.txt
+++ b/npc/other/pvp.txt
@@ -292,25 +292,25 @@ function	script	F_PVP_FSRS	{
 	}
 	if (strnpcinfo(4) == "pvp_y_room") {
 		set .@base$, "pvp_y_"+strnpcinfo(2);
-		setarray .@Maps$[0],	.@base$+"-1",	.@base$+"-2",	.@base$+"-3",	.@base$+"-4",	.@base$+"-5";
-		setarray .@Name$[0],	"Prontera",		"Izlude",		"Payon",		"Alberta",		"Morroc";
+		setarray .@maps$[0],	.@base$+"-1",	.@base$+"-2",	.@base$+"-3",	.@base$+"-4",	.@base$+"-5";
+		setarray .@name$[0],	"Prontera",		"Izlude",		"Payon",		"Alberta",		"Morroc";
 		setarray .@Limit[0],	128,			128,			128,			128,			128;
 	} else {
-		setarray .@Maps$[0],	"pvp_n_8-1",	"pvp_n_8-2",	"pvp_n_8-3",	"pvp_n_8-4",	"pvp_n_8-5";
-		setarray .@Name$[0],	"Sandwich",		"Lock on",		"Four Room",	"Under cross",	"Compass Room";
+		setarray .@maps$[0],	"pvp_n_8-1",	"pvp_n_8-2",	"pvp_n_8-3",	"pvp_n_8-4",	"pvp_n_8-5";
+		setarray .@name$[0],	"Sandwich",		"Lock on",		"Four Room",	"Under cross",	"Compass Room";
 		setarray .@Limit[0],	64,				32,				32,				32,				32;
 	}
 	for(set .@i,0; .@i<5; set .@i,.@i+1)
-		set .@menu$, .@menu$+.@Name$[.@i]+" ["+getmapusers(.@Maps$[.@i])+" / "+.@Limit[.@i]+"]:";
+		set .@menu$, .@menu$+.@name$[.@i]+" ["+getmapusers(.@maps$[.@i])+" / "+.@Limit[.@i]+"]:";
 	set .@menu$, .@menu$+"Cancel.";
 	set .@i, select(.@menu$)-1;
 	if (.@i == 5) close;
-	if (getmapusers(.@Maps$[.@i]) >= .@Limit[.@i]) {
+	if (getmapusers(.@maps$[.@i]) >= .@Limit[.@i]) {
 		mes "[PVP Fight Square Reception Staff]";
 		mes "This map is currently full.";
 		close;
 	}
-	warp .@Maps$[.@i],0,0;
+	warp .@maps$[.@i],0,0;
 	end;
 }