* Continues replacing of specialeffect/2 numerics with constants.

- A lot of files still remain, but they don't have the proper effect names in commented in beside the ID. ;P
	

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13238 54d463be-8e91-2dee-dedb-b68131a5f0ec

10 files changed, 302 insertions, 290 deletions

diff --git a/npc/guild2/arug_cas01.txt b/npc/guild2/arug_cas01.txt
index cbdea7eb2..94f9b4461 100644
--- a/npc/guild2/arug_cas01.txt
+++ b/npc/guild2/arug_cas01.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.6
+//= 1.7
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -19,6 +19,7 @@
 //=     Treasure will now be killed before spawning.
 //= 1.5 Fixed error with control devices. [L0ne_W0lf]
 //= 1.6 Implemented new Wall System. [Zephyrus]
+//= 1.7 Replaced effect numerics with constants. [L0ne_W0lf]
 //============================================================
 
 arug_cas01,1,1,0	script	Manager#aru01_02	111,{
@@ -692,7 +693,7 @@ arug_cas01,211,234,0	script	1st Guardian Stone#aru01	844,{
 					else {
 						switch(rand(1,3)) {
 						case 1:
-							specialeffect 54; //"1st Guardian Stone#aru01" EF_BEGINSPELL2
+							specialeffect EF_BEGINSPELL2;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -715,13 +716,13 @@ arug_cas01,211,234,0	script	1st Guardian Stone#aru01	844,{
 								mes "^3355FFYou placed the Blue Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"1st Guardian Stone#aru01" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							}
 							break;
 						case 2:
-							specialeffect 225; //"1st Guardian Stone#aru01" EF_VOLCANO
+							specialeffect EF_VOLCANO;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -732,7 +733,7 @@ arug_cas01,211,234,0	script	1st Guardian Stone#aru01	844,{
 								mes "^3355FFYou placed the Red Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"1st Guardian Stone#aru01" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							case 2:
@@ -750,7 +751,7 @@ arug_cas01,211,234,0	script	1st Guardian Stone#aru01	844,{
 							}
 							break;
 						case 3:
-							specialeffect 56; //"1st Guardian Stone#aru01" EF_BEGINSPELL4
+							specialeffect EF_BEGINSPELL4;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -767,7 +768,7 @@ arug_cas01,211,234,0	script	1st Guardian Stone#aru01	844,{
 								mes "^3355FFYou placed the Yellow Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"1st Guardian Stone#aru01" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							case 3:
@@ -807,7 +808,7 @@ arug_cas01,211,234,0	script	1st Guardian Stone#aru01	844,{
 							delitem 716,5; //Red_Gemstone
 							close2;
 							donpcevent "#aru01_df01::OnEnable";
-							specialeffect 135; //"1st Guardian Stone#aru01" EF_ICECRASH
+							specialeffect EF_ICECRASH;
 							disablenpc "1st Guardian Stone#aru01";
 							setarray $agit_ar01[0],0;
 							set .@df_all,$agit_ar01[0]+$agit_ar01[1];
@@ -853,7 +854,7 @@ OnInit:
 
 OnEnable:
 	enablenpc "1st Guardian Stone#aru01";
-	specialeffect 247; //"1st Guardian Stone#aru01" EF_MAPPILLAR2
+	specialeffect EF_MAPPILLAR2;
 	end;
 
 OnDisable:
@@ -1001,7 +1002,7 @@ arug_cas01,308,189,0	script	2nd Guardian Stone#aru01	844,{
 					else {
 						switch(rand(1,3)) {
 						case 1:
-							specialeffect 54; //"2nd Guardian Stone#aru01" EF_BEGINSPELL2
+							specialeffect EF_BEGINSPELL2;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -1024,13 +1025,13 @@ arug_cas01,308,189,0	script	2nd Guardian Stone#aru01	844,{
 								mes "^3355FFYou placed the Blue Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"2nd Guardian Stone#aru01" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							}
 							break;
 						case 2:
-							specialeffect 225; //"2nd Guardian Stone#aru01" EF_VOLCANO
+							specialeffect EF_VOLCANO;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -1041,7 +1042,7 @@ arug_cas01,308,189,0	script	2nd Guardian Stone#aru01	844,{
 								mes "^3355FFYou placed the Red Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"2nd Guardian Stone#aru01" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							case 2:
@@ -1059,7 +1060,7 @@ arug_cas01,308,189,0	script	2nd Guardian Stone#aru01	844,{
 							}
 							break;
 						case 3:
-							specialeffect 56; //"2nd Guardian Stone#aru01" EF_BEGINSPELL4
+							specialeffect EF_BEGINSPELL4;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -1076,7 +1077,7 @@ arug_cas01,308,189,0	script	2nd Guardian Stone#aru01	844,{
 								mes "^3355FFYou placed the Yellow Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"2nd Guardian Stone#aru01" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							case 3:
@@ -1116,7 +1117,7 @@ arug_cas01,308,189,0	script	2nd Guardian Stone#aru01	844,{
 							delitem 716,5; //Red_Gemstone
 							close2;
 							donpcevent "#aru01_df02::OnEnable";
-							specialeffect 135; //"2nd Guardian Stone#aru01" EF_ICECRASH
+							specialeffect EF_ICECRASH;
 							disablenpc "2nd Guardian Stone#aru01";
 							setarray $agit_ar01[1],0;
 							set .@df_all,$agit_ar01[0]+$agit_ar01[1];
@@ -1162,7 +1163,7 @@ OnInit:
 
 OnEnable:
 	enablenpc "2nd Guardian Stone#aru01";
-	specialeffect 247; //"2nd Guardian Stone#aru01" EF_MAPPILLAR2
+	specialeffect EF_MAPPILLAR2;
 	end;
 
 OnDisable:
@@ -1310,7 +1311,7 @@ arug_cas01,247,52,0	script	Control Device01#aru01	111,{
 									mes "reinforced with wood.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 2:
@@ -1361,7 +1362,7 @@ arug_cas01,247,52,0	script	Control Device01#aru01	111,{
 									mes "like this will work.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								}
@@ -1385,7 +1386,7 @@ arug_cas01,247,52,0	script	Control Device01#aru01	111,{
 									mes "is starting to look more solid.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 3:
@@ -1426,7 +1427,7 @@ arug_cas01,247,52,0	script	Control Device01#aru01	111,{
 									mes "much of the gate's damage.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 4:
@@ -1545,7 +1546,7 @@ arug_cas01,118,131,0	script	Control Device02#aru01	111,{
 									mes "reinforced with wood.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 2:
@@ -1598,7 +1599,7 @@ arug_cas01,118,131,0	script	Control Device02#aru01	111,{
 									mes "like this will work.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								}
@@ -1622,7 +1623,7 @@ arug_cas01,118,131,0	script	Control Device02#aru01	111,{
 									mes "is starting to look more solid.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 3:
@@ -1663,7 +1664,7 @@ arug_cas01,118,131,0	script	Control Device02#aru01	111,{
 									mes "much of the gate's damage.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 4:
@@ -1784,7 +1785,7 @@ arug_cas01,82,172,0	script	Control Device03#aru01	111,{
 									mes "reinforced with wood.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 2:
@@ -1837,7 +1838,7 @@ arug_cas01,82,172,0	script	Control Device03#aru01	111,{
 									mes "like this will work.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								}
@@ -1861,7 +1862,7 @@ arug_cas01,82,172,0	script	Control Device03#aru01	111,{
 									mes "is starting to look more solid.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 3:
@@ -1902,7 +1903,7 @@ arug_cas01,82,172,0	script	Control Device03#aru01	111,{
 									mes "much of the gate's damage.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 4:
diff --git a/npc/guild2/arug_cas02.txt b/npc/guild2/arug_cas02.txt
index d200f57ae..4cc3bea60 100644
--- a/npc/guild2/arug_cas02.txt
+++ b/npc/guild2/arug_cas02.txt
@@ -22,6 +22,7 @@
 //= 1.7 Another two fixes [Yommy]
 //= 1.8 Corrected copy/paste error. [L0ne_W0lf]
 //= 1.9 Implemented new Wall System. [Zephyrus]
+//= 2.0 Replaced effect numerics with constants. [L0ne_W0lf]
 //============================================================
 
 arug_cas02,1,1,0	script	Manager#aru02_02	111,{
@@ -695,7 +696,7 @@ arug_cas02,33,168,0	script	1st Guardian Stone#aru02	844,{
 					else {
 						switch(rand(1,3)) {
 						case 1:
-							specialeffect 54; //"1st Guardian Stone#aru02" EF_BEGINSPELL2
+							specialeffect EF_BEGINSPELL2;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -718,13 +719,13 @@ arug_cas02,33,168,0	script	1st Guardian Stone#aru02	844,{
 								mes "^3355FFYou placed the Blue Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"1st Guardian Stone#aru02" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							}
 							break;
 						case 2:
-							specialeffect 225; //"1st Guardian Stone#aru02" EF_VOLCANO
+							specialeffect EF_VOLCANO;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -735,7 +736,7 @@ arug_cas02,33,168,0	script	1st Guardian Stone#aru02	844,{
 								mes "^3355FFYou placed the Red Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"1st Guardian Stone#aru02" EF_STEAL
+								specialeffect EF_STEAL; 
 								next;
 								break;
 							case 2:
@@ -753,7 +754,7 @@ arug_cas02,33,168,0	script	1st Guardian Stone#aru02	844,{
 							}
 							break;
 						case 3:
-							specialeffect 56; //"1st Guardian Stone#aru02" EF_BEGINSPELL4
+							specialeffect EF_BEGINSPELL4;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -770,7 +771,7 @@ arug_cas02,33,168,0	script	1st Guardian Stone#aru02	844,{
 								mes "^3355FFYou placed the Yellow Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"1st Guardian Stone#aru02" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							case 3:
@@ -810,7 +811,7 @@ arug_cas02,33,168,0	script	1st Guardian Stone#aru02	844,{
 							delitem 716,5; //Red_Gemstone
 							close2;
 							donpcevent "#aru02_df01::OnEnable";
-							specialeffect 135; //"1st Guardian Stone#aru02" EF_ICECRASH
+							specialeffect EF_ICECRASH;
 							disablenpc "1st Guardian Stone#aru02";
 							setarray $agit_ar02[0],0;
 							set .@df_all,$agit_ar02[0]+$agit_ar02[1];
@@ -856,7 +857,7 @@ OnInit:
 
 OnEnable:
 	enablenpc "1st Guardian Stone#aru02";
-	specialeffect 247; //"1st Guardian Stone#aru02" EF_MAPPILLAR2
+	specialeffect EF_MAPPILLAR2;
 	end;
 
 OnDisable:
@@ -1004,7 +1005,7 @@ arug_cas02,245,168,0	script	2nd Guardian Stone#aru02	844,{
 					else {
 						switch(rand(1,3)) {
 						case 1:
-							specialeffect 54; //"2nd Guardian Stone#aru02" EF_BEGINSPELL2
+							specialeffect EF_BEGINSPELL2;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -1027,13 +1028,13 @@ arug_cas02,245,168,0	script	2nd Guardian Stone#aru02	844,{
 								mes "^3355FFYou placed the Blue Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"2nd Guardian Stone#aru02" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							}
 							break;
 						case 2:
-							specialeffect 225; //"2nd Guardian Stone#aru02" EF_VOLCANO
+							specialeffect EF_VOLCANO;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -1044,7 +1045,7 @@ arug_cas02,245,168,0	script	2nd Guardian Stone#aru02	844,{
 								mes "^3355FFYou placed the Red Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"2nd Guardian Stone#aru02" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							case 2:
@@ -1062,7 +1063,7 @@ arug_cas02,245,168,0	script	2nd Guardian Stone#aru02	844,{
 							}
 							break;
 						case 3:
-							specialeffect 56; //"2nd Guardian Stone#aru02" EF_BEGINSPELL4
+							specialeffect EF_BEGINSPELL4;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -1079,7 +1080,7 @@ arug_cas02,245,168,0	script	2nd Guardian Stone#aru02	844,{
 								mes "^3355FFYou placed the Yellow Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"2nd Guardian Stone#aru02" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							case 3:
@@ -1119,7 +1120,7 @@ arug_cas02,245,168,0	script	2nd Guardian Stone#aru02	844,{
 							delitem 716,5; //Red_Gemstone
 							close2;
 							donpcevent "#aru02_df02::OnEnable";
-							specialeffect 135; //"2nd Guardian Stone#aru02" EF_ICECRASH
+							specialeffect EF_ICECRASH;
 							disablenpc "2nd Guardian Stone#aru02";
 							setarray $agit_ar02[1],0;
 							set .@df_all,$agit_ar02[0]+$agit_ar02[1];
@@ -1165,7 +1166,7 @@ OnInit:
 
 OnEnable:
 	enablenpc "2nd Guardian Stone#aru02";
-	specialeffect 247; //"2nd Guardian Stone#aru02" EF_MAPPILLAR2
+	specialeffect EF_MAPPILLAR2;
 	end;
 
 OnDisable:
@@ -1313,7 +1314,7 @@ arug_cas02,143,228,0	script	Control Device01#aru02	111,{
 									mes "reinforced with wood.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 2:
@@ -1366,7 +1367,7 @@ arug_cas02,143,228,0	script	Control Device01#aru02	111,{
 									mes "like this will work.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								}
@@ -1390,7 +1391,7 @@ arug_cas02,143,228,0	script	Control Device01#aru02	111,{
 									mes "is starting to look more solid.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 3:
@@ -1431,7 +1432,7 @@ arug_cas02,143,228,0	script	Control Device01#aru02	111,{
 									mes "much of the gate's damage.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 4:
@@ -1550,7 +1551,7 @@ arug_cas02,118,356,0	script	Control Device02#aru02	111,{
 									mes "reinforced with wood.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 2:
@@ -1603,7 +1604,7 @@ arug_cas02,118,356,0	script	Control Device02#aru02	111,{
 									mes "like this will work.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								}
@@ -1627,7 +1628,7 @@ arug_cas02,118,356,0	script	Control Device02#aru02	111,{
 									mes "is starting to look more solid.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 3:
@@ -1668,7 +1669,7 @@ arug_cas02,118,356,0	script	Control Device02#aru02	111,{
 									mes "much of the gate's damage.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 4:
@@ -1789,7 +1790,7 @@ arug_cas02,56,308,0	script	Control Device03#aru02	111,{
 									mes "reinforced with wood.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 2:
@@ -1842,7 +1843,7 @@ arug_cas02,56,308,0	script	Control Device03#aru02	111,{
 									mes "like this will work.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								}
@@ -1866,7 +1867,7 @@ arug_cas02,56,308,0	script	Control Device03#aru02	111,{
 									mes "is starting to look more solid.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 3:
@@ -1907,7 +1908,7 @@ arug_cas02,56,308,0	script	Control Device03#aru02	111,{
 									mes "much of the gate's damage.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 4:
diff --git a/npc/guild2/arug_cas03.txt b/npc/guild2/arug_cas03.txt
index fc23941b8..2d7b4c7fb 100644
--- a/npc/guild2/arug_cas03.txt
+++ b/npc/guild2/arug_cas03.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.7
+//= 1.8
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -21,6 +21,7 @@
 //= 1.5 Fixed error with control devices. [L0ne_W0lf]
 //= 1.6 Corrected copy/paste error. [L0ne_W0lf]
 //= 1.7 Implemented new Wall System. [Zephyrus]
+//= 1.8 Replaced effect numerics with constants. [L0ne_W0lf]
 //============================================================
 
 arug_cas03,1,1,0	script	Manager#aru03_02	111,{
@@ -694,7 +695,7 @@ arug_cas03,65,171,0	script	1st Guardian Stone#aru03	844,{
 					else {
 						switch(rand(1,3)) {
 						case 1:
-							specialeffect 54; //"1st Guardian Stone#aru03" EF_BEGINSPELL2
+							specialeffect EF_BEGINSPELL2;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -717,13 +718,13 @@ arug_cas03,65,171,0	script	1st Guardian Stone#aru03	844,{
 								mes "^3355FFYou placed the Blue Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"1st Guardian Stone#aru03" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							}
 							break;
 						case 2:
-							specialeffect 225; //"1st Guardian Stone#aru03" EF_VOLCANO
+							specialeffect EF_VOLCANO;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -734,7 +735,7 @@ arug_cas03,65,171,0	script	1st Guardian Stone#aru03	844,{
 								mes "^3355FFYou placed the Red Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"1st Guardian Stone#aru03" EF_STEAL
+								specialeffect EF_STEAL; 
 								next;
 								break;
 							case 2:
@@ -752,7 +753,7 @@ arug_cas03,65,171,0	script	1st Guardian Stone#aru03	844,{
 							}
 							break;
 						case 3:
-							specialeffect 56; //"1st Guardian Stone#aru03" EF_BEGINSPELL4
+							specialeffect EF_BEGINSPELL4;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -769,7 +770,7 @@ arug_cas03,65,171,0	script	1st Guardian Stone#aru03	844,{
 								mes "^3355FFYou placed the Yellow Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"1st Guardian Stone#aru03" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							case 3:
@@ -809,7 +810,7 @@ arug_cas03,65,171,0	script	1st Guardian Stone#aru03	844,{
 							delitem 716,5; //Red_Gemstone
 							close2;
 							donpcevent "#aru03_df01::OnEnable";
-							specialeffect 135; //"1st Guardian Stone#aru03" EF_ICECRASH
+							specialeffect EF_ICECRASH;
 							disablenpc "1st Guardian Stone#aru03";
 							setarray $agit_ar03[0],0;
 							set .@df_all,$agit_ar03[0]+$agit_ar03[1];
@@ -855,7 +856,7 @@ OnInit:
 
 OnEnable:
 	enablenpc "1st Guardian Stone#aru03";
-	specialeffect 247; //"1st Guardian Stone#aru03" EF_MAPPILLAR2
+	specialeffect EF_MAPPILLAR2;
 	end;
 
 OnDisable:
@@ -1003,7 +1004,7 @@ arug_cas03,212,149,0	script	2nd Guardian Stone#aru03	844,{
 					else {
 						switch(rand(1,3)) {
 						case 1:
-							specialeffect 54; //"2nd Guardian Stone#aru03" EF_BEGINSPELL2
+							specialeffect EF_BEGINSPELL2;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -1026,13 +1027,13 @@ arug_cas03,212,149,0	script	2nd Guardian Stone#aru03	844,{
 								mes "^3355FFYou placed the Blue Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"2nd Guardian Stone#aru03" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							}
 							break;
 						case 2:
-							specialeffect 225; //"2nd Guardian Stone#aru03" EF_VOLCANO
+							specialeffect EF_VOLCANO;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -1043,7 +1044,7 @@ arug_cas03,212,149,0	script	2nd Guardian Stone#aru03	844,{
 								mes "^3355FFYou placed the Red Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"2nd Guardian Stone#aru03" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							case 2:
@@ -1061,7 +1062,7 @@ arug_cas03,212,149,0	script	2nd Guardian Stone#aru03	844,{
 							}
 							break;
 						case 3:
-							specialeffect 56; //"2nd Guardian Stone#aru03" EF_BEGINSPELL4
+							specialeffect EF_BEGINSPELL4;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -1078,7 +1079,7 @@ arug_cas03,212,149,0	script	2nd Guardian Stone#aru03	844,{
 								mes "^3355FFYou placed the Yellow Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"2nd Guardian Stone#aru03" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							case 3:
@@ -1118,7 +1119,7 @@ arug_cas03,212,149,0	script	2nd Guardian Stone#aru03	844,{
 							delitem 716,5; //Red_Gemstone
 							close2;
 							donpcevent "#aru03_df02::OnEnable";
-							specialeffect 135; //"2nd Guardian Stone#aru03" EF_ICECRASH
+							specialeffect EF_ICECRASH;
 							disablenpc "2nd Guardian Stone#aru03";
 							setarray $agit_ar03[1],0;
 							set .@df_all,$agit_ar03[0]+$agit_ar03[1];
@@ -1164,7 +1165,7 @@ OnInit:
 
 OnEnable:
 	enablenpc "2nd Guardian Stone#aru03";
-	specialeffect 247; //"2nd Guardian Stone#aru03" EF_MAPPILLAR2
+	specialeffect EF_MAPPILLAR2;
 	end;
 
 OnDisable:
@@ -1312,7 +1313,7 @@ arug_cas03,136,158,0	script	Control Device01#aru03	111,{
 									mes "reinforced with wood.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 2:
@@ -1365,7 +1366,7 @@ arug_cas03,136,158,0	script	Control Device01#aru03	111,{
 									mes "like this will work.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								}
@@ -1389,7 +1390,7 @@ arug_cas03,136,158,0	script	Control Device01#aru03	111,{
 									mes "is starting to look more solid.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 3:
@@ -1430,7 +1431,7 @@ arug_cas03,136,158,0	script	Control Device01#aru03	111,{
 									mes "much of the gate's damage.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 4:
@@ -1549,7 +1550,7 @@ arug_cas03,135,212,0	script	Control Device02#aru03	111,{
 									mes "reinforced with wood.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 2:
@@ -1602,7 +1603,7 @@ arug_cas03,135,212,0	script	Control Device02#aru03	111,{
 									mes "like this will work.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								}
@@ -1626,7 +1627,7 @@ arug_cas03,135,212,0	script	Control Device02#aru03	111,{
 									mes "is starting to look more solid.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 3:
@@ -1667,7 +1668,7 @@ arug_cas03,135,212,0	script	Control Device02#aru03	111,{
 									mes "much of the gate's damage.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 4:
@@ -1788,7 +1789,7 @@ arug_cas03,134,266,0	script	Control Device03#aru03	111,{
 									mes "reinforced with wood.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 2:
@@ -1841,7 +1842,7 @@ arug_cas03,134,266,0	script	Control Device03#aru03	111,{
 									mes "like this will work.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								}
@@ -1865,7 +1866,7 @@ arug_cas03,134,266,0	script	Control Device03#aru03	111,{
 									mes "is starting to look more solid.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 3:
@@ -1906,7 +1907,7 @@ arug_cas03,134,266,0	script	Control Device03#aru03	111,{
 									mes "much of the gate's damage.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 4:
diff --git a/npc/guild2/arug_cas04.txt b/npc/guild2/arug_cas04.txt
index c2c45f6a5..1ccda2634 100644
--- a/npc/guild2/arug_cas04.txt
+++ b/npc/guild2/arug_cas04.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.6
+//= 1.7
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -19,6 +19,7 @@
 //=     Treasure will now be killed before spawning.
 //= 1.5 Fixed error with control devices. [L0ne_W0lf]
 //= 1.6 Corrected copy/paste error. [L0ne_W0lf]
+//= 1.7 Replaced effect numerics with constants. [L0ne_W0lf]
 //============================================================
 
 arug_cas04,1,1,0	script	Manager#aru04_02	111,{
@@ -692,7 +693,7 @@ arug_cas04,65,171,0	script	1st Guardian Stone#aru04	844,{
 					else {
 						switch(rand(1,3)) {
 						case 1:
-							specialeffect 54; //"1st Guardian Stone#aru04" EF_BEGINSPELL2
+							specialeffect EF_BEGINSPELL2;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -715,13 +716,13 @@ arug_cas04,65,171,0	script	1st Guardian Stone#aru04	844,{
 								mes "^3355FFYou placed the Blue Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"1st Guardian Stone#aru04" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							}
 							break;
 						case 2:
-							specialeffect 225; //"1st Guardian Stone#aru04" EF_VOLCANO
+							specialeffect EF_VOLCANO;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -732,7 +733,7 @@ arug_cas04,65,171,0	script	1st Guardian Stone#aru04	844,{
 								mes "^3355FFYou placed the Red Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"1st Guardian Stone#aru04" EF_STEAL
+								specialeffect EF_STEAL; 
 								next;
 								break;
 							case 2:
@@ -750,7 +751,7 @@ arug_cas04,65,171,0	script	1st Guardian Stone#aru04	844,{
 							}
 							break;
 						case 3:
-							specialeffect 56; //"1st Guardian Stone#aru04" EF_BEGINSPELL4
+							specialeffect EF_BEGINSPELL4;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -767,7 +768,7 @@ arug_cas04,65,171,0	script	1st Guardian Stone#aru04	844,{
 								mes "^3355FFYou placed the Yellow Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"1st Guardian Stone#aru04" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							case 3:
@@ -807,7 +808,7 @@ arug_cas04,65,171,0	script	1st Guardian Stone#aru04	844,{
 							delitem 716,5; //Red_Gemstone
 							close2;
 							donpcevent "#aru04_df01::OnEnable";
-							specialeffect 135; //"1st Guardian Stone#aru04" EF_ICECRASH
+							specialeffect EF_ICECRASH;
 							disablenpc "1st Guardian Stone#aru04";
 							setarray $agit_ar04[0],0;
 							set .@df_all,$agit_ar04[0]+$agit_ar04[1];
@@ -853,7 +854,7 @@ OnInit:
 
 OnEnable:
 	enablenpc "1st Guardian Stone#aru04";
-	specialeffect 247; //"1st Guardian Stone#aru04" EF_MAPPILLAR2
+	specialeffect EF_MAPPILLAR2;
 	end;
 
 OnDisable:
@@ -1001,7 +1002,7 @@ arug_cas04,212,149,0	script	2nd Guardian Stone#aru04	844,{
 					else {
 						switch(rand(1,3)) {
 						case 1:
-							specialeffect 54; //"2nd Guardian Stone#aru04" EF_BEGINSPELL2
+							specialeffect EF_BEGINSPELL2;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -1024,13 +1025,13 @@ arug_cas04,212,149,0	script	2nd Guardian Stone#aru04	844,{
 								mes "^3355FFYou placed the Blue Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"2nd Guardian Stone#aru04" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							}
 							break;
 						case 2:
-							specialeffect 225; //"2nd Guardian Stone#aru04" EF_VOLCANO
+							specialeffect EF_VOLCANO;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -1041,7 +1042,7 @@ arug_cas04,212,149,0	script	2nd Guardian Stone#aru04	844,{
 								mes "^3355FFYou placed the Red Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"2nd Guardian Stone#aru04" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							case 2:
@@ -1059,7 +1060,7 @@ arug_cas04,212,149,0	script	2nd Guardian Stone#aru04	844,{
 							}
 							break;
 						case 3:
-							specialeffect 56; //"2nd Guardian Stone#aru04" EF_BEGINSPELL4
+							specialeffect EF_BEGINSPELL4;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -1076,7 +1077,7 @@ arug_cas04,212,149,0	script	2nd Guardian Stone#aru04	844,{
 								mes "^3355FFYou placed the Yellow Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"2nd Guardian Stone#aru04" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							case 3:
@@ -1116,7 +1117,7 @@ arug_cas04,212,149,0	script	2nd Guardian Stone#aru04	844,{
 							delitem 716,5; //Red_Gemstone
 							close2;
 							donpcevent "#aru04_df02::OnEnable";
-							specialeffect 135; //"2nd Guardian Stone#aru04" EF_ICECRASH
+							specialeffect EF_ICECRASH;
 							disablenpc "2nd Guardian Stone#aru04";
 							setarray $agit_ar04[1],0;
 							set .@df_all,$agit_ar04[0]+$agit_ar04[1];
@@ -1313,7 +1314,7 @@ arug_cas04,143,158,0	script	Control Device01#aru04	111,{
 									mes "reinforced with wood.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 2:
@@ -1366,7 +1367,7 @@ arug_cas04,143,158,0	script	Control Device01#aru04	111,{
 									mes "like this will work.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								}
@@ -1390,7 +1391,7 @@ arug_cas04,143,158,0	script	Control Device01#aru04	111,{
 									mes "is starting to look more solid.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 3:
@@ -1431,7 +1432,7 @@ arug_cas04,143,158,0	script	Control Device01#aru04	111,{
 									mes "much of the gate's damage.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 4:
@@ -1550,7 +1551,7 @@ arug_cas04,135,212,0	script	Control Device02#aru04	111,{
 									mes "reinforced with wood.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 2:
@@ -1603,7 +1604,7 @@ arug_cas04,135,212,0	script	Control Device02#aru04	111,{
 									mes "like this will work.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								}
@@ -1627,7 +1628,7 @@ arug_cas04,135,212,0	script	Control Device02#aru04	111,{
 									mes "is starting to look more solid.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 3:
@@ -1668,7 +1669,7 @@ arug_cas04,135,212,0	script	Control Device02#aru04	111,{
 									mes "much of the gate's damage.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 4:
@@ -1789,7 +1790,7 @@ arug_cas04,134,266,0	script	Control Device03#aru04	111,{
 									mes "reinforced with wood.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 2:
@@ -1842,7 +1843,7 @@ arug_cas04,134,266,0	script	Control Device03#aru04	111,{
 									mes "like this will work.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								}
@@ -1866,7 +1867,7 @@ arug_cas04,134,266,0	script	Control Device03#aru04	111,{
 									mes "is starting to look more solid.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 3:
@@ -1907,7 +1908,7 @@ arug_cas04,134,266,0	script	Control Device03#aru04	111,{
 									mes "much of the gate's damage.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 4:
diff --git a/npc/guild2/arug_cas05.txt b/npc/guild2/arug_cas05.txt
index 3f5c767b6..36bb499ca 100644
--- a/npc/guild2/arug_cas05.txt
+++ b/npc/guild2/arug_cas05.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.6
+//= 1.7
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -19,6 +19,7 @@
 //=     Treasure will now be killed before spawning.
 //= 1.5 Fixed error with control devices. [L0ne_W0lf]
 //= 1.6 Corrected copy/paste error. [L0ne_W0lf]
+//= 1.7 Replaced effect numerics with constants. [L0ne_W0lf]
 //============================================================
 
 arug_cas05,1,1,0	script	Manager#aru05_02	111,{
@@ -692,7 +693,7 @@ arug_cas05,65,171,0	script	1st Guardian Stone#aru05	844,{
 					else {
 						switch(rand(1,3)) {
 						case 1:
-							specialeffect 54; //"1st Guardian Stone#aru05" EF_BEGINSPELL2
+							specialeffect EF_BEGINSPELL2;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -715,13 +716,13 @@ arug_cas05,65,171,0	script	1st Guardian Stone#aru05	844,{
 								mes "^3355FFYou placed the Blue Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"1st Guardian Stone#aru05" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							}
 							break;
 						case 2:
-							specialeffect 225; //"1st Guardian Stone#aru05" EF_VOLCANO
+							specialeffect EF_VOLCANO;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -732,7 +733,7 @@ arug_cas05,65,171,0	script	1st Guardian Stone#aru05	844,{
 								mes "^3355FFYou placed the Red Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"1st Guardian Stone#aru05" EF_STEAL
+								specialeffect EF_STEAL; 
 								next;
 								break;
 							case 2:
@@ -750,7 +751,7 @@ arug_cas05,65,171,0	script	1st Guardian Stone#aru05	844,{
 							}
 							break;
 						case 3:
-							specialeffect 56; //"1st Guardian Stone#aru05" EF_BEGINSPELL4
+							specialeffect EF_BEGINSPELL4;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -767,7 +768,7 @@ arug_cas05,65,171,0	script	1st Guardian Stone#aru05	844,{
 								mes "^3355FFYou placed the Yellow Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"1st Guardian Stone#aru05" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							case 3:
@@ -807,7 +808,7 @@ arug_cas05,65,171,0	script	1st Guardian Stone#aru05	844,{
 							delitem 716,5; //Red_Gemstone
 							close2;
 							donpcevent "#aru05_df01::OnEnable";
-							specialeffect 135; //"1st Guardian Stone#aru05" EF_ICECRASH
+							specialeffect EF_ICECRASH;
 							disablenpc "1st Guardian Stone#aru05";
 							setarray $agit_ar05[0],0;
 							set .@df_all,$agit_ar05[0]+$agit_ar05[1];
@@ -853,7 +854,7 @@ OnInit:
 
 OnEnable:
 	enablenpc "1st Guardian Stone#aru05";
-	specialeffect 247; //"1st Guardian Stone#aru05" EF_MAPPILLAR2
+	specialeffect EF_MAPPILLAR2;
 	end;
 
 OnDisable:
@@ -1001,7 +1002,7 @@ arug_cas05,212,149,0	script	2nd Guardian Stone#aru05	844,{
 					else {
 						switch(rand(1,3)) {
 						case 1:
-							specialeffect 54; //"2nd Guardian Stone#aru05" EF_BEGINSPELL2
+							specialeffect EF_BEGINSPELL2;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -1024,13 +1025,13 @@ arug_cas05,212,149,0	script	2nd Guardian Stone#aru05	844,{
 								mes "^3355FFYou placed the Blue Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"2nd Guardian Stone#aru05" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							}
 							break;
 						case 2:
-							specialeffect 225; //"2nd Guardian Stone#aru05" EF_VOLCANO
+							specialeffect EF_VOLCANO;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -1041,7 +1042,7 @@ arug_cas05,212,149,0	script	2nd Guardian Stone#aru05	844,{
 								mes "^3355FFYou placed the Red Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"2nd Guardian Stone#aru05" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							case 2:
@@ -1059,7 +1060,7 @@ arug_cas05,212,149,0	script	2nd Guardian Stone#aru05	844,{
 							}
 							break;
 						case 3:
-							specialeffect 56; //"2nd Guardian Stone#aru05" EF_BEGINSPELL4
+							specialeffect EF_BEGINSPELL4;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -1076,7 +1077,7 @@ arug_cas05,212,149,0	script	2nd Guardian Stone#aru05	844,{
 								mes "^3355FFYou placed the Yellow Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"2nd Guardian Stone#aru05" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							case 3:
@@ -1116,7 +1117,7 @@ arug_cas05,212,149,0	script	2nd Guardian Stone#aru05	844,{
 							delitem 716,5; //Red_Gemstone
 							close2;
 							donpcevent "#aru05_df02::OnEnable";
-							specialeffect 135; //"2nd Guardian Stone#aru05" EF_ICECRASH
+							specialeffect EF_ICECRASH;
 							disablenpc "2nd Guardian Stone#aru05";
 							setarray $agit_ar05[1],0;
 							set .@df_all,$agit_ar05[0]+$agit_ar05[1];
@@ -1162,7 +1163,7 @@ OnInit:
 
 OnEnable:
 	enablenpc "2nd Guardian Stone#aru05";
-	specialeffect 247; //"2nd Guardian Stone#aru05" EF_MAPPILLAR2
+	specialeffect EF_MAPPILLAR2;
 	end;
 
 OnDisable:
@@ -1313,7 +1314,7 @@ arug_cas05,136,158,0	script	Control Device01#aru05	111,{
 									mes "reinforced with wood.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 2:
@@ -1366,7 +1367,7 @@ arug_cas05,136,158,0	script	Control Device01#aru05	111,{
 									mes "like this will work.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								}
@@ -1390,7 +1391,7 @@ arug_cas05,136,158,0	script	Control Device01#aru05	111,{
 									mes "is starting to look more solid.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 3:
@@ -1431,7 +1432,7 @@ arug_cas05,136,158,0	script	Control Device01#aru05	111,{
 									mes "much of the gate's damage.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 4:
@@ -1550,7 +1551,7 @@ arug_cas05,135,212,0	script	Control Device02#aru05	111,{
 									mes "reinforced with wood.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 2:
@@ -1603,7 +1604,7 @@ arug_cas05,135,212,0	script	Control Device02#aru05	111,{
 									mes "like this will work.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								}
@@ -1627,7 +1628,7 @@ arug_cas05,135,212,0	script	Control Device02#aru05	111,{
 									mes "is starting to look more solid.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 3:
@@ -1668,7 +1669,7 @@ arug_cas05,135,212,0	script	Control Device02#aru05	111,{
 									mes "much of the gate's damage.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 4:
@@ -1789,7 +1790,7 @@ arug_cas05,134,266,0	script	Control Device03#aru05	111,{
 									mes "reinforced with wood.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 2:
@@ -1842,7 +1843,7 @@ arug_cas05,134,266,0	script	Control Device03#aru05	111,{
 									mes "like this will work.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								}
@@ -1866,7 +1867,7 @@ arug_cas05,134,266,0	script	Control Device03#aru05	111,{
 									mes "is starting to look more solid.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 3:
@@ -1907,7 +1908,7 @@ arug_cas05,134,266,0	script	Control Device03#aru05	111,{
 									mes "much of the gate's damage.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 4:
diff --git a/npc/guild2/schg_cas01.txt b/npc/guild2/schg_cas01.txt
index daff2fd2a..25bb463f6 100644
--- a/npc/guild2/schg_cas01.txt
+++ b/npc/guild2/schg_cas01.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.6
+//= 1.7
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -19,6 +19,7 @@
 //=     Made it so treasure won't spawn if castle is empty.
 //=     Treasure will now be killed before spawning.
 //= 1.6 Corrected a typo with treasure spawning. [L0ne_W0lf]
+//= 1.7 Replaced effect numerics with constants. [L0ne_W0lf]
 //============================================================
 
 schg_cas01,1,1,0	script	Manager#sch01_02	111,{
@@ -692,7 +693,7 @@ schg_cas01,27,36,0	script	1st Guardian Stone#sch01	844,{
 					else {
 						switch(rand(1,3)) {
 						case 1:
-							specialeffect 54; //"1st Guardian Stone#sch01" EF_BEGINSPELL2
+							specialeffect EF_BEGINSPELL2;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -715,13 +716,13 @@ schg_cas01,27,36,0	script	1st Guardian Stone#sch01	844,{
 								mes "^3355FFYou placed the Blue Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"1st Guardian Stone#sch01" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							}
 							break;
 						case 2:
-							specialeffect 225; //"1st Guardian Stone#sch01" EF_VOLCANO
+							specialeffect EF_VOLCANO;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -732,7 +733,7 @@ schg_cas01,27,36,0	script	1st Guardian Stone#sch01	844,{
 								mes "^3355FFYou placed the Red Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"1st Guardian Stone#sch01" EF_STEAL
+								specialeffect EF_STEAL; 
 								next;
 								break;
 							case 2:
@@ -750,7 +751,7 @@ schg_cas01,27,36,0	script	1st Guardian Stone#sch01	844,{
 							}
 							break;
 						case 3:
-							specialeffect 56; //"1st Guardian Stone#sch01" EF_BEGINSPELL4
+							specialeffect EF_BEGINSPELL4;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -767,7 +768,7 @@ schg_cas01,27,36,0	script	1st Guardian Stone#sch01	844,{
 								mes "^3355FFYou placed the Yellow Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"1st Guardian Stone#sch01" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							case 3:
@@ -807,7 +808,7 @@ schg_cas01,27,36,0	script	1st Guardian Stone#sch01	844,{
 							delitem 716,5; //Red_Gemstone
 							close2;
 							donpcevent "#sch01_df01::OnEnable";
-							specialeffect 135; //"1st Guardian Stone#sch01" EF_ICECRASH
+							specialeffect EF_ICECRASH;
 							disablenpc "1st Guardian Stone#sch01";
 							setarray $agit_sc01[0],0;
 							set .@df_all,$agit_sc01[0]+$agit_sc01[1];
@@ -853,7 +854,7 @@ OnInit:
 
 OnEnable:
 	enablenpc "1st Guardian Stone#sch01";
-	specialeffect 247; //"1st Guardian Stone#sch01" EF_MAPPILLAR2
+	specialeffect EF_MAPPILLAR2;
 	end;
 
 OnDisable:
@@ -1001,7 +1002,7 @@ schg_cas01,208,75,0	script	2nd Guardian Stone#sch01	844,{
 					else {
 						switch(rand(1,3)) {
 						case 1:
-							specialeffect 54; //"2nd Guardian Stone#sch01" EF_BEGINSPELL2
+							specialeffect EF_BEGINSPELL2;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -1024,13 +1025,13 @@ schg_cas01,208,75,0	script	2nd Guardian Stone#sch01	844,{
 								mes "^3355FFYou placed the Blue Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"2nd Guardian Stone#sch01" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							}
 							break;
 						case 2:
-							specialeffect 225; //"2nd Guardian Stone#sch01" EF_VOLCANO
+							specialeffect EF_VOLCANO;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -1041,7 +1042,7 @@ schg_cas01,208,75,0	script	2nd Guardian Stone#sch01	844,{
 								mes "^3355FFYou placed the Red Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"2nd Guardian Stone#sch01" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							case 2:
@@ -1059,7 +1060,7 @@ schg_cas01,208,75,0	script	2nd Guardian Stone#sch01	844,{
 							}
 							break;
 						case 3:
-							specialeffect 56; //"2nd Guardian Stone#sch01" EF_BEGINSPELL4
+							specialeffect EF_BEGINSPELL4;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -1076,7 +1077,7 @@ schg_cas01,208,75,0	script	2nd Guardian Stone#sch01	844,{
 								mes "^3355FFYou placed the Yellow Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"2nd Guardian Stone#sch01" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							case 3:
@@ -1116,7 +1117,7 @@ schg_cas01,208,75,0	script	2nd Guardian Stone#sch01	844,{
 							delitem 716,5; //Red_Gemstone
 							close2;
 							donpcevent "#sch01_df02::OnEnable";
-							specialeffect 135; //"2nd Guardian Stone#sch01" EF_ICECRASH
+							specialeffect EF_ICECRASH;
 							disablenpc "2nd Guardian Stone#sch01";
 							setarray $agit_sc01[1],0;
 							set .@df_all,$agit_sc01[0]+$agit_sc01[1];
@@ -1162,7 +1163,7 @@ OnInit:
 
 OnEnable:
 	enablenpc "2nd Guardian Stone#sch01";
-	specialeffect 247; //"2nd Guardian Stone#sch01" EF_MAPPILLAR2
+	specialeffect EF_MAPPILLAR2;
 	end;
 
 OnDisable:
@@ -1315,7 +1316,7 @@ schg_cas01,124,52,0	script	Control Device01#sch01	111,{
 									mes "reinforced with wood.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 2:
@@ -1325,8 +1326,10 @@ schg_cas01,124,52,0	script	Control Device01#sch01	111,{
 									mes "something else.^000000";
 									close;
 								case 3:
-									mes "^3355FFYou tried using emveretarcon,";
-									mes "but it's not working very well.^FFFFFF ^3355FF You'll have to try something else.";
+									mes "^3355FFYou tried using emveretarcon";
+									mes "to reinforce the gate, but it's";
+									mes "not working well at all.";
+									mes "You'll have to start over.^000000";
 									close;
 								case 4:
 									mes "^3355FFYou tried using oridecon,";
@@ -1366,7 +1369,7 @@ schg_cas01,124,52,0	script	Control Device01#sch01	111,{
 									mes "like this will work.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								}
@@ -1390,7 +1393,7 @@ schg_cas01,124,52,0	script	Control Device01#sch01	111,{
 									mes "is starting to look more solid.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 3:
@@ -1431,7 +1434,7 @@ schg_cas01,124,52,0	script	Control Device01#sch01	111,{
 									mes "much of the gate's damage.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 4:
@@ -1550,7 +1553,7 @@ schg_cas01,128,157,0	script	Control Device02#sch01	111,{
 									mes "reinforced with wood.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 2:
@@ -1603,7 +1606,7 @@ schg_cas01,128,157,0	script	Control Device02#sch01	111,{
 									mes "like this will work.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								}
@@ -1627,7 +1630,7 @@ schg_cas01,128,157,0	script	Control Device02#sch01	111,{
 									mes "is starting to look more solid.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 3:
@@ -1668,7 +1671,7 @@ schg_cas01,128,157,0	script	Control Device02#sch01	111,{
 									mes "much of the gate's damage.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 4:
@@ -1789,7 +1792,7 @@ schg_cas01,109,247,0	script	Control Device03#sch01	111,{
 									mes "reinforced with wood.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 2:
@@ -1842,7 +1845,7 @@ schg_cas01,109,247,0	script	Control Device03#sch01	111,{
 									mes "like this will work.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								}
@@ -1866,7 +1869,7 @@ schg_cas01,109,247,0	script	Control Device03#sch01	111,{
 									mes "is starting to look more solid.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 3:
@@ -1907,7 +1910,7 @@ schg_cas01,109,247,0	script	Control Device03#sch01	111,{
 									mes "much of the gate's damage.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 4:
diff --git a/npc/guild2/schg_cas02.txt b/npc/guild2/schg_cas02.txt
index 8e835a743..6c1bff09e 100644
--- a/npc/guild2/schg_cas02.txt
+++ b/npc/guild2/schg_cas02.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.8
+//= 1.9
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -21,6 +21,7 @@
 //=     Made it so treasure won't spawn if castle is empty.
 //=     Treasure will now be killed before spawning.
 //= 1.8 Fixed error with control devices. [L0ne_W0lf]
+//= 1.9 Replaced effect numerics with constants. [L0ne_W0lf]
 //============================================================
 
 schg_cas02,1,1,0	script	Manager#sch02_02	111,{
@@ -694,7 +695,7 @@ schg_cas02,231,57,0	script	1st Guardian Stone#sch02	844,{
 					else {
 						switch(rand(1,3)) {
 						case 1:
-							specialeffect 54; //"1st Guardian Stone#sch02" EF_BEGINSPELL2
+							specialeffect EF_BEGINSPELL2;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -717,13 +718,13 @@ schg_cas02,231,57,0	script	1st Guardian Stone#sch02	844,{
 								mes "^3355FFYou placed the Blue Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"1st Guardian Stone#sch02" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							}
 							break;
 						case 2:
-							specialeffect 225; //"1st Guardian Stone#sch02" EF_VOLCANO
+							specialeffect EF_VOLCANO;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -734,7 +735,7 @@ schg_cas02,231,57,0	script	1st Guardian Stone#sch02	844,{
 								mes "^3355FFYou placed the Red Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"1st Guardian Stone#sch02" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							case 2:
@@ -752,7 +753,7 @@ schg_cas02,231,57,0	script	1st Guardian Stone#sch02	844,{
 							}
 							break;
 						case 3:
-							specialeffect 56; //"1st Guardian Stone#sch02" EF_BEGINSPELL4
+							specialeffect EF_BEGINSPELL4;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -769,7 +770,7 @@ schg_cas02,231,57,0	script	1st Guardian Stone#sch02	844,{
 								mes "^3355FFYou placed the Yellow Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"1st Guardian Stone#sch02" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							case 3:
@@ -809,7 +810,7 @@ schg_cas02,231,57,0	script	1st Guardian Stone#sch02	844,{
 							delitem 716,5; //Red_Gemstone
 							close2;
 							donpcevent "#sch02_df01::OnEnable";
-							specialeffect 135; //"1st Guardian Stone#sch02" EF_ICECRASH
+							specialeffect EF_ICECRASH;
 							disablenpc "1st Guardian Stone#sch02";
 							setarray $agit_sc02[0],0;
 							set .@df_all,$agit_sc02[0]+$agit_sc02[1];
@@ -855,7 +856,7 @@ OnInit:
 
 OnEnable:
 	enablenpc "1st Guardian Stone#sch02";
-	specialeffect 247; //"1st Guardian Stone#sch02" EF_MAPPILLAR2
+	specialeffect EF_MAPPILLAR2;
 	end;
 
 OnDisable:
@@ -1003,7 +1004,7 @@ schg_cas02,335,231,0	script	2nd Guardian Stone#sch02	844,{
 					else {
 						switch(rand(1,3)) {
 						case 1:
-							specialeffect 54; //"2nd Guardian Stone#sch02" EF_BEGINSPELL2
+							specialeffect EF_BEGINSPELL2;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -1026,13 +1027,13 @@ schg_cas02,335,231,0	script	2nd Guardian Stone#sch02	844,{
 								mes "^3355FFYou placed the Blue Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"2nd Guardian Stone#sch02" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							}
 							break;
 						case 2:
-							specialeffect 225; //"2nd Guardian Stone#sch02" EF_VOLCANO
+							specialeffect EF_VOLCANO;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -1043,7 +1044,7 @@ schg_cas02,335,231,0	script	2nd Guardian Stone#sch02	844,{
 								mes "^3355FFYou placed the Red Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"2nd Guardian Stone#sch02" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							case 2:
@@ -1061,7 +1062,7 @@ schg_cas02,335,231,0	script	2nd Guardian Stone#sch02	844,{
 							}
 							break;
 						case 3:
-							specialeffect 56; //"2nd Guardian Stone#sch02" EF_BEGINSPELL4
+							specialeffect EF_BEGINSPELL4;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -1078,7 +1079,7 @@ schg_cas02,335,231,0	script	2nd Guardian Stone#sch02	844,{
 								mes "^3355FFYou placed the Yellow Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"2nd Guardian Stone#sch02" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							case 3:
@@ -1118,7 +1119,7 @@ schg_cas02,335,231,0	script	2nd Guardian Stone#sch02	844,{
 							delitem 716,5; //Red_Gemstone
 							close2;
 							donpcevent "#sch02_df02::OnEnable";
-							specialeffect 135; //"2nd Guardian Stone#sch02" EF_ICECRASH
+							specialeffect EF_ICECRASH;
 							disablenpc "2nd Guardian Stone#sch02";
 							setarray $agit_sc02[1],0;
 							set .@df_all,$agit_sc02[0]+$agit_sc02[1];
@@ -1164,7 +1165,7 @@ OnInit:
 
 OnEnable:
 	enablenpc "2nd Guardian Stone#sch02";
-	specialeffect 247; //"2nd Guardian Stone#sch02" EF_MAPPILLAR2
+	specialeffect EF_MAPPILLAR2;
 	end;
 
 OnDisable:
@@ -1314,7 +1315,7 @@ schg_cas02,288,97,0	script	Control Device01#sch02	111,{
 									mes "reinforced with wood.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 2:
@@ -1365,7 +1366,7 @@ schg_cas02,288,97,0	script	Control Device01#sch02	111,{
 									mes "like this will work.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								}
@@ -1389,7 +1390,7 @@ schg_cas02,288,97,0	script	Control Device01#sch02	111,{
 									mes "is starting to look more solid.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 3:
@@ -1430,7 +1431,7 @@ schg_cas02,288,97,0	script	Control Device01#sch02	111,{
 									mes "much of the gate's damage.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 4:
@@ -1549,7 +1550,7 @@ schg_cas02,230,209,0	script	Control Device02#sch02	111,{
 									mes "reinforced with wood.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 2:
@@ -1602,7 +1603,7 @@ schg_cas02,230,209,0	script	Control Device02#sch02	111,{
 									mes "like this will work.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								}
@@ -1626,7 +1627,7 @@ schg_cas02,230,209,0	script	Control Device02#sch02	111,{
 									mes "is starting to look more solid.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 3:
@@ -1667,7 +1668,7 @@ schg_cas02,230,209,0	script	Control Device02#sch02	111,{
 									mes "much of the gate's damage.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 4:
@@ -1788,7 +1789,7 @@ schg_cas02,159,143,0	script	Control Device03#sch02	111,{
 									mes "reinforced with wood.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 2:
@@ -1841,7 +1842,7 @@ schg_cas02,159,143,0	script	Control Device03#sch02	111,{
 									mes "like this will work.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								}
@@ -1865,7 +1866,7 @@ schg_cas02,159,143,0	script	Control Device03#sch02	111,{
 									mes "is starting to look more solid.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 3:
@@ -1906,7 +1907,7 @@ schg_cas02,159,143,0	script	Control Device03#sch02	111,{
 									mes "much of the gate's damage.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 4:
diff --git a/npc/guild2/schg_cas03.txt b/npc/guild2/schg_cas03.txt
index 6717aeab4..9fd9a4dac 100644
--- a/npc/guild2/schg_cas03.txt
+++ b/npc/guild2/schg_cas03.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.8
+//= 1.9
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -23,6 +23,7 @@
 //=     Treasure will now be killed before spawning.
 //= 1.7 Fixed a typo when disabling a control device. [L0ne_W0lf]
 //= 1.8 Changed the treasure box spawn from 1939 to 1940. [L0ne_W0lf]
+//= 1.9 Replaced effect numerics with constants. [L0ne_W0lf]
 //============================================================
 
 schg_cas03,1,1,0	script	Manager#sch03_02	111,{
@@ -696,7 +697,7 @@ schg_cas03,242,309,0	script	1st Guardian Stone#sch03	844,{
 					else {
 						switch(rand(1,3)) {
 						case 1:
-							specialeffect 54; //"1st Guardian Stone#sch03" EF_BEGINSPELL2
+							specialeffect EF_BEGINSPELL2;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -719,13 +720,13 @@ schg_cas03,242,309,0	script	1st Guardian Stone#sch03	844,{
 								mes "^3355FFYou placed the Blue Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"1st Guardian Stone#sch03" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							}
 							break;
 						case 2:
-							specialeffect 225; //"1st Guardian Stone#sch03" EF_VOLCANO
+							specialeffect EF_VOLCANO;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -736,7 +737,7 @@ schg_cas03,242,309,0	script	1st Guardian Stone#sch03	844,{
 								mes "^3355FFYou placed the Red Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"1st Guardian Stone#sch03" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							case 2:
@@ -754,7 +755,7 @@ schg_cas03,242,309,0	script	1st Guardian Stone#sch03	844,{
 							}
 							break;
 						case 3:
-							specialeffect 56; //"1st Guardian Stone#sch03" EF_BEGINSPELL4
+							specialeffect EF_BEGINSPELL4;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -771,7 +772,7 @@ schg_cas03,242,309,0	script	1st Guardian Stone#sch03	844,{
 								mes "^3355FFYou placed the Yellow Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"1st Guardian Stone#sch03" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							case 3:
@@ -811,7 +812,7 @@ schg_cas03,242,309,0	script	1st Guardian Stone#sch03	844,{
 							delitem 716,5; //Red_Gemstone
 							close2;
 							donpcevent "#sch03_df01::OnEnable";
-							specialeffect 135; //"1st Guardian Stone#sch03" EF_ICECRASH
+							specialeffect EF_ICECRASH;
 							disablenpc "1st Guardian Stone#sch03";
 							setarray $agit_sc03[0],0;
 							set .@df_all,$agit_sc03[0]+$agit_sc03[1];
@@ -857,7 +858,7 @@ OnInit:
 
 OnEnable:
 	enablenpc "1st Guardian Stone#sch03";
-	specialeffect 247; //"1st Guardian Stone#sch03" EF_MAPPILLAR2
+	specialeffect EF_MAPPILLAR2;
 	end;
 
 OnDisable:
@@ -1005,7 +1006,7 @@ schg_cas03,376,250,0	script	2nd Guardian Stone#sch03	844,{
 					else {
 						switch(rand(1,3)) {
 						case 1:
-							specialeffect 54; //"2nd Guardian Stone#sch03" EF_BEGINSPELL2
+							specialeffect EF_BEGINSPELL2;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -1028,13 +1029,13 @@ schg_cas03,376,250,0	script	2nd Guardian Stone#sch03	844,{
 								mes "^3355FFYou placed the Blue Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"2nd Guardian Stone#sch03" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							}
 							break;
 						case 2:
-							specialeffect 225; //"2nd Guardian Stone#sch03" EF_VOLCANO
+							specialeffect EF_VOLCANO;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -1045,7 +1046,7 @@ schg_cas03,376,250,0	script	2nd Guardian Stone#sch03	844,{
 								mes "^3355FFYou placed the Red Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"2nd Guardian Stone#sch03" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							case 2:
@@ -1063,7 +1064,7 @@ schg_cas03,376,250,0	script	2nd Guardian Stone#sch03	844,{
 							}
 							break;
 						case 3:
-							specialeffect 56; //"2nd Guardian Stone#sch03" EF_BEGINSPELL4
+							specialeffect EF_BEGINSPELL4;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -1080,7 +1081,7 @@ schg_cas03,376,250,0	script	2nd Guardian Stone#sch03	844,{
 								mes "^3355FFYou placed the Yellow Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"2nd Guardian Stone#sch03" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							case 3:
@@ -1120,7 +1121,7 @@ schg_cas03,376,250,0	script	2nd Guardian Stone#sch03	844,{
 							delitem 716,5; //Red_Gemstone
 							close2;
 							donpcevent "#sch03_df02::OnEnable";
-							specialeffect 135; //"2nd Guardian Stone#sch03" EF_ICECRASH
+							specialeffect EF_ICECRASH;
 							disablenpc "2nd Guardian Stone#sch03";
 							setarray $agit_sc03[1],0;
 							set .@df_all,$agit_sc03[0]+$agit_sc03[1];
@@ -1166,7 +1167,7 @@ OnInit:
 
 OnEnable:
 	enablenpc "2nd Guardian Stone#sch03";
-	specialeffect 247; //"2nd Guardian Stone#sch03" EF_MAPPILLAR2
+	specialeffect EF_MAPPILLAR2;
 	end;
 
 OnDisable:
@@ -1315,7 +1316,7 @@ schg_cas03,335,298,0	script	Control Device01#sch03	111,{
 									mes "reinforced with wood.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 2:
@@ -1366,7 +1367,7 @@ schg_cas03,335,298,0	script	Control Device01#sch03	111,{
 									mes "like this will work.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								}
@@ -1390,7 +1391,7 @@ schg_cas03,335,298,0	script	Control Device01#sch03	111,{
 									mes "is starting to look more solid.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 3:
@@ -1431,7 +1432,7 @@ schg_cas03,335,298,0	script	Control Device01#sch03	111,{
 									mes "much of the gate's damage.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 4:
@@ -1550,7 +1551,7 @@ schg_cas03,200,227,0	script	Control Device02#sch03	111,{
 									mes "reinforced with wood.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 2:
@@ -1603,7 +1604,7 @@ schg_cas03,200,227,0	script	Control Device02#sch03	111,{
 									mes "like this will work.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								}
@@ -1627,7 +1628,7 @@ schg_cas03,200,227,0	script	Control Device02#sch03	111,{
 									mes "is starting to look more solid.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 3:
@@ -1668,7 +1669,7 @@ schg_cas03,200,227,0	script	Control Device02#sch03	111,{
 									mes "much of the gate's damage.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 4:
@@ -1789,7 +1790,7 @@ schg_cas03,273,205,0	script	Control Device03#sch03	111,{
 									mes "reinforced with wood.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 2:
@@ -1842,7 +1843,7 @@ schg_cas03,273,205,0	script	Control Device03#sch03	111,{
 									mes "like this will work.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								}
@@ -1866,7 +1867,7 @@ schg_cas03,273,205,0	script	Control Device03#sch03	111,{
 									mes "is starting to look more solid.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 3:
@@ -1907,7 +1908,7 @@ schg_cas03,273,205,0	script	Control Device03#sch03	111,{
 									mes "much of the gate's damage.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 4:
diff --git a/npc/guild2/schg_cas04.txt b/npc/guild2/schg_cas04.txt
index a7ec5c6ee..93dae163b 100644
--- a/npc/guild2/schg_cas04.txt
+++ b/npc/guild2/schg_cas04.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.4
+//= 1.5
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -17,6 +17,7 @@
 //= 1.4 Fixed investment period not resetting. [L0ne_W0lf]
 //=     Made it so treasure won't spawn if castle is empty.
 //=     Treasure will now be killed before spawning.
+//= 1.5 Replaced effect numerics with constants. [L0ne_W0lf]
 //============================================================
 
 schg_cas04,1,1,0	script	Manager#sch04_02	111,{
@@ -690,7 +691,7 @@ schg_cas04,27,36,0	script	1st Guardian Stone#sch04	844,{
 					else {
 						switch(rand(1,3)) {
 						case 1:
-							specialeffect 54; //"1st Guardian Stone#sch04" EF_BEGINSPELL2
+							specialeffect EF_BEGINSPELL2;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -713,13 +714,13 @@ schg_cas04,27,36,0	script	1st Guardian Stone#sch04	844,{
 								mes "^3355FFYou placed the Blue Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"1st Guardian Stone#sch04" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							}
 							break;
 						case 2:
-							specialeffect 225; //"1st Guardian Stone#sch04" EF_VOLCANO
+							specialeffect EF_VOLCANO;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -730,7 +731,7 @@ schg_cas04,27,36,0	script	1st Guardian Stone#sch04	844,{
 								mes "^3355FFYou placed the Red Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"1st Guardian Stone#sch04" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							case 2:
@@ -748,7 +749,7 @@ schg_cas04,27,36,0	script	1st Guardian Stone#sch04	844,{
 							}
 							break;
 						case 3:
-							specialeffect 56; //"1st Guardian Stone#sch04" EF_BEGINSPELL4
+							specialeffect EF_BEGINSPELL4;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -765,7 +766,7 @@ schg_cas04,27,36,0	script	1st Guardian Stone#sch04	844,{
 								mes "^3355FFYou placed the Yellow Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"1st Guardian Stone#sch04" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							case 3:
@@ -805,7 +806,7 @@ schg_cas04,27,36,0	script	1st Guardian Stone#sch04	844,{
 							delitem 716,5; //Red_Gemstone
 							close2;
 							donpcevent "#sch04_df01::OnEnable";
-							specialeffect 135; //"1st Guardian Stone#sch04" EF_ICECRASH
+							specialeffect EF_ICECRASH;
 							disablenpc "1st Guardian Stone#sch04";
 							setarray $agit_sc04[0],0;
 							set .@df_all,$agit_sc04[0]+$agit_sc04[1];
@@ -851,7 +852,7 @@ OnInit:
 
 OnEnable:
 	enablenpc "1st Guardian Stone#sch04";
-	specialeffect 247; //"1st Guardian Stone#sch04" EF_MAPPILLAR2
+	specialeffect EF_MAPPILLAR2;
 	end;
 
 OnDisable:
@@ -999,7 +1000,7 @@ schg_cas04,208,75,0	script	2nd Guardian Stone#sch04	844,{
 					else {
 						switch(rand(1,3)) {
 						case 1:
-							specialeffect 54; //"2nd Guardian Stone#sch04" EF_BEGINSPELL2
+							specialeffect EF_BEGINSPELL2;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -1022,13 +1023,13 @@ schg_cas04,208,75,0	script	2nd Guardian Stone#sch04	844,{
 								mes "^3355FFYou placed the Blue Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"2nd Guardian Stone#sch04" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							}
 							break;
 						case 2:
-							specialeffect 225; //"2nd Guardian Stone#sch04" EF_VOLCANO
+							specialeffect EF_VOLCANO;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -1039,7 +1040,7 @@ schg_cas04,208,75,0	script	2nd Guardian Stone#sch04	844,{
 								mes "^3355FFYou placed the Red Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"2nd Guardian Stone#sch04" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							case 2:
@@ -1057,7 +1058,7 @@ schg_cas04,208,75,0	script	2nd Guardian Stone#sch04	844,{
 							}
 							break;
 						case 3:
-							specialeffect 56; //"2nd Guardian Stone#sch04" EF_BEGINSPELL4
+							specialeffect EF_BEGINSPELL4;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -1074,7 +1075,7 @@ schg_cas04,208,75,0	script	2nd Guardian Stone#sch04	844,{
 								mes "^3355FFYou placed the Yellow Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"2nd Guardian Stone#sch04" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							case 3:
@@ -1114,7 +1115,7 @@ schg_cas04,208,75,0	script	2nd Guardian Stone#sch04	844,{
 							delitem 716,5; //Red_Gemstone
 							close2;
 							donpcevent "#sch04_df02::OnEnable";
-							specialeffect 135; //"2nd Guardian Stone#sch04" EF_ICECRASH
+							specialeffect EF_ICECRASH;
 							disablenpc "2nd Guardian Stone#sch04";
 							setarray $agit_sc04[1],0;
 							set .@df_all,$agit_sc04[0]+$agit_sc04[1];
@@ -1160,7 +1161,7 @@ OnInit:
 
 OnEnable:
 	enablenpc "2nd Guardian Stone#sch04";
-	specialeffect 247; //"2nd Guardian Stone#sch04" EF_MAPPILLAR2
+	specialeffect EF_MAPPILLAR2;
 	end;
 
 OnDisable:
@@ -1313,7 +1314,7 @@ schg_cas04,124,52,0	script	Control Device01#sch04	111,{
 									mes "reinforced with wood.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 2:
@@ -1364,7 +1365,7 @@ schg_cas04,124,52,0	script	Control Device01#sch04	111,{
 									mes "like this will work.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								}
@@ -1388,7 +1389,7 @@ schg_cas04,124,52,0	script	Control Device01#sch04	111,{
 									mes "is starting to look more solid.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 3:
@@ -1429,7 +1430,7 @@ schg_cas04,124,52,0	script	Control Device01#sch04	111,{
 									mes "much of the gate's damage.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 4:
@@ -1548,7 +1549,7 @@ schg_cas04,128,157,0	script	Control Device02#sch04	111,{
 									mes "reinforced with wood.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 2:
@@ -1601,7 +1602,7 @@ schg_cas04,128,157,0	script	Control Device02#sch04	111,{
 									mes "like this will work.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								}
@@ -1625,7 +1626,7 @@ schg_cas04,128,157,0	script	Control Device02#sch04	111,{
 									mes "is starting to look more solid.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 3:
@@ -1666,7 +1667,7 @@ schg_cas04,128,157,0	script	Control Device02#sch04	111,{
 									mes "much of the gate's damage.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 4:
@@ -1787,7 +1788,7 @@ schg_cas04,109,247,0	script	Control Device03#sch04	111,{
 									mes "reinforced with wood.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 2:
@@ -1840,7 +1841,7 @@ schg_cas04,109,247,0	script	Control Device03#sch04	111,{
 									mes "like this will work.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								}
@@ -1864,7 +1865,7 @@ schg_cas04,109,247,0	script	Control Device03#sch04	111,{
 									mes "is starting to look more solid.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 3:
@@ -1905,7 +1906,7 @@ schg_cas04,109,247,0	script	Control Device03#sch04	111,{
 									mes "much of the gate's damage.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 4:
diff --git a/npc/guild2/schg_cas05.txt b/npc/guild2/schg_cas05.txt
index 8833733b4..12e03517e 100644
--- a/npc/guild2/schg_cas05.txt
+++ b/npc/guild2/schg_cas05.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.4
+//= 1.5
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -17,6 +17,7 @@
 //= 1.4 Fixed investment period not resetting. [L0ne_W0lf]
 //=     Made it so treasure won't spawn if castle is empty.
 //=     Treasure will now be killed before spawning.
+//= 1.5 Replaced effect numerics with constants. [L0ne_W0lf]
 //============================================================
 
 schg_cas05,1,1,0	script	Manager#sch05_02	111,{
@@ -690,7 +691,7 @@ schg_cas05,27,36,0	script	1st Guardian Stone#sch05	844,{
 					else {
 						switch(rand(1,3)) {
 						case 1:
-							specialeffect 54; //"1st Guardian Stone#sch05" EF_BEGINSPELL2
+							specialeffect EF_BEGINSPELL2;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -713,13 +714,13 @@ schg_cas05,27,36,0	script	1st Guardian Stone#sch05	844,{
 								mes "^3355FFYou placed the Blue Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"1st Guardian Stone#sch05" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							}
 							break;
 						case 2:
-							specialeffect 225; //"1st Guardian Stone#sch05" EF_VOLCANO
+							specialeffect EF_VOLCANO;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -730,7 +731,7 @@ schg_cas05,27,36,0	script	1st Guardian Stone#sch05	844,{
 								mes "^3355FFYou placed the Red Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"1st Guardian Stone#sch05" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							case 2:
@@ -748,7 +749,7 @@ schg_cas05,27,36,0	script	1st Guardian Stone#sch05	844,{
 							}
 							break;
 						case 3:
-							specialeffect 56; //"1st Guardian Stone#sch05" EF_BEGINSPELL4
+							specialeffect EF_BEGINSPELL4;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -765,7 +766,7 @@ schg_cas05,27,36,0	script	1st Guardian Stone#sch05	844,{
 								mes "^3355FFYou placed the Yellow Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"1st Guardian Stone#sch05" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							case 3:
@@ -805,7 +806,7 @@ schg_cas05,27,36,0	script	1st Guardian Stone#sch05	844,{
 							delitem 716,5; //Red_Gemstone
 							close2;
 							donpcevent "#sch05_df01::OnEnable";
-							specialeffect 135; //"1st Guardian Stone#sch05" EF_ICECRASH
+							specialeffect EF_ICECRASH;
 							disablenpc "1st Guardian Stone#sch05";
 							setarray $agit_sc05[0],0;
 							set .@df_all,$agit_sc05[0]+$agit_sc05[1];
@@ -851,7 +852,7 @@ OnInit:
 
 OnEnable:
 	enablenpc "1st Guardian Stone#sch05";
-	specialeffect 247; //"1st Guardian Stone#sch05" EF_MAPPILLAR2
+	specialeffect EF_MAPPILLAR2;
 	end;
 
 OnDisable:
@@ -999,7 +1000,7 @@ schg_cas05,208,75,0	script	2nd Guardian Stone#sch05	844,{
 					else {
 						switch(rand(1,3)) {
 						case 1:
-							specialeffect 54; //"2nd Guardian Stone#sch05" EF_BEGINSPELL2
+							specialeffect EF_BEGINSPELL2;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -1022,13 +1023,13 @@ schg_cas05,208,75,0	script	2nd Guardian Stone#sch05	844,{
 								mes "^3355FFYou placed the Blue Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"2nd Guardian Stone#sch05" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							}
 							break;
 						case 2:
-							specialeffect 225; //"2nd Guardian Stone#sch05" EF_VOLCANO
+							specialeffect EF_VOLCANO;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -1039,7 +1040,7 @@ schg_cas05,208,75,0	script	2nd Guardian Stone#sch05	844,{
 								mes "^3355FFYou placed the Red Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"2nd Guardian Stone#sch05" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							case 2:
@@ -1057,7 +1058,7 @@ schg_cas05,208,75,0	script	2nd Guardian Stone#sch05	844,{
 							}
 							break;
 						case 3:
-							specialeffect 56; //"2nd Guardian Stone#sch05" EF_BEGINSPELL4
+							specialeffect EF_BEGINSPELL4;
 							mes "^3355FFThe Gemstones must";
 							mes "be arranged in the correct";
 							mes "order according to their";
@@ -1074,7 +1075,7 @@ schg_cas05,208,75,0	script	2nd Guardian Stone#sch05	844,{
 								mes "^3355FFYou placed the Yellow Gemstone.^000000";
 								set .@nice,.@nice+10;
 								set .@roof0,.@roof0 + 1;
-								specialeffect 18; //"2nd Guardian Stone#sch05" EF_STEAL
+								specialeffect EF_STEAL;
 								next;
 								break;
 							case 3:
@@ -1114,7 +1115,7 @@ schg_cas05,208,75,0	script	2nd Guardian Stone#sch05	844,{
 							delitem 716,5; //Red_Gemstone
 							close2;
 							donpcevent "#sch05_df02::OnEnable";
-							specialeffect 135; //"2nd Guardian Stone#sch05" EF_ICECRASH
+							specialeffect EF_ICECRASH;
 							disablenpc "2nd Guardian Stone#sch05";
 							setarray $agit_sc05[1],0;
 							set .@df_all,$agit_sc05[0]+$agit_sc05[1];
@@ -1160,7 +1161,7 @@ OnInit:
 
 OnEnable:
 	enablenpc "2nd Guardian Stone#sch05";
-	specialeffect 247; //"2nd Guardian Stone#sch05" EF_MAPPILLAR2
+	specialeffect EF_MAPPILLAR2;
 	end;
 
 OnDisable:
@@ -1313,7 +1314,7 @@ schg_cas05,124,52,0	script	Control Device01#sch05	111,{
 									mes "reinforced with wood.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 2:
@@ -1364,7 +1365,7 @@ schg_cas05,124,52,0	script	Control Device01#sch05	111,{
 									mes "like this will work.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								}
@@ -1388,7 +1389,7 @@ schg_cas05,124,52,0	script	Control Device01#sch05	111,{
 									mes "is starting to look more solid.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 3:
@@ -1429,7 +1430,7 @@ schg_cas05,124,52,0	script	Control Device01#sch05	111,{
 									mes "much of the gate's damage.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 4:
@@ -1548,7 +1549,7 @@ schg_cas05,128,157,0	script	Control Device02#sch05	111,{
 									mes "reinforced with wood.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 2:
@@ -1601,7 +1602,7 @@ schg_cas05,128,157,0	script	Control Device02#sch05	111,{
 									mes "like this will work.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								}
@@ -1625,7 +1626,7 @@ schg_cas05,128,157,0	script	Control Device02#sch05	111,{
 									mes "is starting to look more solid.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 3:
@@ -1666,7 +1667,7 @@ schg_cas05,128,157,0	script	Control Device02#sch05	111,{
 									mes "much of the gate's damage.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 4:
@@ -1787,7 +1788,7 @@ schg_cas05,109,247,0	script	Control Device03#sch05	111,{
 									mes "reinforced with wood.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 2:
@@ -1840,7 +1841,7 @@ schg_cas05,109,247,0	script	Control Device03#sch05	111,{
 									mes "like this will work.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								}
@@ -1864,7 +1865,7 @@ schg_cas05,109,247,0	script	Control Device03#sch05	111,{
 									mes "is starting to look more solid.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 3:
@@ -1905,7 +1906,7 @@ schg_cas05,109,247,0	script	Control Device03#sch05	111,{
 									mes "much of the gate's damage.^000000";
 									set .@rp_temp,.@rp_temp + 1;
 									set .@ro_of02,.@ro_of02 + 1;
-									specialeffect2 101; // EF_REPAIRWEAPON
+									specialeffect2 EF_REPAIRWEAPON;
 									next;
 									break;
 								case 4: