* Standardized label names and converted all labels to Pascal case. (temp. fix for bugreport:6988)

* Many fixes to Izlude Arena scripts.
* Other misc. standardization.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17410 54d463be-8e91-2dee-dedb-b68131a5f0ec

npc/battleground/bg_common.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script ======================================= 
-// BattleGround System - Common NPCs
+//= BattleGround System - Common NPCs
 //===== By: ================================================== 
 //= ????, L0ne_W0lf
 //===== Current Version: ===================================== 

npc/battleground/flavius/flavius01.txt

@@ -1,9 +1,9 @@
 //===== rAthena Script ======================================= 
-// BattleGround System - Flavius
+//= BattleGround System - Flavius
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.3
+//= 1.4
 //===== Compatible With: ===================================== 
 //= rAthena 1.0
 //===== Description: ========================================= 
@@ -16,6 +16,7 @@
 //= 1.1 Fixed pink crystal spawning as blue. [L0ne_W0lf]
 //= 1.2 Updated 'waitingroom' to support required zeny/lvl. [Kisuka]
 //= 1.3 Removed MaxLvl check in waitingrooms. Replaced setwall with setcell.
+//= 1.4 Label standardization. [Euphy]
 //============================================================
 
 // Waiting Room NPCs
@@ -95,16 +96,16 @@ OnReadyCheck:
 
 	donpcevent "Lieutenant Ator::OnEnterBG";
 	donpcevent "Lieutenant Thelokus::OnEnterBG";
-	donpcevent "OBJ#bat_b01_a::Onkill";
+	donpcevent "OBJ#bat_b01_a::OnKill";
 	donpcevent "OBJ#bat_b01_a::OnEnable";
-	donpcevent "OBJ#bat_b01_b::Onkill";
+	donpcevent "OBJ#bat_b01_b::OnKill";
 	donpcevent "OBJ#bat_b01_b::OnEnable";
-	donpcevent "guardian#bat_b01_a::Onkill";
-	donpcevent "guardian#bat_b01_b::Onkill";
+	donpcevent "guardian#bat_b01_a::OnKill";
+	donpcevent "guardian#bat_b01_b::OnKill";
 	donpcevent "guardian#bat_b01_a::OnEnable";
 	donpcevent "guardian#bat_b01_b::OnEnable";
-	donpcevent "cell#bat_b01_a::Onred";
-	donpcevent "cell#bat_b01_b::Onred";
+	donpcevent "cell#bat_b01_a::OnRed";
+	donpcevent "cell#bat_b01_b::OnRed";
 	donpcevent "time#bat_b01::OnEnable";
 	disablenpc "Guillaume Vintenar#b01_a";
 	disablenpc "Croix Vintenar#b01_b";
@@ -117,16 +118,16 @@ OnReadyCheck:
 	end;
 
 OnReset:
-	donpcevent "OBJ#bat_b01_a::Onkill";
+	donpcevent "OBJ#bat_b01_a::OnKill";
 	donpcevent "OBJ#bat_b01_a::OnEnable";
-	donpcevent "OBJ#bat_b01_b::Onkill";
+	donpcevent "OBJ#bat_b01_b::OnKill";
 	donpcevent "OBJ#bat_b01_b::OnEnable";
-	donpcevent "guardian#bat_b01_a::Onkill";
-	donpcevent "guardian#bat_b01_b::Onkill";
+	donpcevent "guardian#bat_b01_a::OnKill";
+	donpcevent "guardian#bat_b01_b::OnKill";
 	donpcevent "guardian#bat_b01_a::OnEnable";
 	donpcevent "guardian#bat_b01_b::OnEnable";
-	donpcevent "cell#bat_b01_a::Onred";
-	donpcevent "cell#bat_b01_b::Onred";
+	donpcevent "cell#bat_b01_a::OnRed";
+	donpcevent "cell#bat_b01_b::OnRed";
 	donpcevent "time#bat_b01::OnEnable";
 	disablenpc "Guillaume Vintenar#b01_a";
 	disablenpc "Croix Vintenar#b01_b";
@@ -152,7 +153,7 @@ OnEnable:
 	bg_monster $@FlaviusBG1_id1,"bat_b01",61,150,"Pink Crystal",1915,"OBJ#bat_b01_a::OnMyMobDead";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_b01","OBJ#bat_b01_a::OnMyMobDead";
 	end;
 
@@ -164,12 +165,12 @@ OnMyMobDead:
 			set $@Croix_ScoreBG1,$@Croix_ScoreBG1+1;
 			enablenpc "Guillaume Vintenar#b01_a";
 			enablenpc "Croix Vintenar#b01_b";
-			donpcevent "time#bat_b01::Onstop";
+			donpcevent "time#bat_b01::OnStop";
 		}
 		else {
 			set $@Croix_ScoreBG1,1;
 			donpcevent "time#bat_b01::OnEnable";
-			donpcevent "start#bat_b01::onReset";
+			donpcevent "start#bat_b01::OnReset";
 		}
 		donpcevent "#bat_b01_timer::OnStop";
 		bg_updatescore "bat_b01",$@Guill_ScoreBG1,$@Croix_ScoreBG1;
@@ -185,7 +186,7 @@ OnEnable:
 	bg_monster $@FlaviusBG1_id2,"bat_b01",328,150,"Blue Crystal",1914,"OBJ#bat_b01_b::OnMyMobDead";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_b01","OBJ#bat_b01_b::OnMyMobDead";
 	end;
 
@@ -197,12 +198,12 @@ OnMyMobDead:
 			set $@Guill_ScoreBG1,$@Guill_ScoreBG1+1;
 			enablenpc "Guillaume Vintenar#b01_a";
 			enablenpc "Croix Vintenar#b01_b";
-			donpcevent "time#bat_b01::Onstop";
+			donpcevent "time#bat_b01::OnStop";
 		}
 		else {
 			set $@Guill_ScoreBG1,1;
 			donpcevent "time#bat_b01::OnEnable";
-			donpcevent "start#bat_b01::onReset";
+			donpcevent "start#bat_b01::OnReset";
 		}
 		donpcevent "#bat_b01_timer::OnStop";
 		bg_updatescore "bat_b01",$@Guill_ScoreBG1,$@Croix_ScoreBG1;
@@ -219,13 +220,13 @@ OnEnable:
 	bg_monster $@FlaviusBG1_id1,"bat_b01",108,141,"Guillaume Camp Guardian",1949,"guardian#bat_b01_a::OnMyMobDead";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_b01","guardian#bat_b01_a::OnMyMobDead";
 	end;
 
 OnMyMobDead:
 	if (mobcount("bat_b01","guardian#bat_b01_a::OnMyMobDead") < 1) {
-		donpcevent "cell#bat_b01_a::Ongreen";
+		donpcevent "cell#bat_b01_a::OnGreen";
 		mapannounce "bat_b01", "The Guardian protecting Guillaume's Crystal has been slain.",bc_map,"0xFFCE00";
 	}
 	end;
@@ -237,37 +238,37 @@ OnEnable:
 	bg_monster $@FlaviusBG1_id2,"bat_b01",307,138,"Croix Camp Guardian",1949,"guardian#bat_b01_b::OnMyMobDead";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_b01","guardian#bat_b01_b::OnMyMobDead";
 	end;
 
 OnMyMobDead:
 	if (mobcount("bat_b01","guardian#bat_b01_b::OnMyMobDead") < 1) {
-		donpcevent "cell#bat_b01_b::Ongreen";
+		donpcevent "cell#bat_b01_b::OnGreen";
 		mapannounce "bat_b01", "The Guardian protecting Croix's Crystal has been slain.",bc_map,"0xFFCE00";
 	}
 	end;
 }
 
 bat_b01,1,4,3	script	cell#bat_b01_a	844,{
-Onred:
+OnRed:
 	setcell "bat_b01",62,149,60,151,cell_basilica,1;
 	setcell "bat_b01",62,149,60,151,cell_walkable,0;
 	end;
 
-Ongreen:
+OnGreen:
 	setcell "bat_b01",62,149,60,151,cell_basilica,0;
 	setcell "bat_b01",62,149,60,151,cell_walkable,1;
 	end;
 }
 
 bat_b01,1,5,3	script	cell#bat_b01_b	844,{
-Onred:
+OnRed:
 	setcell "bat_b01",327,151,329,149,cell_basilica,1;
 	setcell "bat_b01",327,151,329,149,cell_walkable,0;
 	end;
 
-Ongreen:
+OnGreen:
 	setcell "bat_b01",327,151,329,149,cell_basilica,0;
 	setcell "bat_b01",327,151,329,149,cell_walkable,1;
 	end;
@@ -279,7 +280,7 @@ OnEnable:
 	donpcevent "Battle Therapist#b01_b::OnEnable";
 	end;
 
-Onstop:
+OnStop:
 	donpcevent "Battle Therapist#b01_a::OnStop";
 	donpcevent "Battle Therapist#b01_b::OnStop";
 	end;
@@ -304,7 +305,7 @@ OnTimer26000:
 
 OnTimer26500:
 	stopnpctimer;
-	donpcevent "Battle Therapist#b01_a::onEnable";
+	donpcevent "Battle Therapist#b01_a::OnEnable";
 	end;
 
 OnEnable:
@@ -312,7 +313,7 @@ OnEnable:
 	enablenpc "Battle Therapist#b01_a";
 	end;
 
-Onstop:
+OnStop:
 	disablenpc "bat_b01_rp1_a_warp";
 	disablenpc "Battle Therapist#b01_a";
 	stopnpctimer;
@@ -357,7 +358,7 @@ OnEnable:
 	enablenpc "Battle Therapist#b01_b";
 	end;
 
-Onstop:
+OnStop:
 	disablenpc "bat_b01_rp1_b_warp";
 	disablenpc "Battle Therapist#b01_b";
 	stopnpctimer;
@@ -503,7 +504,7 @@ OnEnable:
 	initnpctimer;
 	end;
 
-Onstop:
+OnStop:
 	stopnpctimer;
 	end;
 
@@ -536,7 +537,7 @@ OnTimer1825000:
 	end;
 
 OnTimer1830000:
-	donpcevent "time#bat_b01::Onstop";
+	donpcevent "time#bat_b01::OnStop";
 	bg_warp $@FlaviusBG1_id1,"bat_b01",10,290;
 	bg_warp $@FlaviusBG1_id2,"bat_b01",390,10;
 	enablenpc "Vintenar#bat_b01_aover";
@@ -545,7 +546,7 @@ OnTimer1830000:
 
 OnTimer1900000:
 	mapwarp "bat_b01","bat_room",154,150;
-	donpcevent "countdown#bat_b01::Onstop";
+	donpcevent "countdown#bat_b01::OnStop";
 	end;
 }
 

npc/battleground/flavius/flavius02.txt

@@ -1,9 +1,9 @@
 //===== rAthena Script ======================================= 
-// BattleGround System - Flavius Second
+//= BattleGround System - Flavius Second
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.4
+//= 1.5
 //===== Compatible With: ===================================== 
 //= rAthena 1.0
 //===== Description: ========================================= 
@@ -17,6 +17,7 @@
 //= 1.2 Fixed pink crystal spawning as blue. [L0ne_W0lf]
 //= 1.3 Updated 'waitingroom' to support required zeny/lvl. [Kisuka]
 //= 1.4 Removed MaxLvl check in waitingrooms. Replaced setwall with setcell.
+//= 1.5 Label standardization. [Euphy]
 //============================================================
 
 // Waiting Room NPCs
@@ -96,16 +97,16 @@ OnReadyCheck:
 	bg_updatescore "bat_b02",$@Guill_ScoreBG2,$@Croix_ScoreBG2;
 	donpcevent "Lieutenant Huvas::OnEnterBG";
 	donpcevent "Lieutenant Yukon::OnEnterBG";
-	donpcevent "OBJ#bat_b02_a::Onkill";
+	donpcevent "OBJ#bat_b02_a::OnKill";
 	donpcevent "OBJ#bat_b02_a::OnEnable";
-	donpcevent "OBJ#bat_b02_b::Onkill";
+	donpcevent "OBJ#bat_b02_b::OnKill";
 	donpcevent "OBJ#bat_b02_b::OnEnable";
-	donpcevent "guardian#bat_b02_a::Onkill";
-	donpcevent "guardian#bat_b02_b::Onkill";
+	donpcevent "guardian#bat_b02_a::OnKill";
+	donpcevent "guardian#bat_b02_b::OnKill";
 	donpcevent "guardian#bat_b02_a::OnEnable";
 	donpcevent "guardian#bat_b02_b::OnEnable";
-	donpcevent "cell#bat_b02_a::Onred";
-	donpcevent "cell#bat_b02_b::Onred";
+	donpcevent "cell#bat_b02_a::OnRed";
+	donpcevent "cell#bat_b02_b::OnRed";
 	donpcevent "time#bat_b02::OnEnable";
 	disablenpc "Guillaume Vintenar#b02_a";
 	disablenpc "Croix Vintenar#b02_b";
@@ -118,16 +119,16 @@ OnReadyCheck:
 	end;
 
 OnReset:
-	donpcevent "OBJ#bat_b02_a::Onkill";
+	donpcevent "OBJ#bat_b02_a::OnKill";
 	donpcevent "OBJ#bat_b02_a::OnEnable";
-	donpcevent "OBJ#bat_b02_b::Onkill";
+	donpcevent "OBJ#bat_b02_b::OnKill";
 	donpcevent "OBJ#bat_b02_b::OnEnable";
-	donpcevent "guardian#bat_b02_a::Onkill";
-	donpcevent "guardian#bat_b02_b::Onkill";
+	donpcevent "guardian#bat_b02_a::OnKill";
+	donpcevent "guardian#bat_b02_b::OnKill";
 	donpcevent "guardian#bat_b02_a::OnEnable";
 	donpcevent "guardian#bat_b02_b::OnEnable";
-	donpcevent "cell#bat_b02_a::Onred";
-	donpcevent "cell#bat_b02_b::Onred";
+	donpcevent "cell#bat_b02_a::OnRed";
+	donpcevent "cell#bat_b02_b::OnRed";
 	donpcevent "time#bat_b02::OnEnable";
 	disablenpc "Guillaume Vintenar#b02_a";
 	disablenpc "Croix Vintenar#b02_b";
@@ -153,7 +154,7 @@ OnEnable:
 	bg_monster $@FlaviusBG2_id1,"bat_b02",61,150,"Pink Crystal",1915,"OBJ#bat_b02_a::OnMyMobDead";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_b02","OBJ#bat_b02_a::OnMyMobDead";
 	end;
 
@@ -165,12 +166,12 @@ OnMyMobDead:
 			set $@Croix_ScoreBG2,$@Croix_ScoreBG2+1;
 			enablenpc "Guillaume Vintenar#b02_a";
 			enablenpc "Croix Vintenar#b02_b";
-			donpcevent "time#bat_b02::Onstop";
+			donpcevent "time#bat_b02::OnStop";
 		}
 		else {
 			set $@Croix_ScoreBG2,1;
 			donpcevent "time#bat_b02::OnEnable";
-			donpcevent "start#bat_b02::onReset";
+			donpcevent "start#bat_b02::OnReset";
 		}
 		donpcevent "#bat_b02_timer::OnStop";
 		bg_updatescore "bat_b02",$@Guill_ScoreBG2,$@Croix_ScoreBG2;
@@ -186,7 +187,7 @@ OnEnable:
 	bg_monster $@FlaviusBG2_id2,"bat_b02",328,150,"Blue Crystal",1914,"OBJ#bat_b02_b::OnMyMobDead";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_b02","OBJ#bat_b02_b::OnMyMobDead";
 	end;
 
@@ -198,12 +199,12 @@ OnMyMobDead:
 			set $@Guill_ScoreBG2,$@Guill_ScoreBG2+1;
 			enablenpc "Guillaume Vintenar#b02_a";
 			enablenpc "Croix Vintenar#b02_b";
-			donpcevent "time#bat_b02::Onstop";
+			donpcevent "time#bat_b02::OnStop";
 		}
 		else {
 			set $@Guill_ScoreBG2,1;
 			donpcevent "time#bat_b02::OnEnable";
-			donpcevent "start#bat_b02::onReset";
+			donpcevent "start#bat_b02::OnReset";
 		}
 		donpcevent "#bat_b02_timer::OnStop";
 		bg_updatescore "bat_b02",$@Guill_ScoreBG2,$@Croix_ScoreBG2;
@@ -220,13 +221,13 @@ OnEnable:
 	bg_monster $@FlaviusBG2_id1,"bat_b02",108,141,"Guillaume Camp Guardian",1949,"guardian#bat_b02_a::OnMyMobDead";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_b02","guardian#bat_b02_a::OnMyMobDead";
 	end;
 
 OnMyMobDead:
 	if (mobcount("bat_b02","guardian#bat_b02_a::OnMyMobDead") < 1) {
-		donpcevent "cell#bat_b02_a::Ongreen";
+		donpcevent "cell#bat_b02_a::OnGreen";
 		mapannounce "bat_b02", "The Guardian protecting Guillaume's Crystal has been slain.",bc_map,"0xFFCE00";
 	}
 	end;
@@ -238,37 +239,37 @@ OnEnable:
 	bg_monster $@FlaviusBG2_id2,"bat_b02",307,138,"Croix Camp Guardian",1949,"guardian#bat_b02_b::OnMyMobDead";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_b02","guardian#bat_b02_b::OnMyMobDead";
 	end;
 
 OnMyMobDead:
 	if (mobcount("bat_b02","guardian#bat_b02_b::OnMyMobDead") < 1) {
-		donpcevent "cell#bat_b02_b::Ongreen";
+		donpcevent "cell#bat_b02_b::OnGreen";
 		mapannounce "bat_b02", "The Guardian protecting Croix's Crystal has been slain.",bc_map,"0xFFCE00";
 	}
 	end;
 }
 
 bat_b02,1,4,3	script	cell#bat_b02_a	844,{
-Onred:
+OnRed:
 	setcell "bat_b02",62,149,60,151,cell_basilica,1;
 	setcell "bat_b02",62,149,60,151,cell_walkable,0;
 	end;
 
-Ongreen:
+OnGreen:
 	setcell "bat_b02",62,149,60,151,cell_basilica,0;
 	setcell "bat_b02",62,149,60,151,cell_walkable,1;
 	end;
 }
 
 bat_b02,1,5,3	script	cell#bat_b02_b	844,{
-Onred:
+OnRed:
 	setcell "bat_b02",327,151,329,149,cell_basilica,1;
 	setcell "bat_b02",327,151,329,149,cell_walkable,0;
 	end;
 
-Ongreen:
+OnGreen:
 	setcell "bat_b02",327,151,329,149,cell_basilica,0;
 	setcell "bat_b02",327,151,329,149,cell_walkable,1;
 	end;
@@ -280,7 +281,7 @@ OnEnable:
 	donpcevent "Battle Therapist#b02_b::OnEnable";
 	end;
 
-Onstop:
+OnStop:
 	donpcevent "Battle Therapist#b02_a::OnStop";
 	donpcevent "Battle Therapist#b02_b::OnStop";
 	end;
@@ -305,7 +306,7 @@ OnTimer26000:
 
 OnTimer26500:
 	stopnpctimer;
-	donpcevent "Battle Therapist#b02_a::onEnable";
+	donpcevent "Battle Therapist#b02_a::OnEnable";
 	end;
 
 OnEnable:
@@ -313,7 +314,7 @@ OnEnable:
 	enablenpc "Battle Therapist#b02_a";
 	end;
 
-Onstop:
+OnStop:
 	disablenpc "bat_b02_rp1_a_warp";
 	disablenpc "Battle Therapist#b02_a";
 	stopnpctimer;
@@ -358,7 +359,7 @@ OnEnable:
 	enablenpc "Battle Therapist#b02_b";
 	end;
 
-Onstop:
+OnStop:
 	disablenpc "bat_b02_rp1_b_warp";
 	disablenpc "Battle Therapist#b02_b";
 	stopnpctimer;
@@ -504,7 +505,7 @@ OnEnable:
 	initnpctimer;
 	end;
 
-Onstop:
+OnStop:
 	stopnpctimer;
 	end;
 
@@ -537,7 +538,7 @@ OnTimer1825000:
 	end;
 
 OnTimer1830000:
-	donpcevent "time#bat_b02::Onstop";
+	donpcevent "time#bat_b02::OnStop";
 	bg_warp $@FlaviusBG2_id1,"bat_b02",10,290;
 	bg_warp $@FlaviusBG2_id2,"bat_b02",390,10;
 	enablenpc "Vintenar#bat_b02_aover";
@@ -546,7 +547,7 @@ OnTimer1830000:
 
 OnTimer1900000:
 	mapwarp "bat_b02","bat_room",154,150;
-	donpcevent "countdown#bat_b02::Onstop";
+	donpcevent "countdown#bat_b02::OnStop";
 	end;
 }
 

npc/battleground/flavius/flavius_enter.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script ======================================= 
-// BattleGround System - Flavius Entrance NPCs
+//= BattleGround System - Flavius Entrance NPCs
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 

npc/battleground/kvm/kvm01.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script ======================================= 
-// BattleGround System - KvM 80-99
+//= BattleGround System - KvM 80-99
 //===== By: ================================================== 
 //= ???, L0ne_W0lf
 //===== Current Version: ===================================== 

npc/battleground/kvm/kvm02.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script ======================================= 
-// BattleGround System - KvM 1-59
+//= BattleGround System - KvM 1-59
 //===== By: ================================================== 
 //= ???, L0ne_W0lf
 //===== Current Version: ===================================== 

npc/battleground/kvm/kvm03.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script ======================================= 
-// BattleGround System - KvM 60-80
+//= BattleGround System - KvM 60-80
 //===== By: ================================================== 
 //= ???, L0ne_W0lf
 //===== Current Version: ===================================== 

npc/battleground/kvm/kvm_enter.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script ======================================= 
-// BattleGround System - KvM Entrance NPCs
+//= BattleGround System - KvM Entrance NPCs
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 

npc/battleground/kvm/kvm_item_pay.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script ======================================= 
-// BattleGround System - KvM Item Dealer
+//= BattleGround System - KvM Item Dealer
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 

npc/battleground/tierra/tierra01.txt

@@ -1,9 +1,9 @@
 //===== rAthena Script ======================================= 
-// BattleGround System - Tierra Gorge
+//= BattleGround System - Tierra Gorge
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.3
+//= 1.4
 //===== Compatible With: ===================================== 
 //= rAthena 1.0
 //===== Description: ========================================= 
@@ -16,6 +16,7 @@
 //= 1.1 Corrected setwalls for barricades. [L0ne_W0lf]
 //= 1.2 Updated 'waitingroom' to support required zeny/lvl. [Kisuka]
 //= 1.3 Removed MaxLvl check in waitingrooms.
+//= 1.4 Label standardization. [Euphy]
 //============================================================
 
 // Waiting Room NPCs
@@ -47,7 +48,7 @@ OnEnterBG:
 bat_room,1,151,3	script	#bat_a01_timer	844,{
 	end;
 
-onInit:
+OnInit:
 OnEnable:
 	initnpctimer;
 	end;
@@ -98,18 +99,18 @@ OnInit:
 	end;
 
 OnEnable:
-	donpcevent "OBJ#bat_a01_a::Onkill";
+	donpcevent "OBJ#bat_a01_a::OnKill";
 	donpcevent "OBJ#bat_a01_a::OnEnable";
-	donpcevent "OBJ#bat_a01_b::Onkill";
+	donpcevent "OBJ#bat_a01_b::OnKill";
 	donpcevent "OBJ#bat_a01_b::OnEnable";
-	donpcevent "barricade#bat_a01_a::Onkill";
+	donpcevent "barricade#bat_a01_a::OnKill";
 	donpcevent "barricade#bat_a01_a::OnEnable";
-	donpcevent "barricade#bat_a01_b::Onkill";
+	donpcevent "barricade#bat_a01_b::OnKill";
 	donpcevent "barricade#bat_a01_b::OnEnable";
-	donpcevent "OBJ#bat_a01_n::Onkill";
+	donpcevent "OBJ#bat_a01_n::OnKill";
 	donpcevent "OBJ#bat_a01_n::OnEnable";
-	donpcevent "NOBJ_mob#bat_a01_a::Onkill";
-	donpcevent "NOBJ_mob#bat_a01_b::Onkill";
+	donpcevent "NOBJ_mob#bat_a01_a::OnKill";
+	donpcevent "NOBJ_mob#bat_a01_b::OnKill";
 	donpcevent "Battle Therapist#a01_a::OnEnable";
 	donpcevent "Battle Therapist#a01_b::OnEnable";
 	donpcevent "countdown#bat_a01::OnEnable";
@@ -138,7 +139,7 @@ OnReadyCheck:
 	set $@TierraBG1,1;
 	donpcevent "Lieutenant Kalos::OnEnterBG";
 	donpcevent "Lieutenant Eyor::OnEnterBG";
-	donpcevent "start#bat_a01::onEnable";
+	donpcevent "start#bat_a01::OnEnable";
 	bg_warp $@TierraBG1_id1,"bat_a01",352,342;
 	bg_warp $@TierraBG1_id2,"bat_a01",353,52;
 	initnpctimer;
@@ -155,7 +156,7 @@ OnEnable:
 	bg_monster $@TierraBG1_id1,"bat_a01",177,345,"Food Storage",1909,"OBJ#bat_a01_a::OnMyMobDead";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_a01","OBJ#bat_a01_a::OnMyMobDead";
 	end;
 
@@ -178,7 +179,7 @@ OnEnable:
 	bg_monster $@TierraBG1_id2,"bat_a01",167,50,"Food Depot",1910,"OBJ#bat_a01_b::OnMyMobDead";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_a01","OBJ#bat_a01_b::OnMyMobDead";
 	end;
 
@@ -203,7 +204,7 @@ OnEnable:
 	setwall "bat_a01",186,266,16,6,1,"bat_a01_c1";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_a01","barricade#bat_a01_a::OnMyMobDead";
 	delwall "bat_a01_c1";
 	end;
@@ -225,7 +226,7 @@ OnEnable:
 	setwall "bat_a01",170,129,16,6,1,"bat_a01_g1";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_a01","barricade#bat_a01_b::OnMyMobDead";
 	delwall "bat_a01_g1";
 	end;
@@ -245,7 +246,7 @@ OnEnable:
 	monster "bat_a01",273,203,"Neutrality Flag",1911,1,"OBJ#bat_a01_n::OnMyMobDead";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_a01","OBJ#bat_a01_n::OnMyMobDead";
 	end;
 
@@ -266,13 +267,13 @@ OnMyMobDead:
 
 bat_a01,15,21,3	script	NOBJ_mob#bat_a01_a	844,{
 OnEnable:
-	donpcevent "NOBJ_mob#bat_a01_b::Onkill";
+	donpcevent "NOBJ_mob#bat_a01_b::OnKill";
 	bg_monster $@TierraBG1_id1,"bat_a01",272,204,"Guillaume Camp Guardian",1949,"NOBJ_mob#bat_a01_a::OnMyMobDead";
 	bg_monster $@TierraBG1_id1,"bat_a01",272,213,"Guillaume Camp Guardian",1949,"NOBJ_mob#bat_a01_a::OnMyMobDead";
 	bg_monster $@TierraBG1_id1,"bat_a01",273,197,"Guillaume Camp Guardian",1950,"NOBJ_mob#bat_a01_a::OnMyMobDead";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_a01","NOBJ_mob#bat_a01_a::OnMyMobDead";
 	end;
 
@@ -282,13 +283,13 @@ OnMyMobDead:
 
 bat_a01,15,22,3	script	NOBJ_mob#bat_a01_b	844,{
 OnEnable:
-	donpcevent "NOBJ_mob#bat_a01_a::Onkill";
+	donpcevent "NOBJ_mob#bat_a01_a::OnKill";
 	bg_monster $@TierraBG1_id2,"bat_a01",272,204,"Croix Camp Guardian",1949,"NOBJ_mob#bat_a01_a::OnMyMobDead";
 	bg_monster $@TierraBG1_id2,"bat_a01",272,213,"Croix Camp Guardian",1949,"NOBJ_mob#bat_a01_a::OnMyMobDead";
 	bg_monster $@TierraBG1_id2,"bat_a01",273,197,"Croix Camp Guardian",1950,"NOBJ_mob#bat_a01_a::OnMyMobDead";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_a01","NOBJ_mob#bat_a01_b::OnMyMobDead";
 	end;
 
@@ -483,7 +484,7 @@ OnEnable:
 	enablenpc "Battle Therapist#a01_a";
 	end;
 
-Onstop:
+OnStop:
 	disablenpc "bat_a01_rp1_a_warp";
 	disablenpc "Battle Therapist#a01_a";
 	stopnpctimer;
@@ -533,7 +534,7 @@ OnEnable:
 	enablenpc "Battle Therapist#a01_b";
 	end;
 
-Onstop:
+OnStop:
 	disablenpc "bat_a01_rp1_b_warp";
 	disablenpc "Battle Therapist#a01_b";
 	stopnpctimer;
@@ -873,7 +874,7 @@ OnEnable:
 	initnpctimer;
 	end;
 
-Onstop:
+OnStop:
 	stopnpctimer;
 	end;
 
@@ -907,7 +908,7 @@ OnTimer1825000:
 
 OnTimer1830000:
 	mapwarp "bat_a01","bat_room",154,150;
-	donpcevent "countdown#bat_a01::Onstop";
+	donpcevent "countdown#bat_a01::OnStop";
 	end;
 }
 

npc/battleground/tierra/tierra02.txt

@@ -1,9 +1,9 @@
 //===== rAthena Script ======================================= 
-// BattleGround System - Tierra Gorge 2
+//= BattleGround System - Tierra Gorge 2
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.2
+//= 1.3
 //===== Compatible With: ===================================== 
 //= rAthena 1.0
 //===== Description: ========================================= 
@@ -15,6 +15,7 @@
 //= 1.0 First Version.
 //= 1.1 Updated 'waitingroom' to support required zeny/lvl. [Kisuka]
 //= 1.2 Removed MaxLvl check in waitingrooms.
+//= 1.3 Label standardization. [Euphy]
 //============================================================
 
 // Waiting Room NPCs
@@ -46,7 +47,7 @@ OnEnterBG:
 bat_room,1,151,3	script	#bat_a02_timer	844,{
 	end;
 
-onInit:
+OnInit:
 OnEnable:
 	initnpctimer;
 	end;
@@ -97,18 +98,18 @@ OnInit:
 	end;
 
 OnEnable:
-	donpcevent "OBJ#bat_a02_a::Onkill";
+	donpcevent "OBJ#bat_a02_a::OnKill";
 	donpcevent "OBJ#bat_a02_a::OnEnable";
-	donpcevent "OBJ#bat_a02_b::Onkill";
+	donpcevent "OBJ#bat_a02_b::OnKill";
 	donpcevent "OBJ#bat_a02_b::OnEnable";
-	donpcevent "barricade#bat_a02_a::Onkill";
+	donpcevent "barricade#bat_a02_a::OnKill";
 	donpcevent "barricade#bat_a02_a::OnEnable";
-	donpcevent "barricade#bat_a02_b::Onkill";
+	donpcevent "barricade#bat_a02_b::OnKill";
 	donpcevent "barricade#bat_a02_b::OnEnable";
-	donpcevent "OBJ#bat_a02_n::Onkill";
+	donpcevent "OBJ#bat_a02_n::OnKill";
 	donpcevent "OBJ#bat_a02_n::OnEnable";
-	donpcevent "NOBJ_mob#bat_a02_a::Onkill";
-	donpcevent "NOBJ_mob#bat_a02_b::Onkill";
+	donpcevent "NOBJ_mob#bat_a02_a::OnKill";
+	donpcevent "NOBJ_mob#bat_a02_b::OnKill";
 	donpcevent "Battle Therapist#a02_a::OnEnable";
 	donpcevent "Battle Therapist#a02_b::OnEnable";
 	donpcevent "countdown#bat_a02::OnEnable";
@@ -137,7 +138,7 @@ OnReadyCheck:
 	set $@TierraBG2,1;
 	donpcevent "Lieutenant Rundel::OnEnterBG";
 	donpcevent "Lieutenant Guerrit::OnEnterBG";
-	donpcevent "start#bat_a02::onEnable";
+	donpcevent "start#bat_a02::OnEnable";
 	bg_warp $@TierraBG2_id1,"bat_a02",352,342;
 	bg_warp $@TierraBG2_id2,"bat_a02",353,52;
 	initnpctimer;
@@ -154,7 +155,7 @@ OnEnable:
 	bg_monster $@TierraBG2_id1,"bat_a02",177,345,"Food Storage",1909,"OBJ#bat_a02_a::OnMyMobDead";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_a02","OBJ#bat_a02_a::OnMyMobDead";
 	end;
 
@@ -177,7 +178,7 @@ OnEnable:
 	bg_monster $@TierraBG2_id2,"bat_a02",167,50,"Food Depot",1910,"OBJ#bat_a02_b::OnMyMobDead";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_a02","OBJ#bat_a02_b::OnMyMobDead";
 	end;
 
@@ -202,7 +203,7 @@ OnEnable:
 	setwall "bat_a02",186,266,16,6,1,"bat_a02_c1";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_a02","barricade#bat_a02_a::OnMyMobDead";
 	delwall "bat_a02_c1";
 	end;
@@ -224,7 +225,7 @@ OnEnable:
 	setwall "bat_a02",170,129,16,6,1,"bat_a02_g1";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_a02","barricade#bat_a02_b::OnMyMobDead";
 	delwall "bat_a02_g1";
 	end;
@@ -244,7 +245,7 @@ OnEnable:
 	monster "bat_a02",273,203,"Neutrality Flag",1911,1,"OBJ#bat_a02_n::OnMyMobDead";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_a02","OBJ#bat_a02_n::OnMyMobDead";
 	end;
 
@@ -265,13 +266,13 @@ OnMyMobDead:
 
 bat_a02,15,21,3	script	NOBJ_mob#bat_a02_a	844,{
 OnEnable:
-	donpcevent "NOBJ_mob#bat_a02_b::Onkill";
+	donpcevent "NOBJ_mob#bat_a02_b::OnKill";
 	bg_monster $@TierraBG2_id1,"bat_a02",272,204,"Guillaume Camp Guardian",1949,"NOBJ_mob#bat_a02_a::OnMyMobDead";
 	bg_monster $@TierraBG2_id1,"bat_a02",272,213,"Guillaume Camp Guardian",1949,"NOBJ_mob#bat_a02_a::OnMyMobDead";
 	bg_monster $@TierraBG2_id1,"bat_a02",273,197,"Guillaume Camp Guardian",1950,"NOBJ_mob#bat_a02_a::OnMyMobDead";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_a02","NOBJ_mob#bat_a02_a::OnMyMobDead";
 	end;
 
@@ -281,13 +282,13 @@ OnMyMobDead:
 
 bat_a02,15,22,3	script	NOBJ_mob#bat_a02_b	844,{
 OnEnable:
-	donpcevent "NOBJ_mob#bat_a02_a::Onkill";
+	donpcevent "NOBJ_mob#bat_a02_a::OnKill";
 	bg_monster $@TierraBG2_id2,"bat_a02",272,204,"Croix Camp Guardian",1949,"NOBJ_mob#bat_a02_a::OnMyMobDead";
 	bg_monster $@TierraBG2_id2,"bat_a02",272,213,"Croix Camp Guardian",1949,"NOBJ_mob#bat_a02_a::OnMyMobDead";
 	bg_monster $@TierraBG2_id2,"bat_a02",273,197,"Croix Camp Guardian",1950,"NOBJ_mob#bat_a02_a::OnMyMobDead";
 	end;
 
-Onkill:
+OnKill:
 	killmonster "bat_a02","NOBJ_mob#bat_a02_b::OnMyMobDead";
 	end;
 
@@ -482,7 +483,7 @@ OnEnable:
 	enablenpc "Battle Therapist#a02_a";
 	end;
 
-Onstop:
+OnStop:
 	disablenpc "bat_a02_rp1_a_warp";
 	disablenpc "Battle Therapist#a02_a";
 	stopnpctimer;
@@ -532,7 +533,7 @@ OnEnable:
 	enablenpc "Battle Therapist#a02_b";
 	end;
 
-Onstop:
+OnStop:
 	disablenpc "bat_a02_rp1_b_warp";
 	disablenpc "Battle Therapist#a02_b";
 	stopnpctimer;
@@ -872,7 +873,7 @@ OnEnable:
 	initnpctimer;
 	end;
 
-Onstop:
+OnStop:
 	stopnpctimer;
 	end;
 
@@ -906,7 +907,7 @@ OnTimer1825000:
 
 OnTimer1830000:
 	mapwarp "bat_a02","bat_room",154,150;
-	donpcevent "countdown#bat_a02::Onstop";
+	donpcevent "countdown#bat_a02::OnStop";
 	end;
 }
 

npc/battleground/tierra/tierra_enter.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script ======================================= 
-// BattleGround System - Tierra Gorge Entrance NPCs
+//= BattleGround System - Tierra Gorge Entrance NPCs
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 

npc/events/gdevent_aru.txt

@@ -45,7 +45,7 @@ OnEnable:
 	}
 	end;
 
-Onkill:
+OnKill:
 	killmonster "arug_dun01","Monster Controler1#aru::OnMyMObDead";
 	end;
 
@@ -676,7 +676,7 @@ arug_que01,100,81,3	script	Pierrot Pier#aru_gd	715,{
 			mes "Let me see...";
 			next;
 			if (countitem(6031) > 0) {
-				donpcevent "Controller#gdevent_a::Onstop";
+				donpcevent "Controller#gdevent_a::OnStop";
 				set $@gdeventv_a2,3;
 				donpcevent "eff_mvp#aru_gd::Onmvp";
 				mes "[Pierrot Pier]";
@@ -818,7 +818,7 @@ arug_que01,100,81,3	script	Pierrot Pier#aru_gd	715,{
 			mes "Let me see.";
 			next;
 			if (countitem(6031) > 0) {
-				donpcevent "Controller#gdevent_a::Onstop";
+				donpcevent "Controller#gdevent_a::OnStop";
 				set $@gdeventv_a2,3;
 				donpcevent "eff_mvp#aru_gd::Onmvp";
 				mes "[Pierrot Pier]";
@@ -928,7 +928,7 @@ arug_que01,100,81,3	script	Pierrot Pier#aru_gd	715,{
 			mes "Let me see...";
 			next;
 			if (countitem(6031) > 0) {
-				donpcevent "Controller#gdevent_a::Onstop";
+				donpcevent "Controller#gdevent_a::OnStop";
 				set $@gdeventv_a2,3;
 				donpcevent "eff_mvp#aru_gd::Onmvp";
 				mes "[Pierrot Pier]";
@@ -985,14 +985,14 @@ arug_que01,100,81,3	script	Pierrot Pier#aru_gd	715,{
 		}
 		else {
 			mes "[Pierrot Pier]";
-			mes "Voc� encontrou o tesouro?";
-			mes "Mostre-me o que voc� tem nas m�os agora.";
+			mes "Did you find the treasure?";
+			mes "Show me that thing you are holding, now!";
 			next;
 			mes "[Pierrot Pier]";
-			mes "Deixe-me ver...";
+			mes "Let me see...";
 			next;
 			if (countitem(6031) > 0) {
-				donpcevent "Controller#gdevent_a::Onstop";
+				donpcevent "Controller#gdevent_a::OnStop";
 				set $@gdeventv_a2,3;
 				donpcevent "eff_mvp#aru_gd::Onmvp";
 				mes "[Pierrot Pier]";
@@ -1042,35 +1042,35 @@ Ongame_start:
 	donpcevent "paper_sp_9_a::OnEnable";
 	set .@roulette_where,rand(1,9);
 	if (.@roulette_where == 1) {
-		donpcevent "paper_sp_1_a::Onbingo";
+		donpcevent "paper_sp_1_a::OnBingo";
 	}
 	else if (.@roulette_where == 2) {
-		donpcevent "paper_sp_2_a::Onbingo";
+		donpcevent "paper_sp_2_a::OnBingo";
 	}
 	else if (.@roulette_where == 3) {
-		donpcevent "paper_sp_3_a::Onbingo";
+		donpcevent "paper_sp_3_a::OnBingo";
 	}
 	else if (.@roulette_where == 4) {
-		donpcevent "paper_sp_4_a::Onbingo";
+		donpcevent "paper_sp_4_a::OnBingo";
 	}
 	else if (.@roulette_where == 5) {
-		donpcevent "paper_sp_5_a::Onbingo";
+		donpcevent "paper_sp_5_a::OnBingo";
 	}
 	else if (.@roulette_where == 6) {
-		donpcevent "paper_sp_6_a::Onbingo";
+		donpcevent "paper_sp_6_a::OnBingo";
 	}
 	else if (.@roulette_where == 7) {
-		donpcevent "paper_sp_7_a::Onbingo";
+		donpcevent "paper_sp_7_a::OnBingo";
 	}
 	else if (.@roulette_where == 8) {
-		donpcevent "paper_sp_8_a::Onbingo";
+		donpcevent "paper_sp_8_a::OnBingo";
 	}
 	else {
-		donpcevent "paper_sp_9_a::Onbingo";
+		donpcevent "paper_sp_9_a::OnBingo";
 	}
 	end;
 
-Onstop:
+OnStop:
 	stopnpctimer;
 	end;
 
@@ -1108,7 +1108,7 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x1,rand(81,95);
 	set .@paper_y1,rand(87,100);
 	makeitem 6031,1,"arug_que01",.@paper_x1,.@paper_y1; //Glitering_PaperB
@@ -1133,7 +1133,7 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x2,rand(96,110);
 	set .@paper_y2,rand(87,100);
 	makeitem 6031,1,"arug_que01",.@paper_x2,.@paper_y2; //Glitering_PaperB
@@ -1158,7 +1158,7 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x3,rand(111,124);
 	set .@paper_y3,rand(87,100);
 	makeitem 6031,1,"arug_que01",.@paper_x3,.@paper_y3; //Glitering_PaperB
@@ -1183,7 +1183,7 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x4,rand(81,95);
 	set .@paper_y4,rand(73,86);
 	makeitem 6031,1,"arug_que01",.@paper_x4,.@paper_y4; //Glitering_PaperB
@@ -1208,7 +1208,7 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x5,rand(96,110);
 	set .@paper_y5,rand(73,86);
 	makeitem 6031,1,"arug_que01",.@paper_x5,.@paper_y5; //Glitering_PaperB
@@ -1233,7 +1233,7 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x6,rand(111,124);
 	set .@paper_y6,rand(73,86);
 	makeitem 6031,1,"arug_que01",.@paper_x6,.@paper_y6; //Glitering_PaperB
@@ -1258,7 +1258,7 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x7,rand(81,95);
 	set .@paper_y7,rand(59,72);
 	makeitem 6031,1,"arug_que01",.@paper_x7,.@paper_y7; //Glitering_PaperB
@@ -1283,7 +1283,7 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x8,rand(96,110);
 	set .@paper_y8,rand(59,72);
 	makeitem 6031,1,"arug_que01",.@paper_x8,.@paper_y8; //Glitering_PaperB
@@ -1308,7 +1308,7 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x9,rand(111,124);
 	set .@paper_y9,rand(59,72);
 	makeitem 6031,1,"arug_que01",.@paper_x9,.@paper_y9; //Glitering_PaperB

npc/events/gdevent_sch.txt

@@ -45,7 +45,7 @@ OnEnable:
 	}
 	end;
 
-Onkill:
+OnKill:
 	killmonster "schg_dun01","Monster Controler1#sch::OnMyMObDead";
 	end;
 
@@ -675,7 +675,7 @@ schg_que01,100,81,3	script	Pierrot Pier#sch_gd	715,{
 			mes "Let me see...";
 			next;
 			if (countitem(6031) > 0) {
-				donpcevent "Controller#gdevent_s::Onstop";
+				donpcevent "Controller#gdevent_s::OnStop";
 				set $@gdeventv_s2,3;
 				donpcevent "eff_mvp#sch_gd::Onmvp";
 				mes "[Pierrot Pier]";
@@ -817,7 +817,7 @@ schg_que01,100,81,3	script	Pierrot Pier#sch_gd	715,{
 			mes "Let me see.";
 			next;
 			if (countitem(6031) > 0) {
-				donpcevent "Controller#gdevent_s::Onstop";
+				donpcevent "Controller#gdevent_s::OnStop";
 				set $@gdeventv_s2,3;
 				donpcevent "eff_mvp#sch_gd::Onmvp";
 				mes "[Pierrot Pier]";
@@ -927,7 +927,7 @@ schg_que01,100,81,3	script	Pierrot Pier#sch_gd	715,{
 			mes "Let me see...";
 			next;
 			if (countitem(6031) > 0) {
-				donpcevent "Controller#gdevent_s::Onstop";
+				donpcevent "Controller#gdevent_s::OnStop";
 				set $@gdeventv_s2,3;
 				donpcevent "eff_mvp#sch_gd::Onmvp";
 				mes "[Pierrot Pier]";
@@ -984,14 +984,14 @@ schg_que01,100,81,3	script	Pierrot Pier#sch_gd	715,{
 		}
 		else {
 			mes "[Pierrot Pier]";
-			mes "Voc� encontrou o tesouro?";
-			mes "Mostre-me o que voc� tem nas m�os agora.";
+			mes "Did you find the treasure?";
+			mes "Show me that thing you are holding, now!";
 			next;
 			mes "[Pierrot Pier]";
-			mes "Deixe-me ver...";
+			mes "Let me see...";
 			next;
 			if (countitem(6031) > 0) {
-				donpcevent "Controller#gdevent_s::Onstop";
+				donpcevent "Controller#gdevent_s::OnStop";
 				set $@gdeventv_s2,3;
 				donpcevent "eff_mvp#sch_gd::Onmvp";
 				mes "[Pierrot Pier]";
@@ -1041,35 +1041,35 @@ Ongame_start:
 	donpcevent "paper_sp_9_s::OnEnable";
 	set .@roulette_where,rand(1,9);
 	if (.@roulette_where == 1) {
-		donpcevent "paper_sp_1_s::Onbingo";
+		donpcevent "paper_sp_1_s::OnBingo";
 	}
 	else if (.@roulette_where == 2) {
-		donpcevent "paper_sp_2_s::Onbingo";
+		donpcevent "paper_sp_2_s::OnBingo";
 	}
 	else if (.@roulette_where == 3) {
-		donpcevent "paper_sp_3_s::Onbingo";
+		donpcevent "paper_sp_3_s::OnBingo";
 	}
 	else if (.@roulette_where == 4) {
-		donpcevent "paper_sp_4_s::Onbingo";
+		donpcevent "paper_sp_4_s::OnBingo";
 	}
 	else if (.@roulette_where == 5) {
-		donpcevent "paper_sp_5_s::Onbingo";
+		donpcevent "paper_sp_5_s::OnBingo";
 	}
 	else if (.@roulette_where == 6) {
-		donpcevent "paper_sp_6_s::Onbingo";
+		donpcevent "paper_sp_6_s::OnBingo";
 	}
 	else if (.@roulette_where == 7) {
-		donpcevent "paper_sp_7_s::Onbingo";
+		donpcevent "paper_sp_7_s::OnBingo";
 	}
 	else if (.@roulette_where == 8) {
-		donpcevent "paper_sp_8_s::Onbingo";
+		donpcevent "paper_sp_8_s::OnBingo";
 	}
 	else {
-		donpcevent "paper_sp_9_s::Onbingo";
+		donpcevent "paper_sp_9_s::OnBingo";
 	}
 	end;
 
-Onstop:
+OnStop:
 	stopnpctimer;
 	end;
 
@@ -1107,7 +1107,7 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x1,rand(81,95);
 	set .@paper_y1,rand(87,100);
 	makeitem 6031,1,"schg_que01",.@paper_x1,.@paper_y1; //Glitering_PaperB
@@ -1132,7 +1132,7 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x2,rand(96,110);
 	set .@paper_y2,rand(87,100);
 	makeitem 6031,1,"schg_que01",.@paper_x2,.@paper_y2; //Glitering_PaperB
@@ -1157,7 +1157,7 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x3,rand(111,124);
 	set .@paper_y3,rand(87,100);
 	makeitem 6031,1,"schg_que01",.@paper_x3,.@paper_y3; //Glitering_PaperB
@@ -1182,7 +1182,7 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x4,rand(81,95);
 	set .@paper_y4,rand(73,86);
 	makeitem 6031,1,"schg_que01",.@paper_x4,.@paper_y4; //Glitering_PaperB
@@ -1207,7 +1207,7 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x5,rand(96,110);
 	set .@paper_y5,rand(73,86);
 	makeitem 6031,1,"schg_que01",.@paper_x5,.@paper_y5; //Glitering_PaperB
@@ -1232,7 +1232,7 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x6,rand(111,124);
 	set .@paper_y6,rand(73,86);
 	makeitem 6031,1,"schg_que01",.@paper_x6,.@paper_y6; //Glitering_PaperB
@@ -1257,7 +1257,7 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x7,rand(81,95);
 	set .@paper_y7,rand(59,72);
 	makeitem 6031,1,"schg_que01",.@paper_x7,.@paper_y7; //Glitering_PaperB
@@ -1282,7 +1282,7 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x8,rand(96,110);
 	set .@paper_y8,rand(59,72);
 	makeitem 6031,1,"schg_que01",.@paper_x8,.@paper_y8; //Glitering_PaperB
@@ -1307,7 +1307,7 @@ OnEnable:
 	}
 	end;
 
-Onbingo:
+OnBingo:
 	set .@paper_x9,rand(111,124);
 	set .@paper_y9,rand(59,72);
 	makeitem 6031,1,"schg_que01",.@paper_x9,.@paper_y9; //Glitering_PaperB

npc/events/god_se_festival.txt

@@ -121,7 +121,7 @@ yuno,118,192,5	script	Rmimi Ravies#gq_fes01	891,{
 				next;
 				mes "[Rmimi Ravies]";
 				mes "Have a good time.";
-				donpcevent "Rmimi Ravies#gq_fes01::Onstart";
+				donpcevent "Rmimi Ravies#gq_fes01::OnStart";
 				
 				announce "["+ strcharinfo(0) +"] member of ["+ GetGuildName(.@GID) +"] is summoning a 'Valkyrie's Present' in 'Juno'.",bc_all,"0x70dbdb";
 				close;
@@ -166,7 +166,7 @@ OnDisable:
 	disablenpc "Rmimi Ravies#gq_fes01";
 	end;
 
-Onstart:
+OnStart:
 	initnpctimer;
 	set $@gqse_festival,1;
 	end;
@@ -392,11 +392,6 @@ OnTimer3900000:
 	end;
 }
 
-//===============================================================================================
-//                                             Rachel                                              
-//===============================================================================================
-
-//-------------------------------------Rachel Festival Manager-----------------------------------
 /*
 rachel,1,1,0	script	Festival Manager#god_se_fes02	891,{
 	mes "[Festival Manager]";
@@ -428,7 +423,6 @@ rachel,1,1,0	script	Festival Manager#god_se_fes02	891,{
 	}
 }
 */
-//----------------------------------------Rhehe Ravies----------------------------------------
 
 rachel,132,117,3	script	Rhehe Ravies#gq_fes03	891,{
 	set .@GID, getcharid(2);
@@ -509,7 +503,7 @@ rachel,132,117,3	script	Rhehe Ravies#gq_fes03	891,{
 				next;
 				mes "[Rhehe Ravies]";
 				mes "I hope you enjoy yourself!";
-				donpcevent "Rhehe Ravies#gq_fes03::Onstart";
+				donpcevent "Rhehe Ravies#gq_fes03::OnStart";
 				announce "["+ strcharinfo(0) +"] member of ["+ GetGuildName(.@GID) +"] is summoning a 'Valkyrie's Present' in 'Rachel'.",bc_all,"0x70dbdb";
 				close;
 			}
@@ -554,7 +548,7 @@ OnDisable:
 	disablenpc "Rhehe Ravies#gq_fes03";
 	end;
 
-Onstart:
+OnStart:
 	initnpctimer;
 	set $@gqse_festival,1;
 	end;

npc/jobs/2-1/blacksmith.txt

@@ -702,7 +702,7 @@ ein_in01,201,27,3	script	Guildsman#alberta	63,{
 					mes "Anyway, take this";
 					mes "to ^8E6B23Wickebine^000000 in Morroc of Rune-Midgarts Kingdom,";
 					break;
-				Case 11:
+				case 11:
 					mes "Okay, now take this to ^8E6B23Krongast^000000 in Lighthalzen. Simply deliver it and bring me the receipt.";
 					getitem 1119,1; //Tsurugi
 					if(checkquest(2005) != -1) {

npc/jobs/2-2/crusader.txt

@@ -221,13 +221,13 @@ prt_castle,45,169,5	script	Senior Crusader	752,{
 			set @item3, 1099;
 			set @item4, 901;
 			break;
-		Case 2:
+		case 2:
 			set @item1, 932;
 			set @item2, 1043;
 			set @item3, 1098;
 			set @item4, 1094;
 			break;
-		Case 3:
+		case 3:
 			set @item1, 958;
 			set @item2, 930;
 			set @item3, 1041;

npc/kafras/functions_kafras.txt

@@ -478,7 +478,7 @@ function	script	F_SetKafCode	{
 		mes "Your storage is protected with a password. What would you do now?";
 		next;
 		switch (select("Change old password -> 5000z:Remove storage password -> 1000z:Cancel")) {
-			Case 1:
+			case 1:
 				mes getarg(0);
 				mes "At first, please enter your ^0000FFold password^000000.";
 				set @code,callfunc("F_EntKafCode");
@@ -490,7 +490,7 @@ function	script	F_SetKafCode	{
 				next;
 				callsub S_SET,getarg(0),getarg(1);
 				break;
-			Case 2:
+			case 2:
 				mes getarg(0);
 				mes "Please, enter your password before its removal.";
 				set @code,callfunc("F_EntKafCode");
@@ -518,7 +518,7 @@ function	script	F_SetKafCode	{
 					emotion e_sry;
 				}
 				break;
-			Case 3:
+			case 3:
 				break;
 		}
 	} else {
@@ -526,8 +526,8 @@ function	script	F_SetKafCode	{
 		mes "Additional storage protection with a password.";
 		next;
 		switch (select("Set new password -> 5000z:Cancel")) {
-			Case 1: callsub S_SET,getarg(0),getarg(1); break;
-			Case 2: break;		
+			case 1: callsub S_SET,getarg(0),getarg(1); break;
+			case 2: break;		
 		}
 	}
 	close2;

npc/merchants/hair_dyer.txt

@@ -93,7 +93,7 @@ prt_in,243,168,4	script	Jovovich	91,{
 						case 5: callsub S_NoDye,981,"blue"; break;
 						case 6: callsub S_NoDye,982,"white"; break;
 						case 7: callsub S_NoDye,983,"black"; break;
-						Case 8: callsub S_NoDye,975,"red"; break;
+						case 8: callsub S_NoDye,975,"red"; break;
 						}
 						if (zeny < 1000) {
 							mes "[Hairdresser Jovovich]";

npc/other/monster_race.txt

@@ -22,7 +22,7 @@
 //= 1.6 Updated experience rewards. [L0ne_W0lf]
 //= 1.7 Optimization, -4000 lines (more can still be done). [Euphy]
 //= 1.8 Optimized.
-//= 	Fixed Medal Distributor (Dual Race) disappears accordingly. [Joseph] 
+//=     Fixed Medal Distributor (Dual Race) disappears accordingly. [Joseph] 
 //============================================================
 
 // Monstrer Race - Single Monster Race
@@ -1414,12 +1414,12 @@ p_track02,73,22,1	script	Ticket Helper#2	899,{
 				set .@m, 0;
 				set .@m, select (.@m$);
 				switch (.@m) {
-					Case 1: setarray .@w$, "a friendly","Poring type monster"; break;
-					Case 2: setarray .@w$, "an adorable","Lunatic type monster"; break;
-					Case 3: setarray .@w$, "a darling","Savage Babe monster"; break;
-					Case 4: setarray .@w$, "a gentle baby","Desert Wolf monster"; break;
-					Case 5: setarray .@w$, "a small, yet","demonic, Deviruchi"; break;
-					Case 6: setarray .@w$, "a naughty","Baphomet Jr. monster"; break;
+					case 1: setarray .@w$, "a friendly","Poring type monster"; break;
+					case 2: setarray .@w$, "an adorable","Lunatic type monster"; break;
+					case 3: setarray .@w$, "a darling","Savage Babe monster"; break;
+					case 4: setarray .@w$, "a gentle baby","Desert Wolf monster"; break;
+					case 5: setarray .@w$, "a small, yet","demonic, Deviruchi"; break;
+					case 6: setarray .@w$, "a naughty","Baphomet Jr. monster"; break;
 				}
 				mes "[Ticket Helper]";
 				mes "You've chosen";
@@ -2283,54 +2283,54 @@ ein_in01,85,208,5	script	Ei'felle#repay01	854,{
 		mes "that you want me to create.";
 		next;
 		switch (.@m) {
-			Case 0:
+			case 0:
 				setarray .@mw$, "Ginnungagap:Grimtooth:Dragon Killer:Mail Breaker:Bazerald:Sword Breaker:Ice Pick:Sucsamad:Kitchen Knife:Azoth:Exorciser:Assassin Dagger:Moonlight Dagger:Weeder Knife:Cursed Dagger:Dagger of Counter:Combat Knife:Fortune Sword";
 				setarray .@mw, 13002,1237,13001,1225,1231,1224,1230,1236,1229,1235,1233,1232,1234,1227,1241,1242,1228,1223;
 				break;
-			Case 1:
+			case 1:
 				setarray .@mw$, "Nagan:Immaterial Sword:Mysteltainn:Byeollungum:Star Dust Blade:Caesar's Sword:Ice Falchion:Excalibur:Edge:Cutlus:Solar Sword:Tirfing:Fireblend";
 				setarray .@mw, 1130,1141,1138,1140,1148,1134,1131,1137,1132,1135,1136,1139,1133;
 				break;
-			Case 2:	
+			case 2:	
 				setarray .@mw$, "Dragon Slayer:Masamune:Muramasa:Schweizersabel:Executioner:Zweihander:Katzbalger";
 				setarray .@mw, 1166,1165,1164,1167,1169,1168,1170;
 				break;
-			Case 3:
+			case 3:
 				setarray .@mw$, "Great Axe:Guillotine:Light Epsilon:Bloody Axe:Sabbath:Slaughter:Cleaver:Tomahawk";
 				setarray .@mw, 1364,1369,1366,1363,1365,1367,1305,1368;
 				break;
-			Case 4:
+			case 4:
 				setarray .@mw$, "Golden Mace:Grand Cross:Long Mace:Spike:Slash:Quadrille";
 				setarray .@mw, 1524,1528,1525,1523,1526,1527;
 				break;
-			Case 5:
+			case 5:
 				setarray .@mw$, "Roguemaster's Bow:Dragon Wing:Rudra's Bow:Ballista";
 				setarray .@mw, 1719,1724,1720,1722;
 				break;
-			Case 6:
+			case 6:
 				setarray .@mw$, "Wing Staff:Wizardry Staff";
 				setarray .@mw, 1616,1473;
-			Case 7:
+			case 7:
 				setarray .@mw$, "Legacy of Dragon:Book of the Apocalypse:Girl's Diary:Hardcover Book";
 				setarray .@mw, 1559,1557,1558,1561;
 				break;
-			Case 8:
+			case 8:
 				setarray .@mw$, "Gae Bolg:Gelerdria:Gungnir:Skewer:Longinus's Spear:Brionac:Bill Guisarme:Zephyrus:Crescent Scythe:Tjungkuletti:Hellfire";
 				setarray .@mw, 1474,1414,1413,1415,1469,1470,1467,1468,1466,1416,1471;
 				break;
-			Case 9:
+			case 9:
 				setarray .@mw$, "Infiltrator:Bloody Roar:Unholy Touch";
 				setarray .@mw, 1261,1265,1263;
 				break;
-			Case 10:
+			case 10:
 				setarray .@mw$, "Hatii Claw:Berserk:Kaiser Knuckle";
 				setarray .@mw, 1815,1814,1813;
 				break;
-			Case 11:
+			case 11:
 				setarray .@mw$, "Lariat:Rapture Rose:Blade Whip:Chemeti:Queen's Whip";
 				setarray .@mw, 1962,1963,1969,1964,1970;
 				break;
-			Case 12:
+			case 12:
 				setarray .@mw$, "Oriental Lute:Electric Guitar";
 				setarray .@mw, 1918,1913;
 				break;		
@@ -2704,35 +2704,35 @@ hugel,71,83,4	script	Wayne	900,{
 			set .@m$, .@m$ + .@pm[.@i] + " Prize medal:";
 		set .@m, select (.@m$) - 1;
 		switch (.@m) {
-			Case 0: 
+			case 0: 
 				setarray .@mr$, "2 Hinale Leaflets:2 Aloe Leaflets:1 Mastela Fruit:5 Witch Starsands:4 Condensed Red Potions";
 				setarray .@mr, 520,2,521,2,522,1,1061,5,545,4;
 				break;
-			Case 1:
+			case 1:
 				setarray .@mr$, "1 Royal Jelly:6 Holy Waters";
 				setarray .@mr, 526,1,523,6;
 				break;
-			Case 2:
+			case 2:
 				setarray .@mr$, "1 Cookie Bag:1 First Aid Kit";
 				setarray .@mr, 12130,1,12110,1;
 				break;
-			Case 3:
+			case 3:
 				set .@mr$, "1 Gift Box";
 				setarray .@mr, 644,1;
 				break;
-			Case 4:
+			case 4:
 				set .@mr$, "1 Old Blue Box";
 				setarray .@mr, 603,1;
 				break;
-			Case 5:
+			case 5:
 				set .@mr$, "1 Taming Gift Set";
 				setarray .@mr, 12105,1;
 				break;
-			Case 6:
+			case 6:
 				set .@mr$, "1 Old Purple Box";
 				setarray .@mr, 617,1;
 				break;
-			Case 7:
+			case 7:
 				set .@mr$, "1 Poring Box";
 				setarray .@mr, 12109,1;
 				break;

npc/other/poring_war.txt

@@ -907,7 +907,7 @@ OnReset:
 	stopnpctimer;
 	end;
 
-Onstart:
+OnStart:
 	initnpctimer;
 	end;
 

npc/other/turbo_track.txt

@@ -378,8 +378,8 @@ OnTimer927000:
 	}
 	enablenpc "No_Unfair_Start#"+.@w$+"-1";
 	enablenpc "No_Unfair_Start#"+.@w$+"-2";
-	donpcevent "snake#"+.@w$+"::Onreset";
-	donpcevent "hunting#"+.@w$+"::Onreset";
+	donpcevent "snake#"+.@w$+"::OnReset";
+	donpcevent "hunting#"+.@w$+"::OnReset";
 	disablenpc "bing2#"+.@w$;
 	disablenpc "Winner Helper#TBT_"+.@w$;
 	enablenpc "#cos_"+.@w$+"_end";
@@ -433,9 +433,9 @@ turbo_n_1,68,379,5	duplicate(NoUnfair#tt_main)	No_Unfair_Start#n1-2	-1,5,31
 -	script	LogTrap#tt_main	-1,{
 OnTouch:
 	switch (rand(1,3)) {
-		Case 1: warp strnpcinfo(4),72,372; end;
-		Case 2: warp strnpcinfo(4),72,365; end;
-		Case 3: warp strnpcinfo(4),72,357; end;
+		case 1: warp strnpcinfo(4),72,372; end;
+		case 2: warp strnpcinfo(4),72,365; end;
+		case 3: warp strnpcinfo(4),72,357; end;
 	}
 }
 turbo_e_4,118,377,0	duplicate(LogTrap#tt_main)	trap_a#e4-1	-1,44,1
@@ -988,25 +988,25 @@ turbo_n_1,148,357,0	duplicate(LogTrap#tt_main)	trap_d#n1-15	-1,1,2
 -	script	SandTrap#tt_main	-1,{
 OnTouch:
 	switch(rand(1,10)) {
-		Case 1:
-		Case 9:
+		case 1:
+		case 9:
 			sc_start SC_CONFUSION,8000,0;
 			emotion e_swt2,1;
 			end;
-		Case 2:
+		case 2:
 			sc_start SC_STONE,4000,0;
 			end;
-		Case 4:
+		case 4:
 			sc_start SC_SLEEP,4000,0;
 			end;
-		Case 6:
+		case 6:
 			sc_start SC_FREEZE,4000,0;
 			emotion e_swt2,1;
 			end;
-		Case 8:
+		case 8:
 			sc_start SC_STUN,4000,0;
 			end;
-		Case 10:
+		case 10:
 			sc_start SC_CURSE,80000,0;
 			end;
 	}
@@ -1679,7 +1679,7 @@ turbo_n_1,332,270,0	duplicate(snake04#tt_main)	snake04#n1	45,1,1
 -	script	SnakeHunt#tt_main	-1,{
 	end;
 	
-Onreset:
+OnReset:
 	killmonsterall strnpcinfo(4);
 	end;
 
@@ -1719,39 +1719,39 @@ turbo_n_1,90,46,0	duplicate(SnakeHunt#tt_main)	hunting#n1	111
 OnTouch:
 	set .@n, charat(strnpcinfo(2),getstrlen(strnpcinfo(2))-1);
 	switch (.@n) {
-		Case 1:
+		case 1:
 			mapannounce strnpcinfo(4),strcharinfo(0) +" has just passed the Log Bridge course!",bc_map,"0x70DBDB";
 			switch (rand(1,3)) {
-				Case 1: warp strnpcinfo(4),210,369; end;
-				Case 2: warp strnpcinfo(4),210,361; end;
-				Case 3: warp strnpcinfo(4),210,354; end;
+				case 1: warp strnpcinfo(4),210,369; end;
+				case 2: warp strnpcinfo(4),210,361; end;
+				case 3: warp strnpcinfo(4),210,354; end;
 			}
-		Case 2:
+		case 2:
 			mapannounce strnpcinfo(4),strcharinfo(0) +" has just passed the Cube Hills course!",bc_map,"0x70DBDB";
 			warp strnpcinfo(4),316,365;
 			end;		
-		Case 3:
+		case 3:
 			mapannounce strnpcinfo(4),strcharinfo(0) +" has just passed the Cursed Desert!",bc_map,"0x70DBDB";
 			switch (rand(1,4)) {
-				Case 1: warp strnpcinfo(4),46,254; end;
-				Case 2: warp strnpcinfo(4),76,227; end;
-				Case 3: warp strnpcinfo(4),42,197; end;
-				Case 4: warp strnpcinfo(4),86,220; end;
+				case 1: warp strnpcinfo(4),46,254; end;
+				case 2: warp strnpcinfo(4),76,227; end;
+				case 3: warp strnpcinfo(4),42,197; end;
+				case 4: warp strnpcinfo(4),86,220; end;
 			}
-		Case 5:
+		case 5:
 			mapannounce strnpcinfo(4),strcharinfo(0) +" has just passed the Single Snail course!",bc_map,"0x70DBDB";
 			warp strnpcinfo(4),268,275;
 			end;
-		Case 6:
+		case 6:
 			mapannounce strnpcinfo(4),strcharinfo(0) +" has just passed the Snake Dice course!",bc_map,"0x70DBDB";
 			warp strnpcinfo(4),5,91;
 			end;
-		Case 7:
+		case 7:
 			mapannounce strnpcinfo(4),strcharinfo(0) +" has just passed the Small Cave course! Hurry, you're almost at the finish!",bc_map,"0x70DBDB";
 			switch(rand(1,3)) {
-				Case 1: warp strnpcinfo(4),307,52; end;
-				Case 2: warp strnpcinfo(4),307,46; end;
-				Case 3: warp strnpcinfo(4),307,40; end;
+				case 1: warp strnpcinfo(4),307,52; end;
+				case 2: warp strnpcinfo(4),307,46; end;
+				case 3: warp strnpcinfo(4),307,40; end;
 			}
 	}
 }
@@ -2479,8 +2479,8 @@ OnTimer60000:
 		disablenpc "Flasher_Exit_2#"+.@w$;
 		enablenpc "No_Unfair_Start#"+.@w$+"-1";
 		enablenpc "No_Unfair_Start#"+.@w$+"-2";
-		donpcevent "snake#"+.@w$+"::Onreset";
-		donpcevent "hunting#"+.@w$+"::Onreset";
+		donpcevent "snake#"+.@w$+"::OnReset";
+		donpcevent "hunting#"+.@w$+"::OnReset";
 		donpcevent RName(.@w$)+"::OnEnable";
 		disablenpc "bing2#"+.@w$;
 		enablenpc "#cos_"+.@w$+"_end";
@@ -2515,8 +2515,8 @@ OnTimer71000:
 		enablenpc "Flasher_Exit_2#"+.@w$;
 		enablenpc "No_Unfair_Start#"+.@w$+"-1";
 		enablenpc "No_Unfair_Start#"+.@w$+"-2";
-		donpcevent "snake#"+.@w$+"::Onreset";
-		donpcevent "hunting#"+.@w$+"::Onreset";
+		donpcevent "snake#"+.@w$+"::OnReset";
+		donpcevent "hunting#"+.@w$+"::OnReset";
 		donpcevent RName(.@w$)+"::OnEnable";
 		disablenpc "bing2#"+.@w$;
 		stopnpctimer;
@@ -2744,8 +2744,8 @@ OnTimer60000:
 	disablenpc "Flasher_Exit_2#"+.@w$;
 	enablenpc "No_Unfair_Start#"+.@w$+"-1";
 	enablenpc "No_Unfair_Start#"+.@w$+"-2";
-	donpcevent "snake#"+.@w$+"::Onreset";
-	donpcevent "hunting#"+.@w$+"::Onreset";
+	donpcevent "snake#"+.@w$+"::OnReset";
+	donpcevent "hunting#"+.@w$+"::OnReset";
 	donpcevent "Solo Mode#"+.@w$+"::OnEnable";
 	stopnpctimer;
 	end;
@@ -2760,7 +2760,7 @@ OnInit:
 OnTouch:
 	set .@w$,callfunc("F_tt");
 	mapannounce strnpcinfo(4),strcharinfo(0) +" is now entering the Small Cave! " + strcharinfo(0) +" is now in the lead!",bc_map,"0xFFFF00";
-	donpcevent "TBT_Guide#Broadcast::Onend_"+.@w$;
+	donpcevent "TBT_Guide#Broadcast::OnEnd_"+.@w$;
 	disablenpc "Notice_Maker1#TBT_"+.@w$;
 	end;
 	
@@ -2821,12 +2821,12 @@ turbo_n_1,226,15,0	duplicate(NMaker4#tt_main)	Notice_Maker4#TBT_n1	-1,3,3
 -	script	warp#tt_main	-1,{
 OnTouch:
 	switch (rand(1,20)) {
-		Case 1: warp strnpcinfo(4),216,378; break;
-		Case 2: warp strnpcinfo(4),218,360; break;
-		Case 3: warp strnpcinfo(4),223,361; break;
-		Case 4: warp strnpcinfo(4),243,342; break;
-		Case 5: warp strnpcinfo(4),247,364; break;
-		Default: break;
+		case 1: warp strnpcinfo(4),216,378; break;
+		case 2: warp strnpcinfo(4),218,360; break;
+		case 3: warp strnpcinfo(4),223,361; break;
+		case 4: warp strnpcinfo(4),243,342; break;
+		case 5: warp strnpcinfo(4),247,364; break;
+		default: break;
 	}
 	end;
 }
@@ -3613,13 +3613,13 @@ turbo_n_16,217,214,0	duplicate(bing_1#tt_main)	bing#n16	45,3,3
 	end;
 OnTouch:
 	switch (rand(1,10)) {
-		Case 1: warp strnpcinfo(4),217,232; break;
-		Case 2: warp strnpcinfo(4),233,207; break;
-		Case 3: warp strnpcinfo(4),208,219; break;
-		Case 4: warp strnpcinfo(4),219,202; break;
-		Case 5: warp strnpcinfo(4),218,228; break;
-		Case 6: warp strnpcinfo(4),220,195; break;
-		Default: break;
+		case 1: warp strnpcinfo(4),217,232; break;
+		case 2: warp strnpcinfo(4),233,207; break;
+		case 3: warp strnpcinfo(4),208,219; break;
+		case 4: warp strnpcinfo(4),219,202; break;
+		case 5: warp strnpcinfo(4),218,228; break;
+		case 6: warp strnpcinfo(4),220,195; break;
+		default: break;
 	}
 	end;
 	
@@ -3896,31 +3896,31 @@ OnInit:
 	}
 	end;
 
-Onend_n1:
+OnEnd_n1:
 	mapannounce "turbo_room","A [Normal Mode - Solo] game will end shortly.",bc_map,"0xadff2f";
 	end;
 
-Onend_n4:
+OnEnd_n4:
 	mapannounce "turbo_room","A [Normal Mode - 4 Person] game will end shortly.",bc_map,"0xadff2f";
 	end;
 
-Onend_n8:
+OnEnd_n8:
 	mapannounce "turbo_room","A [Normal Mode - 8 Person] game will end shortly.",bc_map,"0xadff2f";
 	end;
 
-Onend_n16:
+OnEnd_n16:
 	mapannounce "turbo_room","A [Normal Mode - 16 Person] game will end shortly.",bc_map,"0xadff2f";
 	end;
 
-Onend_e4:
+OnEnd_e4:
 	mapannounce "turbo_room","A [Expert Mode - 4 Person] game will end shortly.",bc_map,"0xadff2f";
 	end;
 
-Onend_e8:
+OnEnd_e8:
 	mapannounce "turbo_room","A [Expert Mode - 8 Person] game will end shortly.",bc_map,"0xadff2f";
 	end;
 
-Onend_e16:
+OnEnd_e16:
 	mapannounce "turbo_room","A [Expert Mode - 16 Person] game will end shortly.",bc_map,"0xadff2f";
 	end;
 

npc/pre-re/mobs/dungeons/lhz_dun.txt

@@ -229,52 +229,52 @@ OnInit:
 
 OnTimer6000000:
 	if (rand(1,6) == 1) {
-		donpcevent "summon_boss_lt::Onsummon";
+		donpcevent "summon_boss_lt::OnSummon";
 		stopnpctimer;
 	}
 	end;
 
 OnTimer6300000:
 	if (rand(1,6) == 2) {
-		donpcevent "summon_boss_lt::Onsummon";
+		donpcevent "summon_boss_lt::OnSummon";
 		stopnpctimer;
 	}
 	end;
 
 OnTimer6600000:
 	if (rand(1,6) == 3) {
-		donpcevent "summon_boss_lt::Onsummon";
+		donpcevent "summon_boss_lt::OnSummon";
 		stopnpctimer;
 	}
 	end;
 
 OnTimer6900000:
 	if (rand(1,6) == 4) {
-		donpcevent "summon_boss_lt::Onsummon";
+		donpcevent "summon_boss_lt::OnSummon";
 		stopnpctimer;
 	}
 	end;
 
 OnTimer7200000:
 	if (rand(1,6) == 5) {
-		donpcevent "summon_boss_lt::Onsummon";
+		donpcevent "summon_boss_lt::OnSummon";
 		stopnpctimer;
 	}
 	end;
 
 OnTimer7500000:
 	if (rand(1,6) == 6) {
-		donpcevent "summon_boss_lt::Onsummon";
+		donpcevent "summon_boss_lt::OnSummon";
 		stopnpctimer;
 	}
 	end;
 
 OnTimer7800000:
-	donpcevent "summon_boss_lt::Onsummon";
+	donpcevent "summon_boss_lt::OnSummon";
 	stopnpctimer;
 	end;
 
-Onsummon:
+OnSummon:
 	// Select Coordinates to summon a random MVP on
 	switch(rand(1,6)) {
 	case 1: set .@x,140;	set .@y,232;	break;

npc/pre-re/other/arena/arena_lvl60.txt

@@ -1,9 +1,9 @@
 //===== rAthena Script ========================================
-//= Izlude Arena lvl 60
+//= Izlude Arena Level 60
 //===== By: ==================================================
 //= SinSloth
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
@@ -12,23 +12,24 @@
 //= 1.0 First version.
 //= 1.1 Fixed coordinate typo. (bugreport:1663) [L0ne_W0lf]
 //= 1.2 Replaced effect numerics with constants. [Samuray22]
+//= 1.3 Label standardization. [Euphy]
 //============================================================
 
-arena_room,38,88,5	script	lvl 60s Waiting Room	124,{
+arena_room,38,88,5	script	Lv60 Waiting Room	124,{
 	end;
 
 OnInit:
-	waitingroom "Individual; Level 60 to 79",50,"lvl 60s Waiting Room::OnStartArena",1,1000,60,79;
+	waitingroom "Individual; Level 60 to 79",50,"Lv60 Waiting Room::OnStartArena",1,1000,60,79;
 	enablewaitingroomevent;
 	end;
 
 OnStartArena:
 	warpwaitingpc "force_2-1",99,12;
-	donpcevent "arena#60::Onstart";
+	donpcevent "arena#60::OnStart";
 	disablewaitingroomevent;
 	end;
 
-Onstart:
+OnStart:
 	enablewaitingroomevent;
 	end;
 }
@@ -40,7 +41,7 @@ OnInit:
 	set $@mapcount60, 0;
 	end;
 
-Onstart:
+OnStart:
 	initnpctimer;
 	set $arena_min60st,gettime(2);
 	set $arena_sec60st,gettime(1);
@@ -61,7 +62,7 @@ OnTimer5000:
 OnTimer60000:
 	set $@mapcount60, getmapusers ("force_2-1");
 	if ($@mapcount60 == 0) {
-		donpcevent "Minilover#arena::Onfailclearstage";
+		donpcevent "Minilover#arena::OnFailClearStage";
 	}
 	mapannounce "force_2-1","Remaining Time : 5 minutes ",0;
 	end;
@@ -69,7 +70,7 @@ OnTimer60000:
 OnTimer120000:
 	set $@mapcount60, getmapusers ("force_2-1");
 	if ($@mapcount60 == 0) {
-		donpcevent "Minilover#arena::Onfailclearstage";
+		donpcevent "Minilover#arena::OnFailClearStage";
 	}
 	mapannounce "force_2-1","Remaining Time : 4 minutes ",0;
 	end;
@@ -77,7 +78,7 @@ OnTimer120000:
 OnTimer180000:
 	set $@mapcount60, getmapusers ("force_2-1");
 	if ($@mapcount60 == 0) {
-		donpcevent "Minilover#arena::Onfailclearstage";
+		donpcevent "Minilover#arena::OnFailClearStage";
 	}
 	mapannounce "force_2-1","Remaining Time : 3 minutes ",0;
 	end;
@@ -85,7 +86,7 @@ OnTimer180000:
 OnTimer240000:
 	set $@mapcount60, getmapusers ("force_2-1");
 	if ($@mapcount60 == 0) {
-		donpcevent "Minilover#arena::Onfailclearstage";
+		donpcevent "Minilover#arena::OnFailClearStage";
 	}
 	mapannounce "force_2-1","Remaining Time : 2 minutes ",0;
 	end;
@@ -93,7 +94,7 @@ OnTimer240000:
 OnTimer300000:
 	set $@mapcount60, getmapusers ("force_2-1");
 	if ($@mapcount60 == 0) {
-		donpcevent "Minilover#arena::Onfailclearstage";
+		donpcevent "Minilover#arena::OnFailClearStage";
 	}
 	mapannounce "force_2-1","Remaining Time : 1 minute ",0;
 	end;
@@ -117,87 +118,87 @@ OnTimer374000:
 
 OnTimer375000:
 	mapwarp "force_2-1","prt_are_in",126,139,0,0;
-	donpcevent "Minilover#arena::Onfailclearstage";
+	donpcevent "Minilover#arena::OnFailClearStage";
 	end;
 
-Ontimeroff:
+OnTimerOff:
 	stopnpctimer;
 	end;
 
-Onfailclearstage:
- 	donpcevent "cast#60::Ontimeover1";
+OnFailClearStage:
+ 	donpcevent "cast#60::OnTimeOver1";
 	mapwarp "force_2-1","prt_are_in",126,139,0,0;
-	donpcevent "Minilover#arena::Ontimeroff";
-	donpcevent "arena#60::Onreset_all";
-	donpcevent "alloff#60::Onon";
-	donpcevent "lvl 60s Waiting Room::Onstart";
+	donpcevent "Minilover#arena::OnTimerOff";
+	donpcevent "arena#60::OnReset_All";
+	donpcevent "alloff#60::OnEnable";
+	donpcevent "Lv60 Waiting Room::OnStart";
 	end;
 
-On01_start:
+On01_Start:
 	mapannounce "force_2-1","In order to clear this battle, you must kill at least 5 Goblins while dodging Rotar Zairos!",0;
 	end;
 
-On01_end:
+On01_End:
 	mapannounce "force_2-1","A door to the north room has opened!",0;
 	end;
 
-On02_start:
+On02_Start:
 	mapannounce "force_2-1","Escape to the north exit from the monsters!",0;
 	end;
 
-On02_end:
+On02_End:
 	mapannounce "force_2-1","A door to the north room has opened!",0;
 	end;
 
-On03_start:
+On03_Start:
 	mapannounce "force_2-1","In order to clear this battle, you must kill all Mantises!",0;
 	end;
 
-On03_end:
+On03_End:
 	mapannounce "force_2-1","Clear! A door to the east room has opened!",0;
 	end;
 
-On04_start:
+On04_Start:
 	mapannounce "force_2-1","In order to clear this battle, you must kill all non-aggressive monsters while dodging aggressive monsters!",0;
 	end;
 
-On04_end:
+On04_End:
 	mapannounce "force_2-1","A door to the east room has opened!",0;
 	end;
 
-On05_start:
+On05_Start:
 	mapannounce "force_2-1","In order to clear this battle, you must kill all monsters except Hydras and Kaphas!",0;
 	end;
 
-On05_end:
+On05_End:
 	mapannounce "force_2-1","Clear! A door to the south room has opened!",0;
 	end;
 
-On06_start:
+On06_Start:
 	mapannounce "force_2-1","In order to clear this battle, you must kill all Miyabi Dolls and escape to the south exit!",0;
 	end;
 
-On06_end:
+On06_End:
 	mapannounce "force_2-1","A door to the south room has opened!",0;
 	end;
 
-On07_start:
+On07_Start:
 	mapannounce "force_2-1","In order to clear this battle, you must kill all monsters!",0;
 	end;
 
-On07_end:
+On07_End:
 	mapannounce "force_2-1","Clear! A door to the west room has opened!",0;
 	end;
 
-On08_start:
+On08_Start:
 	mapannounce "force_2-1","Please escape to the north exit!",0;
 	end;
 
-On09_start:
+On09_Start:
 	mapannounce "force_2-1","In order to clear this battle, you must defeat a Goblin Leader!",0;
 	end;
 
-On09_end:
+On09_End:
 	mapannounce "force_2-1","Boss Clear! - North exit has opened. Thank you.",0;
 	end;
 
@@ -205,60 +206,60 @@ On09_end:
 
 -	script	arena#60	-1,{
 
-Onreset_01:
-	donpcevent "force_01ex#60::Onreset";
-	donpcevent "force_01mob#60::Onreset";
-	donpcevent "force_02start#60::Onon";
+OnReset_01:
+	donpcevent "force_01ex#60::OnReset";
+	donpcevent "force_01mob#60::OnReset";
+	donpcevent "force_02start#60::OnEnable";
 	enablenpc "force_01_02#60";
 	enablenpc "force_02_03#60";
 	end;
 
-Onreset_02:
-	donpcevent "force_02mob#60::Onreset";
-	donpcevent "force_03start#60::Onon";
+OnReset_02:
+	donpcevent "force_02mob#60::OnReset";
+	donpcevent "force_03start#60::OnEnable";
 	end;
 
-Onreset_03:
+OnReset_03:
 	enablenpc "force_03_04#60";
-	donpcevent "force_04start#60::Onon";
-	donpcevent "force_03ex#60::Onreset";
+	donpcevent "force_04start#60::OnEnable";
+	donpcevent "force_03ex#60::OnReset";
 	end;
 
-Onreset_04:
+OnReset_04:
 	enablenpc "force_04_05#60";
-	donpcevent "force_05start#60::Onon";
-	donpcevent "force_04ex#60::Onreset";
+	donpcevent "force_05start#60::OnEnable";
+	donpcevent "force_04ex#60::OnReset";
 	end;
 
-Onreset_05:
+OnReset_05:
 	enablenpc "force_05_06#60";
-	donpcevent "force_06start#60::Onon";
-	donpcevent "force_05ex#60::Onreset";
-	donpcevent "force_05mob#60::Onreset";
+	donpcevent "force_06start#60::OnEnable";
+	donpcevent "force_05ex#60::OnReset";
+	donpcevent "force_05mob#60::OnReset";
 	end;
 
-Onreset_06:
+OnReset_06:
 	enablenpc "force_06_07#60";
-	donpcevent "force_07start#60::Onon";
-	donpcevent "force_06ex#60::Onreset";
-	donpcevent "force_06mob#60::Onreset";
+	donpcevent "force_07start#60::OnEnable";
+	donpcevent "force_06ex#60::OnReset";
+	donpcevent "force_06mob#60::OnReset";
 	end;
 
-Onreset_07:
+OnReset_07:
 	enablenpc "force_07_08#60";
-	donpcevent "force_08start#60::Onon";
+	donpcevent "force_08start#60::OnEnable";
 	end;
 
-Onreset_08:
-	donpcevent "force_09start#60::Onon";
+OnReset_08:
+	donpcevent "force_09start#60::OnEnable";
 	enablenpc "force_08_09#60";
 	end;
 
-Onreset_09:
+OnReset_09:
 	enablenpc "force_exit#60";
 	end;
 
-Onstart:
+OnStart:
 	disablenpc "force_01_02#60";
 	disablenpc "force_02_03#60";
 	disablenpc "force_03_04#60";
@@ -268,45 +269,45 @@ Onstart:
 	disablenpc "force_07_08#60";
 	disablenpc "force_08_09#60";
 	disablenpc "force_exit#60";
-	donpcevent "Minilover#arena::Ontimeroff";
-	donpcevent "force_01mob#60::Onreset";
-	donpcevent "force_02mob#60::Onreset";
-	donpcevent "force_03mob#60::Onreset";
-	donpcevent "force_04mob#60::Onreset";
-	donpcevent "force_05mob#60::Onreset";
-	donpcevent "force_06mob#60::Onreset";
-	donpcevent "force_07mob#60::Onreset";
-	donpcevent "force_08mob#60::Onreset";
-	donpcevent "force_09mob#60::Onreset";
-	donpcevent "force_01ex#60::Onreset";
-	donpcevent "force_03ex#60::Onreset";
-	donpcevent "force_04ex#60::Onreset";
-	donpcevent "force_05ex#60::Onreset";
-	donpcevent "force_06ex#60::Onreset";
-	donpcevent "force_08ex#60::Onreset";
-	donpcevent "force_09ex#60::Onreset";
+	donpcevent "Minilover#arena::OnTimerOff";
+	donpcevent "force_01mob#60::OnReset";
+	donpcevent "force_02mob#60::OnReset";
+	donpcevent "force_03mob#60::OnReset";
+	donpcevent "force_04mob#60::OnReset";
+	donpcevent "force_05mob#60::OnReset";
+	donpcevent "force_06mob#60::OnReset";
+	donpcevent "force_07mob#60::OnReset";
+	donpcevent "force_08mob#60::OnReset";
+	donpcevent "force_09mob#60::OnReset";
+	donpcevent "force_01ex#60::OnReset";
+	donpcevent "force_03ex#60::OnReset";
+	donpcevent "force_04ex#60::OnReset";
+	donpcevent "force_05ex#60::OnReset";
+	donpcevent "force_06ex#60::OnReset";
+	donpcevent "force_08ex#60::OnReset";
+	donpcevent "force_09ex#60::OnReset";
 	enablenpc "force_08_01#60";
-	donpcevent "force_01start#60::Onon";
-	donpcevent "Minilover#arena::Onstart";
-	end;
-
-Onreset_all:
-	donpcevent "force_01mob#60::Onreset";
-	donpcevent "force_02mob#60::Onreset";
-	donpcevent "force_03mob#60::Onreset";
-	donpcevent "force_04mob#60::Onreset";
-	donpcevent "force_05mob#60::Onreset";
-	donpcevent "force_06mob#60::Onreset";
-	donpcevent "force_07mob#60::Onreset";
-	donpcevent "force_08mob#60::Onreset";
-	donpcevent "force_09mob#60::Onreset";
-	donpcevent "force_01ex#60::Onreset";
-	donpcevent "force_03ex#60::Onreset";
-	donpcevent "force_04ex#60::Onreset";
-	donpcevent "force_05ex#60::Onreset";
-	donpcevent "force_06ex#60::Onreset";
-	donpcevent "force_08ex#60::Onreset";
-	donpcevent "force_09ex#60::Onreset";
+	donpcevent "force_01start#60::OnEnable";
+	donpcevent "Minilover#arena::OnStart";
+	end;
+
+OnReset_All:
+	donpcevent "force_01mob#60::OnReset";
+	donpcevent "force_02mob#60::OnReset";
+	donpcevent "force_03mob#60::OnReset";
+	donpcevent "force_04mob#60::OnReset";
+	donpcevent "force_05mob#60::OnReset";
+	donpcevent "force_06mob#60::OnReset";
+	donpcevent "force_07mob#60::OnReset";
+	donpcevent "force_08mob#60::OnReset";
+	donpcevent "force_09mob#60::OnReset";
+	donpcevent "force_01ex#60::OnReset";
+	donpcevent "force_03ex#60::OnReset";
+	donpcevent "force_04ex#60::OnReset";
+	donpcevent "force_05ex#60::OnReset";
+	donpcevent "force_06ex#60::OnReset";
+	donpcevent "force_08ex#60::OnReset";
+	donpcevent "force_09ex#60::OnReset";
 	end;
 
 }
@@ -314,7 +315,7 @@ Onreset_all:
 force_2-1,62,26,1	script	force_08_01#60	45,1,1,{
 
 OnTouch:
-	donpcevent "Minilover#arena::On01_start";
+	donpcevent "Minilover#arena::On01_Start";
 	warp "force_2-1",40,26;
 	end;
 }
@@ -322,7 +323,7 @@ OnTouch:
 force_2-1,25,44,1	script	force_01_02#60	45,1,1,{
 
 OnTouch:
-	donpcevent "Minilover#arena::On02_start";
+	donpcevent "Minilover#arena::On02_Start";
 	warp "force_2-1",25,69;
 	end;
 }
@@ -330,8 +331,8 @@ OnTouch:
 force_2-1,25,134,1	script	force_02_03#60	45,1,1,{
 
 OnTouch:
-	donpcevent "arena#60::Onreset_02";
-	donpcevent "Minilover#arena::On03_start";
+	donpcevent "arena#60::OnReset_02";
+	donpcevent "Minilover#arena::On03_Start";
 	warp "force_2-1",25,159;
 	end;
 }
@@ -339,7 +340,7 @@ OnTouch:
 force_2-1,44,174,1	script	force_03_04#60	45,1,1,{
 
 OnTouch:
-	donpcevent "Minilover#arena::On04_start";
+	donpcevent "Minilover#arena::On04_Start";
 	warp "force_2-1",69,174;
 	end;
 }
@@ -347,7 +348,7 @@ OnTouch:
 force_2-1,134,174,1	script	force_04_05#60	45,1,1,{
 
 OnTouch:
-	donpcevent "Minilover#arena::On05_start";
+	donpcevent "Minilover#arena::On05_Start";
 	warp "force_2-1",159,174;
 	end;
 }
@@ -355,7 +356,7 @@ OnTouch:
 force_2-1,174,155,1	script	force_05_06#60	45,1,1,{
 
 OnTouch:
-	donpcevent "Minilover#arena::On06_start";
+	donpcevent "Minilover#arena::On06_Start";
 	warp "force_2-1",174,130;
 	end;
 }
@@ -363,7 +364,7 @@ OnTouch:
 force_2-1,174,65,1	script	force_06_07#60	45,1,1,{
 
 OnTouch:
-	donpcevent "Minilover#arena::On07_start";
+	donpcevent "Minilover#arena::On07_Start";
 	warp "force_2-1",174,40;
 	end;
 }
@@ -371,7 +372,7 @@ OnTouch:
 force_2-1,155,26,1	script	force_07_08#60	45,1,1,{
 
 OnTouch:
-	donpcevent "Minilover#arena::On08_start";
+	donpcevent "Minilover#arena::On08_Start";
 	warp "force_2-1",132,26;
 	enablenpc "force_08_09#60";
 	end;
@@ -380,7 +381,7 @@ OnTouch:
 force_2-1,99,54,1	script	force_08_09#60	45,1,1,{
 
 OnTouch:
-	donpcevent "Minilover#arena::On09_start";
+	donpcevent "Minilover#arena::On09_Start";
 	warp "force_2-1",99,82;
 	end;
 }
@@ -388,26 +389,26 @@ OnTouch:
 force_2-1,99,124,1	script	force_exit#60	45,1,1,{
 
 OnTouch:
-	donpcevent "Minilover#arena::Ontimeroff";
-	donpcevent "#arn_timer_60::Onon";
+	donpcevent "Minilover#arena::OnTimerOff";
+	donpcevent "#arn_timer_60::OnEnable";
 	mapwarp "force_2-1","prt_are_in",22,139,0,0;
 	end;
 }
 
 -	script	force_01start#60	-1,{
 
-Onon:
-	donpcevent "force_01mob#60::Onon";
-end;
+OnEnable:
+	donpcevent "force_01mob#60::OnEnable";
+	end;
 }
 
 -	script	force_01ex#60	-1,{
 
-Onreset:
+OnReset:
 	killmonster "force_2-1","force_01ex#60::OnMobEx";
 	end;
 
-Onon:
+OnEnable:
 	monster "force_2-1",25,25,"Rotar Zairo",1392,1,"force_01ex#60::OnMobEx";
 	end;
 
@@ -417,12 +418,12 @@ OnMobEx:
 
 -	script	force_01mob#60	-1,{
 
-Onreset:
+OnReset:
 	killmonster "force_2-1","force_01mob#60::OnMobDeath";
 	end;
 
-Onon:
-	donpcevent "force_01ex#60::Onon";
+OnEnable:
+	donpcevent "force_01ex#60::OnEnable";
 	monster "force_2-1",25,32,"Goblin Archer",1577,1,"force_01mob#60::OnMobDeath";
 	monster "force_2-1",21,26,"Goblin",1534,1,"force_01mob#60::OnMobDeath";
 	monster "force_2-1",25,36,"Goblin",1536,1,"force_01mob#60::OnMobDeath";
@@ -439,25 +440,25 @@ Onon:
 OnMobDeath:
 	set $force_01_60,$force_01_60 -1;
 	if ($force_01_60 < 1) {
-		donpcevent "Minilover#arena::On01_end";
-		donpcevent "arena#60::Onreset_01";
+		donpcevent "Minilover#arena::On01_End";
+		donpcevent "arena#60::OnReset_01";
 	}
 	end;
 }
 
 -	script	force_02start#60	-1,{
 
-Onon:
-	donpcevent "force_02mob#60::Onon";
+OnEnable:
+	donpcevent "force_02mob#60::OnEnable";
 	end;
 }
 
 -	script	force_02mob#60	-1,{
 
-Onreset:
+OnReset:
 	killmonster "force_2-1","force_02mob#60::OnMobEx";
 	end;
-Onon:
+OnEnable:
 	monster "force_2-1",24,76,"Drainliar",1434,1,"force_02mob#60::OnMobEx";
 	monster "force_2-1",28,76,"Drainliar",1434,1,"force_02mob#60::OnMobEx";
 	monster "force_2-1",24,86,"Drainliar",1434,1,"force_02mob#60::OnMobEx";
@@ -496,18 +497,18 @@ OnMobEx:
 
 -	script	force_03start#60	-1,{
 
-Onon:
-	donpcevent "force_03mob#60::Onon";
+OnEnable:
+	donpcevent "force_03mob#60::OnEnable";
 	end;
 }
 
 -	script	force_03ex#60	-1,{
 
-Onreset:
+OnReset:
 	killmonster "force_2-1","force_03ex#60::OnMobEx";
 	end;
 
-Onon:
+OnEnable:
 	monster "force_2-1",26,173,"Hydra",1579,1,"force_03ex#60::OnMobEx";
 	monster "force_2-1",21,173,"Hydra",1579,1,"force_03ex#60::OnMobEx";
 	monster "force_2-1",31,173,"Hydra",1579,1,"force_03ex#60::OnMobEx";
@@ -526,8 +527,8 @@ OnMobEx:
 
 -	script	force_03mob#60	-1,{
 
-Onon:
-	donpcevent "force_03ex#60::Onon";
+OnEnable:
+	donpcevent "force_03ex#60::OnEnable";
 	monster "force_2-1",23,174,"Mantis",1457,1,"force_03mob#60::OnMobDeath";
 	monster "force_2-1",18,173,"Mantis",1457,1,"force_03mob#60::OnMobDeath";
 	monster "force_2-1",33,173,"Mantis",1457,1,"force_03mob#60::OnMobDeath";
@@ -535,33 +536,33 @@ Onon:
 	set $force_03_60,4;
 	end;
 
-Onreset:
+OnReset:
 	killmonster "force_2-1","force_mob01#60::OnMobDeath";
 	end;
 
 OnMobDeath:
 	set $force_03_60,$force_03_60 -1;
 	if ($force_03_60 < 1) {
-		donpcevent "Minilover#arena::On03_end";
-		donpcevent "arena#60::Onreset_03";
+		donpcevent "Minilover#arena::On03_End";
+		donpcevent "arena#60::OnReset_03";
 	}
 	end;
 }
 
 -	script	force_04start#60	-1,{
 
-Onon:
-	donpcevent "force_04mob#60::Onon";
+OnEnable:
+	donpcevent "force_04mob#60::OnEnable";
 	end;
 }
 
 -	script	force_04ex#60	-1,{
 
-Onreset:
+OnReset:
 	killmonster "force_2-1","force_04ex#60::OnMobEx";
 	end;
 
-Onon:
+OnEnable:
 	monster "force_2-1",84,177,"Sasquatch",1442,1,"force_04ex#60::OnMobEx";
 	monster "force_2-1",125,170,"Sasquatch",1442,1,"force_04ex#60::OnMobEx";
 	monster "force_2-1",109,172,"Baby Leopard",1524,1,"force_04ex#60::OnMobEx";
@@ -577,12 +578,12 @@ OnMobEx:
 
 -	script	force_04mob#60	-1,{
 
-Onreset:
+OnReset:
 	killmonster "force_2-1","force_04mob#60::OnMobDeath";
 	end;
 
-Onon:
-	donpcevent "force_04ex#60::Onon";
+OnEnable:
+	donpcevent "force_04ex#60::OnEnable";
 	monster "force_2-1",79,174,"Golem",1540,1,"force_04mob#60::OnMobDeath";
 	monster "force_2-1",131,178,"Marse",1551,1,"force_04mob#60::OnMobDeath";
 	set $force_04_60,2;
@@ -591,27 +592,27 @@ Onon:
 OnMobDeath:
 	set $force_04_60,$force_04_60 -1;
 	if ($force_04_60 < 1) {
-		donpcevent "force_04ex#60::Onreset";
-		donpcevent "Minilover#arena::On04_end";
-		donpcevent "arena#60::Onreset_04";
+		donpcevent "force_04ex#60::OnReset";
+		donpcevent "Minilover#arena::On04_End";
+		donpcevent "arena#60::OnReset_04";
 	}
 	end;
 }
 
 -	script	force_05start#60	-1,{
 
-Onon:
-	donpcevent "force_05mob#60::Onon";
+OnEnable:
+	donpcevent "force_05mob#60::OnEnable";
 	end;
 }
 
 -	script	force_05ex#60	-1,{
 
-Onreset:
+OnReset:
 	killmonster "force_2-1","force_05ex#60::OnMobEx";
 	end;
 
-Onsummonmob_05:
+OnSummonMob_05:
 	monster "force_2-1",168,177,"Hydra",1579,1,"force_05ex#60::OnMobEx";
 	monster "force_2-1",170,179,"Hydra",1579,1,"force_05ex#60::OnMobEx";
 	monster "force_2-1",177,179,"Hydra",1579,1,"force_05ex#60::OnMobEx";
@@ -632,12 +633,12 @@ OnMobEx:
 
 -	script	force_05mob#60	-1,{
 
-Onreset:
+OnReset:
 	killmonster "force_2-1","force_05mob#60::OnMobDeath";
 	end;
 
-Onon:
-	donpcevent "force_05ex#60::Onsummonmob_05";
+OnEnable:
+	donpcevent "force_05ex#60::OnSummonMob_05";
 	monster "force_2-1",163,173,"Drainliar",1434,1,"force_05mob#60::OnMobDeath";
 	monster "force_2-1",173,173,"Myst",1553,1,"force_05mob#60::OnMobDeath";
 	monster "force_2-1",181,173,"Orc Skeleton",1462,1,"force_05mob#60::OnMobDeath";
@@ -649,26 +650,26 @@ Onon:
 OnMobDeath:
 	set $force_05_60,$force_05_60 -1;
 	if ($force_05_60 < 1) {
-		donpcevent "Minilover#arena::On05_end";
-		donpcevent "arena#60::Onreset_05";
+		donpcevent "Minilover#arena::On05_End";
+		donpcevent "arena#60::OnReset_05";
 	}
 	end;
 }
 
 -	script	force_06start#60	-1,{
 
-Onon:
-	donpcevent "force_06mob#60::Onon";
+OnEnable:
+	donpcevent "force_06mob#60::OnEnable";
 	end;
 }
 
 -	script	force_06ex#60	-1,{
 
-Onreset:
+OnReset:
 	killmonster "force_2-1","force_06ex#60::OnMobEx";
 	end;
 
-Onon:
+OnEnable:
 	monster "force_2-1",169,130,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
 	monster "force_2-1",178,130,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
 	monster "force_2-1",169,125,"Greatest General",1541,1,"force_06ex#60::OnMobEx";
@@ -716,12 +717,12 @@ OnMobEx:
 
 -	script	force_06mob#60	-1,{
 
-Onreset:
+OnReset:
 	killmonster "force_2-1","force_06mob#60::OnMobDeath";
 	end;
 
-Onon:
-	donpcevent "force_06ex#60::Onon";
+OnEnable:
+	donpcevent "force_06ex#60::OnEnable";
 	monster "force_2-1",174,100,"Miyabi Doll",1552,1,"force_06mob#60::OnMobDeath";
 	monster "force_2-1",174,80,"Miyabi Doll",1552,1,"force_06mob#60::OnMobDeath";
 	set $force_06_60,2;
@@ -731,8 +732,8 @@ OnMobDeath:
 	set $force_06_60,$force_06_60 -1;
 	if ($force_06_60 < 1) {
 		set door, 1;
-		donpcevent "Minilover#arena::On06_end";
-		donpcevent "arena#60::Onreset_06";
+		donpcevent "Minilover#arena::On06_End";
+		donpcevent "arena#60::OnReset_06";
 	}
 	else donpcevent "force_06ex#60::Onsubon";
 	end;
@@ -740,18 +741,18 @@ OnMobDeath:
 
 -	script	force_07start#60	-1,{
 
-Onon:
-	donpcevent "force_07mob#60::Onon";
+OnEnable:
+	donpcevent "force_07mob#60::OnEnable";
 	end;
 }
 
 -	script	force_07mob#60	-1,{
 
-Onreset:
+OnReset:
 	killmonster "force_2-1","force_07mob#60::OnMobDeath";
 	end;
 
-Onon:
+OnEnable:
 	monster "force_2-1",170,25,"Jakk",1436,1,"force_07mob#60::OnMobDeath";
 	monster "force_2-1",170,25,"Jakk",1436,1,"force_07mob#60::OnMobDeath";
 	monster "force_2-1",175,25,"Myst",1553,1,"force_07mob#60::OnMobDeath";
@@ -762,40 +763,40 @@ Onon:
 OnMobDeath:
 	set $force_07_50,$force_07_50 -1;
 	if ($force_07_50 < 1) {
-		donpcevent "Minilover#arena::On07_end";
-		donpcevent "arena#60::Onreset_07";
+		donpcevent "Minilover#arena::On07_End";
+		donpcevent "arena#60::OnReset_07";
 	}
 	end;
 }
 
 -	script	force_08start#60	-1,{
 
-Onon:
-	donpcevent "force_08ex#60::Onon";
+OnEnable:
+	donpcevent "force_08ex#60::OnEnable";
 	end;
 }
 
 -	script	force_08ex#60	-1,{
 
-Onon:
-	donpcevent "arena#60::Onreset_08";
+OnEnable:
+	donpcevent "arena#60::OnReset_08";
 	end;
 }
 
 -	script	force_09start#60	-1,{
 
-Onon:
-	donpcevent "force_09mob#60::Onon";
+OnEnable:
+	donpcevent "force_09mob#60::OnEnable";
 	end;
 }
 
 -	script	force_09ex#60	-1,{
 
-Onreset:
+OnReset:
 	killmonster "force_2-1","force_09ex#60::OnMobEx";
 	end;
 
-Onsummonmob_09:
+OnSummonMob_09:
 	monster "force_2-1",90,100,"Horong",1578,1,"force_09ex#60::OnMobEx";
 	monster "force_2-1",92,100,"Horong",1578,1,"force_09ex#60::OnMobEx";
 	monster "force_2-1",99,100,"Horong",1578,1,"force_09ex#60::OnMobEx";
@@ -830,22 +831,22 @@ OnMobEx:
 
 -	script	force_09mob#60	-1,{
 
-Onon:
-	donpcevent "force_09ex#60::Onsummonmob_09";
+OnEnable:
+	donpcevent "force_09ex#60::OnSummonMob_09";
 	monster "force_2-1",99,99,"Goblin Leader",1539,1,"force_09mob#60::OnMobDeath";
 	set $force_09_60,1;
 	end;
 
-Onreset:
+OnReset:
 	killmonster "force_2-1","force_09mob#60::OnMobDeath";
 	end;
 
 OnMobDeath:
 	set $force_09_60,$force_09_60 -1;
 	if ($force_09_60 < 1) {
-		donpcevent "Minilover#arena::On09_end";
-		donpcevent "arena#60::Onreset_09";
-		donpcevent "arena#60::Onreset_all";
+		donpcevent "Minilover#arena::On09_End";
+		donpcevent "arena#60::OnReset_09";
+		donpcevent "arena#60::OnReset_All";
 		set $arena_min60end,gettime(2);
 		set $arena_sec60end,gettime(1);
 	}
@@ -913,7 +914,7 @@ prt_are_in,25,135,3	script	Staff#60-2	67,{
 	mes "Congratulations!";
 	next;
 	mes "[Staff]";
-	mes "The fastest player among people who cleared lvl 60s arena time force battle is ^3131FF"+$arena_60topn$+"^000000.";
+	mes "The fastest player among people who cleared Lv60 arena time force battle is ^3131FF"+$arena_60topn$+"^000000.";
 	next;
 	mes "[Staff]";
 	mes "^3131FF"+$arena_60topn$+"^000000's running time was ^3131FF"+$top_60min+"^000000minutes ^3131FF"+$top_60sec+"^000000seconds.";
@@ -948,11 +949,11 @@ prt_are_in,25,135,3	script	Staff#60-2	67,{
 			close2;
 		}
 		specialeffect2 EF_EXIT;
- 		donpcevent "cast#60::Onnomal1";
+ 		donpcevent "cast#60::OnNormal1";
 		warp "arena_room",100,75;
-		donpcevent "#arn_timer_60::Onstop";
-		donpcevent "alloff#60::Onon";
-		donpcevent "lvl 60s Waiting Room::Onstart";
+		donpcevent "#arn_timer_60::OnStop";
+		donpcevent "alloff#60::OnEnable";
+		donpcevent "Lv60 Waiting Room::OnStart";
 		end;
 	}
 	else
@@ -967,7 +968,7 @@ prt_are_in,25,135,3	script	Staff#60-2	67,{
 		set $top_60min, @record_min60;
 		set $top_60sec, @record_sec60;
 		set $arena_60topn$,strcharinfo(0);
-		donpcevent "Vendigos::Onlinerec_60";
+		donpcevent "Vendigos::OnLineRec_60";
 		next;
 		if (arena_point > 29950) {
 			mes "[Staff]";
@@ -999,11 +1000,11 @@ prt_are_in,25,135,3	script	Staff#60-2	67,{
 			close2;
 		}
 		specialeffect2 EF_HIT5;
- 		donpcevent "cast#60::Onnomal2";
+ 		donpcevent "cast#60::OnNormal2";
 		warp "arena_room",100,75;
-		donpcevent "#arn_timer_60::Onstop";
-		donpcevent "alloff#60::Onon";
-		donpcevent "lvl 60s Waiting Room::Onstart";
+		donpcevent "#arn_timer_60::OnStop";
+		donpcevent "alloff#60::OnEnable";
+		donpcevent "Lv60 Waiting Room::OnStart";
 		end;
 	}
 
@@ -1011,7 +1012,7 @@ prt_are_in,25,135,3	script	Staff#60-2	67,{
 
 -	script	#arn_timer_60	-1,{
 
-Onon:
+OnEnable:
 	initnpctimer;
 	end;
 
@@ -1028,14 +1029,14 @@ OnTimer4000:
 	end;
 
 OnTimer60000:
- 	donpcevent "cast#60::Ontimeover2";
+ 	donpcevent "cast#60::OnTimeOver2";
 	donpcevent "arn_warp_60::Onout";
-	donpcevent "#arn_timer_60::Onstop";
-	donpcevent "alloff#60::Onon";
-	donpcevent "lvl 60s Waiting Room::Onstart";
+	donpcevent "#arn_timer_60::OnStop";
+	donpcevent "alloff#60::OnEnable";
+	donpcevent "Lv60 Waiting Room::OnStart";
 	end;
 
-Onstop:
+OnStop:
 	stopnpctimer;
 	end; 
 }
@@ -1049,44 +1050,44 @@ Onout:
 
 -	script	cast#60	-1,{
 
-Ontimeover1:
+OnTimeOver1:
 	mapannounce "force_2-1","Arena will be reactivated due to an error occurred during battle.",0,0xFFCE00;
 	end;
 
-Onnomal1:
+OnNormal1:
 	mapannounce "force_2-1","Arena will be reactivated.",0,0xFFCE00;
 	end;
 
-Onnomal2:
+OnNormal2:
 	mapannounce "force_2-1","Arena will be reactivated.",0,0xFFCE00;
 	end;
 
-Ontimeover2:
+OnTimeOver2:
 	mapannounce "force_2-1","Arena will be reactivated due to an error occurred in the waiting room.",0,0xFFCE00;
 	end;
 }
 
 -	script	alloff#60	-1,{
 
-Onon:
+OnEnable:
 	mapwarp "force_2-1","prt_are_in",126,139,0,0;
-	donpcevent "force_01mob#60::Onreset";
-	donpcevent "force_02mob#60::Onreset";
-	donpcevent "force_03mob#60::Onreset";
-	donpcevent "force_04mob#60::Onreset";
-	donpcevent "force_05mob#60::Onreset";
-	donpcevent "force_06mob#60::Onreset";
-	donpcevent "force_07mob#60::Onreset";
-	donpcevent "force_08mob#60::Onreset";
-	donpcevent "force_09mob#60::Onreset";
-	donpcevent "force_01ex#60::Onreset";
-	donpcevent "force_03ex#60::Onreset";
-	donpcevent "force_04ex#60::Onreset";
-	donpcevent "force_05ex#60::Onreset";
-	donpcevent "force_06ex#60::Onreset";
-	donpcevent "force_08ex#60::Onreset";
-	donpcevent "force_09ex#60::Onreset";
-	donpcevent "Minilover#arena::Ontimeroff";
+	donpcevent "force_01mob#60::OnReset";
+	donpcevent "force_02mob#60::OnReset";
+	donpcevent "force_03mob#60::OnReset";
+	donpcevent "force_04mob#60::OnReset";
+	donpcevent "force_05mob#60::OnReset";
+	donpcevent "force_06mob#60::OnReset";
+	donpcevent "force_07mob#60::OnReset";
+	donpcevent "force_08mob#60::OnReset";
+	donpcevent "force_09mob#60::OnReset";
+	donpcevent "force_01ex#60::OnReset";
+	donpcevent "force_03ex#60::OnReset";
+	donpcevent "force_04ex#60::OnReset";
+	donpcevent "force_05ex#60::OnReset";
+	donpcevent "force_06ex#60::OnReset";
+	donpcevent "force_08ex#60::OnReset";
+	donpcevent "force_09ex#60::OnReset";
+	donpcevent "Minilover#arena::OnTimerOff";
 	disablenpc "Minilover#arena";
 	disablenpc "force_01_02#60";
 	disablenpc "force_02_03#60";
@@ -1098,7 +1099,7 @@ Onon:
 	disablenpc "force_08_09#60";
 	disablenpc "force_exit#60";
 	disablenpc "arena#60";
-	donpcevent "#arn_timer_60::Onstop";
+	donpcevent "#arn_timer_60::OnStop";
 	enablenpc "Minilover#arena";
 	enablenpc "arena#60";
 	end;

npc/pre-re/other/arena/arena_party.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= SinSloth
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
@@ -14,6 +14,7 @@
 //= 1.1 Replaced effect numerics with constants. [Samuray22]
 //= 1.2 Fixed "OnMobDeath" doesn't work sometime. [Inkfish]
 //= 1.3 Corrected donpcevent typo. (bugreport:4374) [L0ne_w0lf]
+//= 1.4 Label standardization and bug fixes. [Euphy]
 //============================================================
 
 arena_room,162,88,3	script	Ponox	124,{
@@ -33,7 +34,7 @@ OnStartArena:
 	disablewaitingroomevent;
 	end;
 
-Onstart:
+OnStart:
 	enablewaitingroomevent;
 	end;
 }
@@ -126,7 +127,7 @@ OnTimer60000:
 
 OnTimer70000:
 	donpcevent "toout#party::OnStop";
-	donpcevent "Ponox::Onstart";
+	donpcevent "Ponox::OnStart";
 	disablenpc "toout#party";
 
 OnTouch:
@@ -255,62 +256,62 @@ OnFail:
 	mapwarp "force_1-2","prt_are_in",177,138;
 	donpcevent "arena_p::OnReset";
 	donpcevent "alloff#party::OnInit";
-	donpcevent "Ponox::Onstart";
+	donpcevent "Ponox::OnStart";
 	end;
 
 OnTimeoff:
 	stopnpctimer;
 	end;
 
-On01_end:
+On01_End:
 	mapannounce "force_1-2","A door to the east room has opened!",bc_all;
 	end;
 
-On02_end:
+On02_End:
 	mapannounce "force_1-2","A door to the west room has opened!",bc_all;
 	end;
 
-On03_end:
+On03_End:
 	mapannounce "force_1-2","A door to the south room has opened!",bc_all;
 	end;
 
-On04_start:
+On04_Start:
 	mapannounce "force_1-2","A door to the 4th room at the east has opened!",bc_all;
 	end;
 
-On04_end1:
+On04_End1:
 	mapannounce "force_1-2","A warp portal at the west has opened! Please clear the 5th room at the end of the west hall! ",bc_all;
 	end;
 
-On04_end2:
+On04_End2:
 	mapannounce "force_1-2","A warp portal at the west north room has opened! ",bc_all;
 	end;
 
-On05_end1:
+On05_End1:
 	mapannounce "force_1-2","A door to the east room has opened~",bc_all;
 	end;
 
-On05_end2:
+On05_End2:
 	mapannounce "force_1-2","A door to the north room has opened~",bc_all;
 	end;
 
-On06_end:
+On06_End:
 	mapannounce "force_1-2","A door to the east room has opened~",bc_all;
 	end;
 
-On07_end:
+On07_End:
 	mapannounce "force_1-2","A door at the north has opened~",bc_all;
 	end;
 
-On08_end:
+On08_End:
 	mapannounce "force_1-2","A door to the west hall has opened~",bc_all;
 	end;
 
-On09_end:
+On09_End:
 	mapannounce "force_1-2","A west exit has opened!",bc_all;
 	end;
 
-On10_end:
+On10_End:
 	mapannounce "force_1-2","Boss stage cleared! An exit at the east has opened! Thank you.",bc_all;
 	end;
 }
@@ -361,37 +362,37 @@ OnStart:
 	set $arn_partywait,0;
 	end;
 
-On04_start:
+On04_Start:
 	enablenpc "force_03_04";
 	enablenpc "force_04start#party";
 	end;
 
-On06_start:
+On06_Start:
 	enablenpc "force_05_06";
 	enablenpc "force_06start#party";
 	end;
 
-On07_start:
+On07_Start:
 	enablenpc "force_06_07";
 	enablenpc "force_07start#party";
 	end;
 
-On08_start:
+On08_Start:
 	enablenpc "force_07_08";
 	enablenpc "force_08start#party";
 	end;
 
-On09_start:
+On09_Start:
 	enablenpc "force_08_09";
 	enablenpc "force_09start#party";
 	end;
 
-On10_start:
+On10_Start:
 	enablenpc "force_09_10";
 	enablenpc "force_10start#party";
 	end;
 
-Onexit:
+OnExit:
 	enablenpc "force_10_09";
 	enablenpc "force_09_exit";
 	enablenpc "force_exit#party";
@@ -413,118 +414,24 @@ OnReset:
 	end;
 }
 
-force_1-2,85,26,1	script	force_00_01	45,1,1,{
-
-OnTouch:
-	warp "force_1-2",37,26;
-	end;
-}
-
-force_1-2,114,26,1	script	force_00_02	45,1,1,{
-
-OnTouch:
-	warp "force_1-2",162,26;
-	end;
-}
-
-force_1-2,99,40,1	script	force_00_03	45,1,1,{
-
-OnTouch:
-	warp "force_1-2",99,66;
-	end;
-}
-
-force_1-2,41,26,1	script	force_01_00	45,1,1,{
-
-OnTouch:
-	warp "force_1-2",89,26;
-	end;
-}
-
-force_1-2,158,26,1	script	force_02_00	45,1,1,{
-
-OnTouch:
-	warp "force_1-2",110,26;
-	end;
-}
-
-force_1-2,99,63,1	script	force_03_00	45,1,1,{
-
-OnTouch:
-	warp "force_1-2",99,36;
-	end;
-}
-
-force_1-2,84,78,1	script	force_03_05	45,1,1,{
-
-OnTouch:
-	warp "force_1-2",37,78;
-	end;
-}
-
-force_1-2,115,78,1	script	force_03_04	45,1,1,{
-
-OnTouch:
-	warp "force_1-2",162,78;
-	end;
-}
-force_1-2,158,77,1	script	force_04_03	45,1,1,{
-
-OnTouch:
-	warp "force_1-2",110,78;
-	end;
-}
-
-force_1-2,41,77,1	script	force_05_03	45,1,1,{
-
-OnTouch:
-	warp "force_1-2",37,78;
-	end;
-}
-
-force_1-2,25,93,1	script	force_05_06	45,1,1,{
-
-OnTouch:
-	warp "force_1-2",26,118;
-	end;
-}
-
-force_1-2,49,130,1	script	force_06_07	45,1,1,{
-
-OnTouch:
-	warp "force_1-2",91,125;
-	end;
-}
-
-force_1-2,107,145,1	script	force_07_08	45,1,1,{
-
-OnTouch:
-	warp "force_1-2",173,118;
-	end;
-}
-
-force_1-2,158,178,1	script	force_08_09	45,1,1,{
-
-OnTouch:
-	warp "force_1-2",133,178;
-	end;
-}
-
-force_1-2,55,178,1	script	force_09_10	45,1,1,{
-
-OnTouch:
-	warp "force_1-2",29,178;
-	end;
-}
-
-force_1-2,33,178,1	script	force_10_09	45,1,1,{
-
-OnTouch:
-	warp "force_1-2",59,178;
-	end;
-}
-
-force_1-2,95,187,1	script	force_09_exit	45,1,1,{
+force_1-2,85,26,0	warp	force_00_01	1,1,force_1-2,37,26
+force_1-2,114,26,0	warp	force_00_02	1,1,force_1-2,162,26
+force_1-2,99,40,0	warp	force_00_03	1,1,force_1-2,99,66
+force_1-2,41,26,0	warp	force_01_00	1,1,force_1-2,89,26
+force_1-2,158,26,0	warp	force_02_00	1,1,force_1-2,110,26
+force_1-2,99,63,0	warp	force_03_00	1,1,force_1-2,99,36
+force_1-2,84,78,0	warp	force_03_05	1,1,force_1-2,37,78
+force_1-2,115,78,0	warp	force_03_04	1,1,force_1-2,162,78
+force_1-2,158,77,0	warp	force_04_03	1,1,force_1-2,110,78
+force_1-2,41,77,0	warp	force_05_03	1,1,force_1-2,37,78
+force_1-2,25,93,0	warp	force_05_06	1,1,force_1-2,26,118
+force_1-2,49,130,0	warp	force_06_07	1,1,force_1-2,91,125
+force_1-2,107,145,0	warp	force_07_08	1,1,force_1-2,173,118
+force_1-2,158,178,0	warp	force_08_09	1,1,force_1-2,133,178
+force_1-2,55,178,0	warp	force_09_10	1,1,force_1-2,29,178
+force_1-2,33,178,0	warp	force_10_09	1,1,force_1-2,59,178
+
+force_1-2,95,187,0	script	force_09_exit	45,1,1,{
 
 OnTouch:
 	set $arena_minptend,gettime(2);
@@ -539,14 +446,14 @@ OnTouch:
 force_1-2,36,26,0	script	force_01start#party	-1,1,1,{
 
 OnTouch:
-	donpcevent "force_01mob#party::Onon";
+	donpcevent "force_01mob#party::OnEnable";
 	disablenpc "force_01start#party";
 	end;
 }
 
 -	script	force_01mob#party	-1,{
 
-Onon:
+OnEnable:
 	monster "force_1-2",15,35,"Penomena",1441,1,"force_01mob#party::OnMobDeath";
 	monster "force_1-2",35,35,"Penomena",1441,1,"force_01mob#party::OnMobDeath";
 	monster "force_1-2",15,15,"Penomena",1441,1,"force_01mob#party::OnMobDeath";
@@ -585,11 +492,11 @@ OnMobDeath:
 	if($force_01_pt < 1)
 	{
 		enablenpc "force_01_00";
-		donpcevent "Slipslowrun#party::On01_end";
+		donpcevent "Slipslowrun#party::On01_End";
 		set $arn_partyc,$arn_partyc +1;
 		if($arn_partyc == 3)
 		{
-			donpcevent "Slipslowrun#party::On04_start";
+			donpcevent "Slipslowrun#party::On04_Start";
 			enablenpc "force_03_04";
 			enablenpc "force_04start#party";
 		}
@@ -600,14 +507,14 @@ OnMobDeath:
 force_1-2,162,26,0	script	force_02start#party	-1,1,1,{
 
 OnTouch:
-	donpcevent "force_02mob#party::Onon";
+	donpcevent "force_02mob#party::OnEnable";
 	disablenpc "force_02start#party";
 	end;
 }
 
 -	script	force_02mob#party	-1,{
 
-Onon:
+OnEnable:
 	monster "force_1-2",163,36,"Penomena",1441,1,"force_02mob#party::OnMobDeath";
 	monster "force_1-2",184,36,"Penomena",1441,1,"force_02mob#party::OnMobDeath";
 	monster "force_1-2",184,16,"Penomena",1441,1,"force_02mob#party::OnMobDeath";
@@ -650,11 +557,11 @@ OnMobDeath:
 	if($force_02_pt < 1)
 	{
 		enablenpc "force_02_00";
-		donpcevent "Slipslowrun#party::On02_end";
+		donpcevent "Slipslowrun#party::On02_End";
 		set $arn_partyc,$arn_partyc +1;
 		if($arn_partyc == 3)
 		{
-			donpcevent "Slipslowrun#party::On04_start";
+			donpcevent "Slipslowrun#party::On04_Start";
 			enablenpc "force_03_04";
 			enablenpc "force_04start#party";
 		}
@@ -665,14 +572,14 @@ OnMobDeath:
 force_1-2,99,66,0	script	force_03start#party	-1,1,1,{
 
 OnTouch:
-	donpcevent "force_03mob#party::Onon";
+	donpcevent "force_03mob#party::OnEnable";
 	disablenpc "force_03start#party";
 	end;
 }
 
 -	script	force_03mob#party	-1,{
 
-Onon:
+OnEnable:
 	monster "force_1-2",89,81,"Merman",1451,1,"force_03mob#party::OnMobDeath";
 	monster "force_1-2",90,81,"Merman",1451,1,"force_03mob#party::OnMobDeath";
 	monster "force_1-2",91,81,"Merman",1451,1,"force_03mob#party::OnMobDeath";
@@ -711,11 +618,11 @@ OnMobDeath:
 	if($force_03_pt < 1)
 	{
 		enablenpc "force_03_00";
-		donpcevent "Slipslowrun#party::On03_end";
+		donpcevent "Slipslowrun#party::On03_End";
 		set $arn_partyc,$arn_partyc +1;
 		if($arn_partyc == 3)
 		{
-			donpcevent "Slipslowrun#party::On04_start";
+			donpcevent "Slipslowrun#party::On04_Start";
 			enablenpc "force_03_04";
 			enablenpc "force_04start#party";
 		}
@@ -726,14 +633,14 @@ OnMobDeath:
 force_1-2,162,78,0	script	force_04start#party	-1,3,3,{
 
 OnTouch:
-	donpcevent "force_04mob#party::Onon";
+	donpcevent "force_04mob#party::OnEnable";
 	disablenpc "force_04start#party";
 	end;
 }
 
 -	script	force_04mob#party	-1,{
 
-Onon:
+OnEnable:
 	monster "force_1-2",174,78,"Penomena",1441,1,"force_04mob#party::OnMobDeath";
 	monster "force_1-2",184,78,"Penomena",1441,1,"force_04mob#party::OnMobDeath";
 	monster "force_1-2",184,68,"Penomena",1441,1,"force_04mob#party::OnMobDeath";
@@ -770,7 +677,7 @@ OnMobDeath:
 		enablenpc "force_04_03";
 		enablenpc "force_03_05";
 		enablenpc "force_05start#party";
-		donpcevent "Slipslowrun#party::On04_end1";
+		donpcevent "Slipslowrun#party::On04_End1";
 	}
 	end;
 }
@@ -778,14 +685,14 @@ OnMobDeath:
 force_1-2,36,77,0	script	force_05start#party	-1,1,1,{
 
 OnTouch:
-	donpcevent "force_05mob#party::Onon";
+	donpcevent "force_05mob#party::OnEnable";
 	disablenpc "force_05start#party";
 	end;
 }
 
 -	script	force_05mob#party	-1,{
 
-Onon:
+OnEnable:
 	monster "force_1-2",25,68,"Penomena",1441,1,"force_05mob#party::OnMobDeath";
 	monster "force_1-2",36,68,"Penomena",1441,1,"force_05mob#party::OnMobDeath";
 	monster "force_1-2",16,88,"Penomena",1441,1,"force_05mob#party::OnMobDeath";
@@ -821,8 +728,8 @@ OnMobDeath:
 	set $force_05_pt,$force_05_pt -1;
 	if($force_05_pt < 1)
 	{
-		donpcevent "arena_p::On06_start";
-		donpcevent "Slipslowrun#party::On05_end2";
+		donpcevent "arena_p::On06_Start";
+		donpcevent "Slipslowrun#party::On05_End2";
 	}
 	end;
 }
@@ -830,14 +737,14 @@ OnMobDeath:
 force_1-2,26,118,0	script	force_06start#party	-1,1,1,{
 
 OnTouch:
-	donpcevent "force_06mob#party::Onon";
+	donpcevent "force_06mob#party::OnEnable";
 	disablenpc "force_06start#party";
 	end;
 }
 
 -	script	force_06mob#party	-1,{
 
-Onon:
+OnEnable:
 	monster "force_1-2",19,135,"Cloud Hermit",1531,1,"force_06mob#party::OnMobDeath";
 	monster "force_1-2",24,135,"Cloud Hermit",1531,1,"force_06mob#party::OnMobDeath";
 	monster "force_1-2",28,135,"Cloud Hermit",1531,1,"force_06mob#party::OnMobDeath";
@@ -871,8 +778,8 @@ OnMobDeath:
 	set $force_06_pt,$force_06_pt -1;
 	if($force_06_pt < 1)
 	{
-		donpcevent "arena_p::On07_start";
-		donpcevent "Slipslowrun#party::On06_end";
+		donpcevent "arena_p::On07_Start";
+		donpcevent "Slipslowrun#party::On06_End";
 		set $arn_partyc,$arn_partyc +1;
 	}
 	end;
@@ -881,14 +788,14 @@ OnMobDeath:
 force_1-2,92,124,0	script	force_07start#party	-1,1,1,{
 
 OnTouch:
-	donpcevent "force_07mob#party::Onon";
+	donpcevent "force_07mob#party::OnEnable";
 	disablenpc "force_07start#party";
 	end;
 }
 
 -	script	force_07mob#party	-1,{
 
-Onon:
+OnEnable:
 	monster "force_1-2",104,134,"Greatest General",1541,1,"force_07mob#party::OnMobDeath";
 	monster "force_1-2",104,136,"Greatest General",1541,1,"force_07mob#party::OnMobDeath";
 	monster "force_1-2",104,137,"Greatest General",1541,1,"force_07mob#party::OnMobDeath";
@@ -912,8 +819,8 @@ OnMobDeath:
 	set $force_07_pt,$force_07_pt -1;
 	if($force_07_pt < 1)
 	{
-		donpcevent "arena_p::On08_start";
-		donpcevent "Slipslowrun#party::On07_end";
+		donpcevent "arena_p::On08_Start";
+		donpcevent "Slipslowrun#party::On07_End";
 		set $arn_partyc,$arn_partyc +1;
 	}
 	end;
@@ -922,14 +829,14 @@ OnMobDeath:
 force_1-2,173,118,0	script	force_08start#party	-1,1,1,{
 
 OnTouch:
-	donpcevent "force_08mob#party::Onon";
+	donpcevent "force_08mob#party::OnEnable";
 	disablenpc "force_08start#party";
 	end;
 }
 
 -	script	force_08mob#party	-1,{
 
-Onon:
+OnEnable:
 	monster "force_1-2",172,154,"Khalitzburg",1438,1,"force_08mob#party::OnMobDeath";
 	monster "force_1-2",174,145,"Ghostring",1576,1,"force_08mob#party::OnMobDeath";
 	monster "force_1-2",174,145,"Chimera",1456,1,"force_08mob#party::OnMobDeath";
@@ -975,8 +882,8 @@ OnMobDeath:
 	set $force_08_pt,$force_08_pt -1;
 	if($force_08_pt < 1)
 	{
-		donpcevent "arena_p::On09_start";
-		donpcevent "Slipslowrun#party::On08_end";
+		donpcevent "arena_p::On09_Start";
+		donpcevent "Slipslowrun#party::On08_End";
 		set $arn_partyc,$arn_partyc +1;
 	}
 	end;
@@ -985,14 +892,14 @@ OnMobDeath:
 force_1-2,133,178,0	script	force_09start#party	-1,1,1,{
 
 OnTouch:
-	donpcevent "force_09mob#party::Onon";
+	donpcevent "force_09mob#party::OnEnable";
 	disablenpc "force_09start#party";
 	end;
 }
 
 -	script	force_09mob#party	-1,{
 
-Onon:
+OnEnable:
 	monster "force_1-2",86,180,"Elder",1573,1,"force_09mob#party::OnMobDeath";
 	monster "force_1-2",86,176,"Elder",1573,1,"force_09mob#party::OnMobDeath";
 	monster "force_1-2",95,183,"Elder",1573,1,"force_09mob#party::OnMobDeath";
@@ -1019,8 +926,8 @@ OnMobDeath:
 	set $force_09_pt,$force_09_pt -1;
 	if($force_09_pt < 1)
 	{
-		donpcevent "arena_p::On10_start";
-		donpcevent "Slipslowrun#party::On09_end";
+		donpcevent "arena_p::On10_Start";
+		donpcevent "Slipslowrun#party::On09_End";
 		set $arn_partyc,$arn_partyc +1;
 	}
 	end;
@@ -1029,14 +936,14 @@ OnMobDeath:
 force_1-2,29,178,0	script	force_10start#party	-1,1,1,{
 
 OnTouch:
-	donpcevent "force_10mob-1#party::Onon1";
+	donpcevent "force_10mob-1#party::OnEnable";
 	disablenpc "force_10start#party";
 	end;
 }
 
 -	script	force_10mob-1#party	-1,{
 
-Onon1:
+OnEnable:
 	switch(rand(1,2))
 	{
 		case 1:
@@ -1056,13 +963,13 @@ OnReset:
 
 OnMobDeath:
 	set $force_10_1_pt,$force_10_1_pt -1;
-	if($force_10_1_pt < 1) donpcevent "force_10mob-2#party::Onon2";
+	if($force_10_1_pt < 1) donpcevent "force_10mob-2#party::OnEnable";
 	end;
 }
 
 -	script	force_10mob-2#party	-1,{
 
-Onon2:
+OnEnable:
 	monster "force_1-2",16,179,"Samurai Spector",1542,1,"force_10mob-2#party::OnMobDeath";
 	monster "force_1-2",16,179,"Shinobi",1560,1,"force_10mob-2#party::OnMobDeath";
 	monster "force_1-2",16,179,"Shinobi",1560,1,"force_10mob-2#party::OnMobDeath";
@@ -1080,8 +987,8 @@ OnMobDeath:
 	set $force_10_2_pt,$force_10_2_pt -1;
 	if($force_10_2_pt < 1)
 	{
-		donpcevent "arena_p::Onexit";
-		donpcevent "Slipslowrun#party::On10_end";
+		donpcevent "arena_p::OnExit";
+		donpcevent "Slipslowrun#party::On10_End";
 		set $arn_partyc,0;
 	}
 	end;
@@ -1090,14 +997,14 @@ OnMobDeath:
 force_1-2,59,178,0	script	force_exit#party	-1,1,1,{
 
 OnTouch:
-	donpcevent "force_exitmob#party::Onon-1";
+	donpcevent "force_exitmob#party::OnEnable";
 	disablenpc "force_exit#party";
 	end;
 }
 
 -	script	force_exitmob#party	-1,{
 
-Onon:
+OnEnable:
 	monster "force_1-2",95,177,"Farewell",1393,1,"force_exitmob#party::OnMobDeath";
 	monster "force_1-2",95,177,"I hate you",1543,1,"force_exitmob#party::OnMobDeath";
 	monster "force_1-2",95,177,"I like chocolate",1472,1,"force_exitmob#party::OnMobDeath";
@@ -1232,9 +1139,9 @@ prt_are_in,77,135,3	script	Staff#party-2	67,{
 		}
 		if(getpartyleader(.arn_party,2) == getcharid(0))
 		{
-			donpcevent "#arn_timer_pt::Onstop";
-			donpcevent "alloff#pt::Onon";
-			donpcevent "Ponox::Onstart";
+			donpcevent "#arn_timer_pt::OnStop";
+			donpcevent "alloff#pt::OnEnable";
+			donpcevent "Ponox::OnStart";
 		}
 		specialeffect2 EH_HIT5;
  		donpcevent "cast#pt::Onnomal1";
@@ -1270,7 +1177,7 @@ prt_are_in,77,135,3	script	Staff#party-2	67,{
 							set $top_ptmin, @record_minpt;
 							set $top_ptsec, @record_secpt;
 							set $arena_pttopn$,.@arnparty$;
-							donpcevent "Vendigos::Onlinerec_pt";
+							donpcevent "Vendigos::OnLineRec_pt";
 							mes "[Staff]";
 							mes "Your record has been entered.";
 							next;
@@ -1324,9 +1231,9 @@ prt_are_in,77,135,3	script	Staff#party-2	67,{
 		}
 		if(getpartyleader(.arn_party,2) == getcharid(0))
 		{
-			donpcevent "#arn_timer_pt::Onstop";
-			donpcevent "alloff#pt::Onon";
-			donpcevent "Ponox::Onstart";
+			donpcevent "#arn_timer_pt::OnStop";
+			donpcevent "alloff#pt::OnEnable";
+			donpcevent "Ponox::OnStart";
 		}
 		specialeffect2 EF_HIT5;
 		warp "arena_room",100,75;
@@ -1356,12 +1263,12 @@ OnTimer4000:
 OnTimer60000:
  	donpcevent "cast#pt::Ontimeover2";
 	donpcevent "arn_warp_pt::Onout";
-	donpcevent "#arn_timer_pt::Onstop";
-	donpcevent "alloff#pt::Onon";
-	donpcevent "Ponox::Onstart";
+	donpcevent "#arn_timer_pt::OnStop";
+	donpcevent "alloff#pt::OnEnable";
+	donpcevent "Ponox::OnStart";
 	end;
 
-Onstop:
+OnStop:
 	stopnpctimer;
 	end; 
 }
@@ -1394,7 +1301,7 @@ Ontimeover2:
 
 -	script	alloff#pt	-1,{
 
-Onon:
+OnEnable:
 	mapwarp "force_1-2","prt_are_in",126,139,0,0;
 	donpcevent "force_01mob#party::OnReset";
 	donpcevent "force_02mob#party::OnReset";
@@ -1450,7 +1357,7 @@ Onon:
 	disablenpc "arn_warp_pt";
 	set $arn_partywait,0;
 	set $arn_partyc,0;
-	donpcevent "#arn_timer_pt::Onstop";
+	donpcevent "#arn_timer_pt::OnStop";
 	enablenpc "Slipslowrun#party";
 	enablenpc "arena_p";
 	end;

npc/pre-re/other/arena/arena_room.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= SinSloth
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
@@ -11,6 +11,7 @@
 //===== Additional Comments: =================================
 //= 1.0 First version.
 //= 1.1 Fixed a small reward typo (was giving potato.) [L0ne_W0lf]
+//= 1.2 Label standardization, disabled GM NPCs. [Euphy]
 //============================================================
 
 arena_room,94,93,5	script	Vendigos	97,{
@@ -75,26 +76,26 @@ L_Menu:
 	mes "Is there anything I can help you more?";
 	goto L_Menu;
 
-Onlinerec_50:
+OnLineRec_50:
 	mapannounce "arena_room",""+$arena_50topn$+" has renewed the top record in the Arena Time Force Battle level 50. Congratulations!",0;
 	end;
 
-Onlinerec_60:
+OnLineRec_60:
 	mapannounce "arena_room",""+$arena_60topn$+" has renewed the top record in the Arena Time Force Battle level 60. Congratulations!",0;
 	end;
 
-Onlinerec_70:
+OnLineRec_70:
 	mapannounce "arena_room",""+$arena_70topn$+" has renewed the top record in the Arena Time Force Battle level 70. Congratulations!",0;
 	end;
-Onlinerec_80:
+OnLineRec_80:
 	mapannounce "arena_room",""+$arena_80topn$+" has renewed the top record in the Arena Time Force Battle level 80. Congratulations!",0;
 	end;
 
-Onlinerec_pt:
+OnLineRec_pt:
 	mapannounce "arena_room","Party "+$arena_pttopn$+" has renewed the top record in the Arena Time Force Battle. Congratulations!",0;
 	end;
 
-//OnCommand: "linerec_vs"
+//OnCommand: "LineRec_vs"
 // var vs_winner = GetGlobalStr "040611_arn_vstopn"
 // broadcastinmap "Party "+vs_winner+" has renewed the top record in the Arena Time Force Battle. Congratulations!"
 // end;
@@ -448,7 +449,7 @@ sec_in02,72,180,3	script	Arena Manager#arena	802,{
 						switch( select( "Yes","No" ) )
 						{
 							case 1:
-								donpcevent "Ponox::Onstart";
+								donpcevent "Ponox::OnStart";
 								mes "[Arena Manager]";
 								mes "The arena stage has been successfuly reactivated.";
 								close;
@@ -467,7 +468,7 @@ sec_in02,72,180,3	script	Arena Manager#arena	802,{
 				switch( select( "Yes","No" ) )
 				{
 					case 1:
-						donpcevent "lvl "+.@arena+"s Waiting Room::Onstart";
+						donpcevent "lvl "+.@arena+"s Waiting Room::OnStart";
 						mes "[Arena Manager]";
 						mes "The arena stage has been successfuly reactivated.";
 						close;
@@ -1028,11 +1029,9 @@ OnTimer62000:
 	stopnpctimer;
 	end;
 }
-
+/*
 sec_in02,72,171,3	script	Picture Manager#arena	802,{
 
-	if (!getgmlevel()) end;
-
 	input .@arena;
 	if(!.@arena)
 	{
@@ -1075,6 +1074,7 @@ sec_in02,76,176,5	script	Live Broadcast#arena	802,{
 	mes "Currently there are "+getmapusers("arena_room")+" people in the waiting room.";
 	close;
 }
+*/
 
 function	script	Func_Are_Rew	{
 

npc/quests/first_class/tu_acolyte.txt

@@ -883,7 +883,7 @@ monk_in,18,38,6	script	Priest Gardron#tu	110,{
 				mes "May I entrust you, acolyte "+strcharinfo(0)+",";
 				mes "this urgent matter?";
 				mes "Please dispose of Hornets";
-				mes "which are causint trouble on ^FF0000the western field of Prontera^000000.";
+				mes "which are causing trouble on ^FF0000the western field of Prontera^000000.";
 				next;
 				mes "[Priest Gardron]";
 				mes "I know that you are undergoing the discipline,";

npc/quests/kiel_hyre_quest.txt

@@ -1043,7 +1043,7 @@ kh_school,179,39,0	script	Cute Student#kh	895,{
 				mes "Thank you! Thanks so much!";
 				next;
 				break;
-			Case 2:
+			case 2:
 				mes "[Elly]";
 				mes "Wait, you don't go";
 				mes "to this school, don't";

npc/quests/quests_13_1.txt

@@ -1832,7 +1832,7 @@ OnEnable:
 	monster "moc_fild22b",0,0,"Allied Soldier",1851,80,"Head of the Alliance#moo::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "moc_fild22b","Head of the Alliance#moo::OnMyMobDead";
 	end;
 
@@ -5368,7 +5368,7 @@ OnTouch:
 			mes "Finally, the meeting's starting.";
 			mes "You should come in.";
 			next;
-			donpcevent "Research Official#ep131::Onmeet";
+			donpcevent "Research Official#ep131::OnMeet";
 			mes "[United Research Official]";
 			mes "So, everyone's here.";
 			mes "Let us begin our meeting.";
@@ -5454,7 +5454,7 @@ OnTouch:
 			mes "scream as well, and rushed out of";
 			mes "the room. -";
 			set ep13_1_rhea,20;
-			donpcevent "Research Official#ep131::Oncall";
+			donpcevent "Research Official#ep131::OnCall";
 			close2;
 			warp "mid_camp",165,236;
 			end;
@@ -5469,7 +5469,7 @@ OnTouch:
 			mes "- Knock, knock-";
 			mes "- The researchers come back into the room. -";
 			next;
-			donpcevent "Research Official#ep131::Onmeet";
+			donpcevent "Research Official#ep131::OnMeet";
 			mes "[Ryosen]";
 			mes "Uh-hmm! Sorry about the mess.";
 			mes "I... Something urgent came up...";
@@ -5682,13 +5682,13 @@ OnDisable:
 	hideonnpc "Research Official#ep131";
 	end;
 
-Onmeet:
+OnMeet:
 	donpcevent "Ryosen#ep131_rhea05::OnEnable";
 	donpcevent "Hue#ep131_rhea06::OnEnable";
 	donpcevent "Hansenne#ep131_rhea07::OnEnable";
 	end;
 
-Oncall:
+OnCall:
 	initnpctimer;
 	monster "mid_campin",376,134,"Thief Bug",1051,1,"Research Official#ep131::OnMyMobDead";
 	monster "mid_campin",376,134,"Thief Bug",1051,1,"Research Official#ep131::OnMyMobDead";
@@ -7233,7 +7233,7 @@ OnEnable:
 	initnpctimer;
 	end;
 
-Onstop:
+OnStop:
 	stopnpctimer;
 	end;
 
@@ -7729,7 +7729,7 @@ OnEnable:
 	if (rand(1,3) > 1) initnpctimer;
 	end;
 
-Onstop:
+OnStop:
 	killmonster "mid_camp","#monster_master::OnMyMobDead";
 	stopnpctimer;
 	end;
@@ -12634,7 +12634,7 @@ que_job01,49,49,5	script	Tao#dan_09	877,{
 que_job01,51,55,0	script	que_job01#room_1	45,1,1,{
 OnInit:
 	if ($maobar_room) set $maobar_room,0;
-Onreset:
+OnReset:
 	set $@moc_mao_room1,0; //Global Variable
 	end;
 
@@ -12703,12 +12703,12 @@ OnEnable:
 	mapannounce "que_job01", "You will now enter the Master Zone, Area 1.",bc_map,"0x70DBDB";
 	end;
 
-Onstop:
+OnStop:
 	mapannounce "que_job01", "The security magic in the Master Zone, Area 1 is deactivated.",bc_map,"0x70DBDB";
 	donpcevent "#room1_warp13::OnDisable";
 	donpcevent "Valdes#moc_master_1::OnDisable";
 	donpcevent "Marjana#poison::OnDisable";
-	donpcevent "que_job01#room_1::Onreset";
+	donpcevent "que_job01#room_1::OnReset";
 	stopnpctimer;
 	end;
 
@@ -12724,7 +12724,7 @@ OnTimer245000:
 
 OnTimer250000:
 	mapannounce "que_job01", "The security magic Master Zone, Area 1 is now activated.",bc_map,"0x70DBDB";
-	donpcevent "que_job01#room_1::Onreset";
+	donpcevent "que_job01#room_1::OnReset";
 	stopnpctimer;
 }
 
@@ -12746,7 +12746,7 @@ OnTouch:
 que_job01,11,4,0	script	que_job01#room1_out	45,1,1,{
 OnTouch:
 	warp "que_job01",52,50;
-	donpcevent " #room1timer::Onstop";
+	donpcevent " #room1timer::OnStop";
 	end;
 }
 
@@ -12794,7 +12794,7 @@ que_job01,51,44,0	script	que_job01#room_2	45,1,1,{
 	end;
 
 OnInit:
-Onreset:
+OnReset:
 	set $@moc_mao_room2,0; //Global Variable
 	end;
 
@@ -12881,14 +12881,14 @@ OnEnable:
 	mapannounce "que_job01", "Master Zone 2 is now under surveillance.",bc_map,"0x70DBDB";
 	end;
 
-Onstop:
+OnStop:
 	mapannounce "que_job01", "The magic shield of Master Zone 2 has been reset.",bc_map,"0x70DBDB";
 	donpcevent "#room2_1_warp::OnDisable";
 	donpcevent "#room2_2_warp::OnDisable";
 	donpcevent "Rin#moc_room2_2::OnDisable";
 	donpcevent "Rin#moc_room2_1::OnDisable";
 	donpcevent "Rayan#moc_room2_2::OnDisable";
-	donpcevent "que_job01#room_2::Onreset";
+	donpcevent "que_job01#room_2::OnReset";
 	stopnpctimer;
 	end;
 
@@ -12907,7 +12907,7 @@ OnTimer245000:
 
 OnTimer250000:
 	mapannounce "que_job01", "Master Zone 2 has been released from surveillance.",bc_map,"0x70DBDB";
-	donpcevent "que_job01#room_2::Onreset";
+	donpcevent "que_job01#room_2::OnReset";
 	stopnpctimer;
 }
 
@@ -12944,14 +12944,14 @@ OnTouch:
 que_job01,80,27,0	script	que_job01#room2_1_out	45,1,1,{
 OnTouch:
 	warp "que_job01",52,50;
-	donpcevent " #room2timer::Onstop";
+	donpcevent " #room2timer::OnStop";
 	end;
 }
 
 que_job01,144,61,0	script	que_job01#room2_2_out	45,1,1,{
 OnTouch:
 	warp "que_job01",52,50;
-	donpcevent " #room2timer::Onstop";
+	donpcevent " #room2timer::OnStop";
 	end;
 }
 
@@ -13658,7 +13658,7 @@ OnDisable:
 	disablenpc "#moc2_event_on";
 	end;
 
-Onstop:
+OnStop:
 	stopnpctimer;
 	end;
 
@@ -13701,7 +13701,7 @@ OnTimer307000:
 	donpcevent "Dandelion Member#moc2_4::OnDisable";
 	donpcevent "Dandelion Member#moc2_5::OnDisable";
 	donpcevent "#moc2_event01::OnDisable";
-	donpcevent "Corpse#moc2_dead01::Onreset";
+	donpcevent "Corpse#moc2_dead01::OnReset";
 	end;
 
 OnTimer308000:
@@ -13818,7 +13818,7 @@ OnTouch:
 	donpcevent "Dandelion Member#moc2_4::OnDisable";
 	donpcevent "Dandelion Member#moc2_5::OnDisable";
 	donpcevent "Corpse#moc2_dead01::OnEnable";
-	donpcevent "Corpse#moc2_dead01::Oncall";
+	donpcevent "Corpse#moc2_dead01::OnCall";
 	end;
 }
 
@@ -13851,7 +13851,7 @@ que_dan01,49,36,5	script	Corpse#moc2_dead01	457,{
 			mes "Let's bring this to Kidd.^000000";
 			set mao_morocc2,11;
 			getitem 6028,1; //Seal_Scroll
-			donpcevent "#moc2_event_on::Onstop";
+			donpcevent "#moc2_event_on::OnStop";
 			initnpctimer;
 			changequest 7020,7021;
 			close;
@@ -13884,7 +13884,7 @@ OnEnable:
 	enablenpc "Corpse#moc2_dead01";
 	end;
 
-Oncall:
+OnCall:
 	monster "que_dan01",26,40,"Dandelion Member",1985,1,"Corpse#moc2_dead01::OnMyMobDead";
 	monster "que_dan01",21,35,"Dandelion Member",1985,1,"Corpse#moc2_dead01::OnMyMobDead";
 	monster "que_dan01",25,32,"Dandelion Member",1985,1,"Corpse#moc2_dead01::OnMyMobDead";
@@ -13895,7 +13895,7 @@ Oncall:
 OnMyMobDead:
 	end;
 
-Onreset:
+OnReset:
 	killmonster "que_dan01","Corpse#moc2_dead01::OnMyMobDead";
 	end;
 

npc/quests/quests_13_2.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 2.6
+//= 2.6a
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
@@ -45,6 +45,7 @@
 //= 2.4a Fixed an invisible NPC clashing with a warp portal. [Euphy]
 //= 2.5 Updated EXP rewards.
 //= 2.6 Fixed incorrect use of 'close'. [Joseph]
+//= 2.6a Disabled GM NPC. [Euphy]
 //============================================================ 
 
 // Cat Hand Addition.
@@ -3440,11 +3441,11 @@ OnDisable:
 	disablenpc "Stranger#ep13_2_dan01";
 	end;
 
-Oncall:
+OnCall:
 	monster "nyd_dun02",144,103,"Runway Dandelion",2026,1,"Stranger#ep13_2_dan03::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "nyd_dun02","Stranger#ep13_2_dan03::OnMyMobDead";
 	end;
 
@@ -3452,7 +3453,7 @@ OnTouch:
 	emotion e_gasp,1;
 	emotion e_omg;
 	disablenpc "Stranger#ep13_2_dan01";
-	donpcevent "Stranger#ep13_2_dan02::Oncall";
+	donpcevent "Stranger#ep13_2_dan02::OnCall";
 	end;
 }
 
@@ -3468,11 +3469,11 @@ OnEnable:
 	enablenpc "Stranger#ep13_2_dan02";
 	end;
 
-Oncall:
+OnCall:
 	monster "nyd_dun02",206,114,"Runway Dandelion",2026,1,"Stranger#ep13_2_dan04::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "nyd_dun02","Stranger#ep13_2_dan04::OnMyMobDead";
 	end;
 
@@ -3480,7 +3481,7 @@ OnTouch:
 	emotion e_gasp,1;
 	emotion e_omg;
 	disablenpc "Stranger#ep13_2_dan02";
-	donpcevent "Stranger#ep13_2_dan01::Oncall";
+	donpcevent "Stranger#ep13_2_dan01::OnCall";
 	end;
 }
 
@@ -6963,7 +6964,7 @@ nyd_dun02,139,274,0	script	Strange Device#ep13_in	844,3,3,{
 	end;
 
 OnTimer70000:
-	donpcevent "ep13_nd2f_mng::Onreset";
+	donpcevent "ep13_nd2f_mng::OnReset";
 	set $@08_ep13nydun02_in,0;
 	stopnpctimer;
 	end;
@@ -7304,7 +7305,7 @@ OnTouch:
 nyd_dun01,255,142,0	warp	nynm_dun1f_to_2f	1,1,nyd_dun02,61,265
 nyd_dun02,56,264,0	warp	nynm_dun2f_to_1f	1,1,nyd_dun01,249,143
 
-//==============================================================================
+/*
 nyd_dun02,1,1,0	script	ep13_nd2f_mng	844,{
 	mes "Enter password.";
 	next;
@@ -7314,7 +7315,7 @@ nyd_dun02,1,1,0	script	ep13_nd2f_mng	844,{
 		next;
 		switch(select("Yes:No")) {
 		case 1:
-			donpcevent "ep13_nd2f_mng::Onreset";
+			donpcevent "ep13_nd2f_mng::OnReset";
 			set $@08_ep13nydun02_in,0;
 			mes "Puzzle reset";
 			close;
@@ -7329,7 +7330,7 @@ nyd_dun02,1,1,0	script	ep13_nd2f_mng	844,{
 	}
 	end;
 
-Onreset:
+OnReset:
 	donpcevent "ep13_warp_s1::OnEnable";
 	donpcevent "ep13_warp_s3::OnEnable";
 
@@ -7396,3 +7397,4 @@ Onreset:
 	donpcevent "ep13_warp_85_2::OnDisable";
 	end;
 }
+*/

npc/quests/quests_amatsu.txt

@@ -367,9 +367,9 @@ OnInit:
 
 OnStartArena:
 	disablenpc "Coach#ama";
-	donpcevent "Am Mut#ama::Onreset";
-	donpcevent "Dokebi#ez::Onreset";
-	donpcevent "Dokebi#hd::Onreset";
+	donpcevent "Am Mut#ama::OnReset";
+	donpcevent "Dokebi#ez::OnReset";
+	donpcevent "Dokebi#hd::OnReset";
 	enablenpc "Grandma#ama1";
 	enablenpc "Grandpa#ama";
 	warpwaitingpc "ama_test",50,83;
@@ -377,7 +377,7 @@ OnStartArena:
 	disablewaitingroomevent "Assistant#ama";
 	end;
 
-Onreset:
+OnReset:
 	enablewaitingroomevent "Assistant#ama";
 	end;
 }
@@ -482,7 +482,7 @@ OnEnable:
 	monster "ama_test",49,91,"Dokebi",1110,1,"Dokebi#ez::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "ama_test","Dokebi#ez::OnMyMobDead";
 	end;
 
@@ -530,7 +530,7 @@ OnEnable:
 	monster "ama_test",49,91,"Dokebi",1110,1,"Dokebi#hd::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "ama_test","Dokebi#hd::OnMyMobDead";
 	end;
 
@@ -595,7 +595,7 @@ ama_test,50,100,3	script	Coach#ama	762,15,15,{
 		donpcevent "Timer#ama::OnDisable";
 		warp "amatsu",223,230;
 		disablenpc "Coach#ama";
-		donpcevent "Assistant#ama::Onreset";
+		donpcevent "Assistant#ama::OnReset";
 		end;
 	case 2:
 		mes "[Coach]";
@@ -635,7 +635,7 @@ ama_test,50,100,3	script	Coach#ama	762,15,15,{
 			warp "amatsu",223,230;
 			disablenpc "Coach#ama";
 			donpcevent "Timer#ama::OnDisable";
-			donpcevent "Assistant#ama::Onreset";
+			donpcevent "Assistant#ama::OnReset";
 			end;
 		}
 		mes "[Coach]";
@@ -673,7 +673,7 @@ OnEnable:
 	monster "ama_test",56,108,"Am Mut",1301,1,"Am Mut#ama::OnMyMobDead";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "ama_test","Am Mut#ama::OnMyMobDead";
 	end;
 
@@ -723,7 +723,7 @@ OnTouch:
 	warp "amatsu",223,230;
 	disablenpc "Coach#after";
 	donpcevent "Timer#ama::OnDisable";
-	donpcevent "Assistant#ama::Onreset";
+	donpcevent "Assistant#ama::OnReset";
 	end;
 }
 	
@@ -764,7 +764,7 @@ OnTimer362000:
 	end;
 
 OnTimer362500:
-	donpcevent "Assistant#ama::Onreset";
+	donpcevent "Assistant#ama::OnReset";
 	donpcevent "Timer#ama::OnDisable";
 	end;
 }

npc/quests/quests_juperos.txt

@@ -1833,7 +1833,7 @@ OnInit:
 	initnpctimer;
 	end;
 
-Onreset:
+OnReset:
 	killmonster "juperos_02","3F Gate Switch#jupe::OnMyMobDead";
 	end;
 
@@ -2049,7 +2049,7 @@ jupe_area1,88,224,0	script	#hole#1-1	844,{
 		end;
 	}
 
-Onstop_timer:
+OnStop_Timer:
 	stopnpctimer;
 	end;
 
@@ -2090,7 +2090,7 @@ OnInit:
 OnTouch:
 	donpcevent "Red Alarm On#1-1::OnEnable";
 	disablenpc "Red Alarm#1-1";
-	donpcevent "#hole#1-1::Onstop_timer";
+	donpcevent "#hole#1-1::OnStop_Timer";
 	set $@JupreArea1InUse,1;
 	disablenpc "#hole#1-1";
 	end;
@@ -2343,7 +2343,7 @@ jupe_area1,25,238,0	script	#hole#1-2	844,{
 	}
 	end;
 
-Onstop_timer:
+OnStop_Timer:
 	stopnpctimer;
 	end;
 
@@ -2630,7 +2630,7 @@ jupe_area1,36,146,0	script	#hole#1-3	844,{
 	}
 	end;
 
-Onstop_timer:
+OnStop_Timer:
 	stopnpctimer;
 	end;
 
@@ -2919,7 +2919,7 @@ jupe_area1,50,49,0	script	#hole#1-4	844,{
 	}
 	end;
 
-Onstop_timer:
+OnStop_Timer:
 	stopnpctimer;
 	end;
 
@@ -3258,7 +3258,7 @@ jupe_area2,74,224,0	script	#hole#2-1	844,{
 		end;
 	}
 
-Onstop_timer:
+OnStop_Timer:
 	stopnpctimer;
 	end;
 
@@ -3299,7 +3299,7 @@ OnInit:
 OnTouch:
 	donpcevent "Red Alarm On#2-1::OnEnable";
 	disablenpc "Red Alarm#2-1";
-	donpcevent "#hole#2-1::Onstop_timer";
+	donpcevent "#hole#2-1::OnStop_Timer";
 	set $@JupreArea2InUse,1;
 	disablenpc "#hole#2-1";
 	end;
@@ -3552,7 +3552,7 @@ jupe_area2,138,238,0	script	#hole#2-2	844,{
 	}
 	end;
 
-Onstop_timer:
+OnStop_Timer:
 	stopnpctimer;
 	end;
 
@@ -3839,7 +3839,7 @@ jupe_area2,127,146,0	script	#hole#2-3	844,{
 	}
 	end;
 
-Onstop_timer:
+OnStop_Timer:
 	stopnpctimer;
 	end;
 
@@ -4130,7 +4130,7 @@ jupe_area2,113,49,0	script	#hole#2-4	844,{
 	}
 	end;
 
-Onstop_timer:
+OnStop_Timer:
 	stopnpctimer;
 	end;
 

npc/quests/quests_louyang.txt

@@ -4568,7 +4568,7 @@ lou_in01,99,144,4	script	Soldier#bailong4	825,{
 }
 
 // Revolution Quest
-//===================================================================
+//============================================================
 lou_in02,77,37,7	script	Hermit	824,{
 
 	if(!QL_REVOL)

npc/quests/quests_morocc.txt

@@ -667,7 +667,7 @@ OnInit:
 	set $maobar_room,0;
 	end;
 
-Onreset:
+OnReset:
 	set $maobar_room,0;
 	end;
 
@@ -741,12 +741,12 @@ OnEnable:
 	mapannounce "que_job01","You will now enter the Master Zone, Area 1.",bc_map,"0x70DBDB";
 	end;
 
-Onstop:
+OnStop:
 	mapannounce "que_job01","The security magic in the Master Zone, Area 1 is deactivated.",bc_map,"0x70DBDB";
 	donpcevent "#room1_warp::OnDisable";
 	donpcevent "Valdes#moc_master_1::OnDisable";
 	donpcevent "Marjana#poison::OnDisable";
-	donpcevent "que_job01#room_1::Onreset";
+	donpcevent "que_job01#room_1::OnReset";
 	stopnpctimer;
 	end;
 
@@ -762,7 +762,7 @@ OnTimer245000:
 
 OnTimer250000:
 	mapannounce "que_job01","The security magic Master Zone, Area 1 is now activated.",bc_map,"0x70DBDB";
-	donpcevent "que_job01#room_1::Onreset";
+	donpcevent "que_job01#room_1::OnReset";
 	stopnpctimer;
 	end;
 }

npc/quests/quests_moscovia.txt

@@ -27,9 +27,8 @@
 //= 2.1 Fixed incorrect use of 'close'. [Joseph]
 //============================================================ 
 
-//============================================================================
 // The Moving Island
-//============================================================================
+//============================================================
 
 //----------------------------------------------------------------------------
 // Berbayeff - Starting Point
@@ -1709,7 +1708,7 @@ S_AS_2:
 	mes "So, what will you do now?";
 	next;
 	switch (select("How would I get back here?:"+((getarg(0))?"I want to learn the Gusli":"")+":Go back to the mainland.")) {
-		Case 1:
+		case 1:
 			mes "[Aged Stranger]";
 			mes "You are my friend now,";
 			mes "and you have this instrument.";
@@ -1734,7 +1733,7 @@ S_AS_2:
 			mes "with this island. Only if you are a";
 			mes "friend... heheh.";
 			close;
-		Case 2:
+		case 2:
 			mes "[Aged Stranger]";
 			mes "You really want to...";
 			mes "learn this instrument...";
@@ -1757,7 +1756,7 @@ S_AS_2:
 			mes "Gusli, let me know.";
 			set mos_whale_edq,36;
 			close;	
-		Case 3:
+		case 3:
 			mes "[Aged Stranger]";
 			mes "I see. Okay, let's go.";
 			next;
@@ -2579,10 +2578,10 @@ OnEnable:
 	enablenpc strnpcinfo(0);
 	set .@c,charat(strnpcinfo(0),9);
 	switch (.@c) {
-		Case 1: setarray .@m, 89,112,1425,85,110,1425; break;
-		Case 2: setarray .@m, 89,112,1425,80,110,1426,83,114,1426,85,110,1425; break;
-		Case 3: setarray .@m, 85,111,1451,89,112,1543,90,106,1543; break;
-		Case 4: setarray .@m, 85,111,1451,89,112,1543,90,106,1543; break;
+		case 1: setarray .@m, 89,112,1425,85,110,1425; break;
+		case 2: setarray .@m, 89,112,1425,80,110,1426,83,114,1426,85,110,1425; break;
+		case 3: setarray .@m, 85,111,1451,89,112,1543,90,106,1543; break;
+		case 4: setarray .@m, 85,111,1451,89,112,1543,90,106,1543; break;
 	}
 	for (set .@i, 0; .@i < getarraysize(.@m); set .@i, .@i + 3)
 		monster "mosk_ship",.@m[.@i],.@m[.@i+1],"Sea Monster",.@m[.@i+2],1,strnpcinfo(0)+"::OnMyMobDead";
@@ -2604,10 +2603,10 @@ OnMyMobDead:
 		mes "normally.";
 		set .@c,charat(strnpcinfo(0),9);
 		switch (.@c) {
-			Case 1: break;
-			Case 2: break;
-			Case 3: set mos_whale_edq,11; break;
-			Case 4: set mos_whale_edq,26; break;
+			case 1: break;
+			case 2: break;
+			case 3: set mos_whale_edq,11; break;
+			case 4: set mos_whale_edq,26; break;
 		}
 		donpcevent strnpcinfo(0)+"::OnDisable";
 		close;
@@ -2625,9 +2624,8 @@ mosk_ship,3,3,4	duplicate(Baehideun#main)	Baehideun2#ship	-1
 mosk_ship,5,5,4	duplicate(Baehideun#main)	Baehideun3#ship	-1
 mosk_ship,15,15,4	duplicate(Baehideun#main)	Baehideun4#ship	-1
 
-//============================================================================
 // Help Mikhail
-//============================================================================
+//============================================================
 
 //----------------------------------------------------------------------------
 // Gallina - Starting Point
@@ -3940,9 +3938,8 @@ mosk_in,211,259,5	script	Larissa#mos_01	960,{
 	close;
 }
 
-//============================================================================
 // Acorn Exchange
-//============================================================================
+//============================================================
 
 //----------------------------------------------------------------------------
 // Acorn Dealer - Sells Acorns
@@ -4123,9 +4120,8 @@ S_BS_1:
 mosk_fild01,113,108,3	duplicate(Squirrel#mos_main)	Big Squirrel#mos	111
 mosk_fild01,113,108,5	duplicate(Squirrel#mos_main)	#mos_sq	1104,2,2
 
-//============================================================================
 // Banish Winter
-//============================================================================
+//============================================================
 
 //----------------------------------------------------------------------------
 // Baba Yaga, the Horrible - Starting Point
@@ -6481,9 +6477,8 @@ mosk_in,131,92,3	script	#Csar	-1,7,7,{
 	end;
 }
 
-//============================================================================
 // Shafka Hat
-//============================================================================
+//============================================================
 moscovia,211,93,3	script	Irina#edq	958,{
 	if (!checkweight(1201,1)) {
 		mes "Wait a moment!!";
@@ -6591,9 +6586,8 @@ moscovia,211,93,3	script	Irina#edq	958,{
 	close;
 }
 
-//============================================================================
 // Koshei the Immortal
-//============================================================================
+//============================================================
 
 //----------------------------------------------------------------------------
 // Sage - Starting Point
@@ -7307,12 +7301,12 @@ mosk_dun01,45,259,0	script	Wall#rus04	111,{
 		set rhea_rus_main,52;
 		set .@rus_food,rand(1,6);
 		switch (rand(1,6)) {
-			Case 1: getitem 12093,1; break;
-			Case 2: getitem 12088,1; break;
-			Case 3: getitem 12073,1; break;
-			Case 4: getitem 12078,1; break;
-			Case 5: getitem 12083,1; break;
-			Case 6: getitem 12098,1; break;
+			case 1: getitem 12093,1; break;
+			case 2: getitem 12088,1; break;
+			case 3: getitem 12073,1; break;
+			case 4: getitem 12078,1; break;
+			case 5: getitem 12083,1; break;
+			case 6: getitem 12098,1; break;
 		}
 		if (BaseLevel < 56) getexp 1300,350;
 		else if (BaseLevel < 61) getexp 2460,615;
@@ -11057,12 +11051,12 @@ treasure01,27,115,0	script	Opened Treasure Chest#41	111,{
 			next;
 		} else {
 			switch (.@russ_key02) {
-				Case 1: mes "- You find the cuticle of Kukre !! -"; break;
-				Case 2: mes "- You find the egg of a Theif Bug !! -"; break;
-				Case 4: mes "- You find something that seems to be a banana before !! -"; break;
-				Case 5: mes "- You find the tentacles of a Jelly Fish !! -"; break;
-				Case 6: mes "- You find pieces of cloth with must on it !! -"; break;
-				Case 7: mes "- You find a bone !! -"; break;
+				case 1: mes "- You find the cuticle of Kukre !! -"; break;
+				case 2: mes "- You find the egg of a Theif Bug !! -"; break;
+				case 4: mes "- You find something that seems to be a banana before !! -"; break;
+				case 5: mes "- You find the tentacles of a Jelly Fish !! -"; break;
+				case 6: mes "- You find pieces of cloth with must on it !! -"; break;
+				case 7: mes "- You find a bone !! -"; break;
 			}
 			next;
 			mes "["+ strcharinfo(0) +"]";
@@ -11809,4 +11803,4 @@ pay_dun04,163,186,0	script	Ghost Tree#rus45	111,{
 		close;
 	}
 	end;
-}
+}

npc/quests/quests_nameless.txt

@@ -8744,7 +8744,7 @@ OnDisable:
 	stopnpctimer;
 	end;
 
-Onreset:
+OnReset:
 	killmonster "z_agit","#ZGuard::OnMyMobDead";
 	set $@monster_zgang,0;
 	end;

npc/quests/seals/god_weapon_creation.txt

@@ -797,7 +797,7 @@ OnTimer612000:
 
 OnTimer615000:
 	donpcevent "god_wep_warpmaster::OnDisable";
-	donpcevent " #god_hopewarp1::Onreset";
+	donpcevent "#god_hopewarp1::OnReset";
 	stopnpctimer;
 	end;
 }
@@ -849,7 +849,7 @@ que_god01,293,3,0	script	Godly Item Quests Related#god	90,{
 			mes "[Use in case of emergency]";
 			mes "Please press the 'Next' button to reset the arena chat room in que_god01.";
 			next;
-			donpcevent " #god_hopewarp1::Onreset";
+			donpcevent "#god_hopewarp1::OnReset";
 			mes "[Use in case of emergency]";
 			mes "You have successfully reset the arena chat room (Laboratory Entrance 1/2).";
 			close;

npc/quests/the_sign_quest.txt

@@ -1,7 +1,7 @@
 //===== rAthena Script ======================================= 
 //= The Sign Quest
 //===== By: ================================================== 
-//= SinSloth(Most of the NPCs), MasterOfMuppets(Some of the NPCs + bug fixes) & Kargha(The quiz NPCs)
+//= SinSloth, MasterOfMuppets, Kargha
 //===== Current Version: ===================================== 
 //= 3.7
 //===== Compatible With: ===================================== 
@@ -28,9 +28,8 @@
 //= 3.8 Corrected an invalid map name. [Joseph]
 //============================================================ 
 
-//============================================================ 
 // The Sign (Part 1)
-//============================================================ 
+//============================================================
 -	script	Sign::TheSign	111,{
 	callfunc "F_UpdateSignVars";
 	cutin "sign_01",4;
@@ -4969,14 +4968,14 @@ OnInit:
 	end;
 
 OnStartArena:
-	donpcevent "s_dance_timer::Onbutton_off";
+	donpcevent "s_dance_timer::OnButton_Off";
 	donpcevent "Examiner#sd::OnDisable";
 	warpwaitingpc "cmd_in01",16,15,1;
 	donpcevent "s_dance_timer::OnEnable";
 	disablewaitingroomevent;
 	end;
 
-Onreset:
+OnReset:
 	enablewaitingroomevent;
 	end;
 }
@@ -4990,7 +4989,7 @@ OnDisable:
 	stopnpctimer;
 	end;
 
-Onbutton_off:
+OnButton_Off:
 	callsub OnDisableAll;
 	end;
 
@@ -5008,90 +5007,90 @@ OnTimer2000:
 
 OnTimer4000:
 	mapannounce "cmd_in01"," UP LEFT",bc_map,"0xFFFF00";
-	donpcevent "s_dance#up::Onup";
+	donpcevent "s_dance#up::OnUp";
 	donpcevent "s_dance#up::OnEnable";
 	end;
 
 OnTimer6000:
 	callsub OnDisableAll;
 	mapannounce "cmd_in01"," DOWN RIGHT",bc_map,"0xFFFF00";
-	donpcevent "s_dance#down::Onup";
+	donpcevent "s_dance#down::OnUp";
 	donpcevent "s_dance#down::OnEnable";
 	end;
 
 OnTimer8000:
 	callsub OnDisableAll;
 	mapannounce "cmd_in01"," DOWN LEFT & UP RIGHT",bc_map,"0xFFFF00";
-	donpcevent "s_dance#left::Onup";
+	donpcevent "s_dance#left::OnUp";
 	donpcevent "s_dance#left::OnEnable";
 	end;
 
 OnTimer11000:
 	callsub OnDisableAll;
 	mapannounce "cmd_in01"," DOWN RIGHT",bc_map,"0xFFFF00";
-	donpcevent "s_dance#down::Onup";
+	donpcevent "s_dance#down::OnUp";
 	donpcevent "s_dance#down::OnEnable";
 	end;
 
 OnTimer13000:
 	callsub OnDisableAll;
 	mapannounce "cmd_in01"," DOWN LEFT & UP RIGHT & UP LEFT & STAY CENTER",bc_map,"0xFFFF00";
-	donpcevent "s_dance#left::Onup";
+	donpcevent "s_dance#left::OnUp";
 	donpcevent "s_dance#left::OnEnable";
 	end;
 
 OnTimer18000:
 	callsub OnDisableAll;
 	mapannounce "cmd_in01"," DOWN LEFT & DOWN RIGHT & DOWN LEFT",bc_map,"0xFFFF00";
-	donpcevent "s_dance#left::Onup";
+	donpcevent "s_dance#left::OnUp";
 	donpcevent "s_dance#left::OnEnable";
 	end;
 
 OnTimer21000:
 	callsub OnDisableAll;
 	mapannounce "cmd_in01"," DOWN RIGHT & CENTER & DOWN RIGHT",bc_map,"0xFFFF00";
-	donpcevent "s_dance#down::Onup";
+	donpcevent "s_dance#down::OnUp";
 	donpcevent "s_dance#down::OnEnable";
 	end;
 
 OnTimer24000:
 	callsub OnDisableAll;
 	mapannounce "cmd_in01"," DOWN LEFT & UP LEFT & UP RIGHT & DOWN RIGHT & CENTER",bc_map,"0xFFFF00";
-	donpcevent "s_dance#left::Onup";
+	donpcevent "s_dance#left::OnUp";
 	donpcevent "s_dance#left::OnEnable";
 	end;
 
 OnTimer30000:
 	callsub OnDisableAll;
 	mapannounce "cmd_in01"," DOWN LEFT & UP RIGHT & UP LEFT & DOWN RIGHT",bc_map,"0xFFFF00";
-	donpcevent "s_dance#left::Onup";
+	donpcevent "s_dance#left::OnUp";
 	donpcevent "s_dance#left::OnEnable";
 	end;
 
 OnTimer34000:
 	callsub OnDisableAll;
 	mapannounce "cmd_in01"," UP RIGHT & DOWN RIGHT & UP RIGHT & DOWN RIGHT",bc_map,"0xFFFF00";
-	donpcevent "s_dance#right::Onup";
+	donpcevent "s_dance#right::OnUp";
 	donpcevent "s_dance#right::OnEnable";
 	end;
 
 OnTimer38000:
 	callsub OnDisableAll;
 	mapannounce "cmd_in01"," UP LEFT & UP RIGHT & CENTER & UP RIGHT & DOWN LEFT & DOWN RIGHT",bc_map,"0xFFFF00";
-	donpcevent "s_dance#up::Onup";
+	donpcevent "s_dance#up::OnUp";
 	donpcevent "s_dance#up::OnEnable";
 	end;
 
 OnTimer44000:
 	stopnpctimer;
-	donpcevent "s_dance#up::Onreset";
-	donpcevent "s_dance#down::Onreset";
-	donpcevent "s_dance#left::Onreset";
-	donpcevent "s_dance#right::Onreset";
-	donpcevent "s_dance#cen::Onreset";
+	donpcevent "s_dance#up::OnReset";
+	donpcevent "s_dance#down::OnReset";
+	donpcevent "s_dance#left::OnReset";
+	donpcevent "s_dance#right::OnReset";
+	donpcevent "s_dance#cen::OnReset";
 	mapannounce "cmd_in01","Well done.",bc_map,"0xFFFF00";
 	enablenpc "Examiner#sd";
-	donpcevent "Standby Room#sign::Onreset";
+	donpcevent "Standby Room#sign::OnReset";
 	end;
 }
 
@@ -5110,41 +5109,41 @@ OnDisable:
 	disablenpc "s_dance#up";
 	end;
 
-Onup:
+OnUp:
 	set .s_up,.s_up + 1;
 	end;
 
-Onreset:
+OnReset:
 	set .s_up,0;
 	end;
 
 OnTouch:
 	soundeffect "effect\\sign_up.wav",1;
 	if (.s_up == 1) {
-		donpcevent "Examiner#sd::Onup";
+		donpcevent "Examiner#sd::OnUp";
 		donpcevent "s_dance#up::OnDisable";
 	}
 	else if (.s_up == 2) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#cen::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#cen::OnUp";
 		donpcevent "s_dance#cen::OnEnable";
 		donpcevent "s_dance#up::OnDisable";
 	}
 	else if (.s_up == 3) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#right::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#right::OnUp";
 		donpcevent "s_dance#right::OnEnable";
 		donpcevent "s_dance#up::OnDisable";
 	}
 	else if (.s_up == 4) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#down::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#down::OnUp";
 		donpcevent "s_dance#down::OnEnable";
 		donpcevent "s_dance#up::OnDisable";
 	}
 	else if (.s_up == 5) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#right::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#right::OnUp";
 		donpcevent "s_dance#right::OnEnable";
 		donpcevent "s_dance#up::OnDisable";
 	}
@@ -5166,62 +5165,62 @@ OnDisable:
 	disablenpc "s_dance#down";
 	end;
 
-Onup:
+OnUp:
 	set .s_down,.s_down + 1;
 	end;
 
-Onreset:
+OnReset:
 	set .s_down,0;
 	end;
 
 OnTouch:
 	soundeffect "effect\\sign_down.wav",1;
 	if (.s_down == 1) {
-		donpcevent "Examiner#sd::Onup";
+		donpcevent "Examiner#sd::OnUp";
 		donpcevent "s_dance#down::OnDisable";
 	}
 	else if (.s_down == 2) {
-		donpcevent "Examiner#sd::Onup";
+		donpcevent "Examiner#sd::OnUp";
 		donpcevent "s_dance#down::OnDisable";
 	}
 	else if (.s_down == 3) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#left::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#left::OnUp";
 		donpcevent "s_dance#left::OnEnable";
 		donpcevent "s_dance#down::OnDisable";
 	}
 	else if (.s_down == 4) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#cen::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#cen::OnUp";
 		donpcevent "s_dance#cen::OnEnable";
 		donpcevent "s_dance#down::OnDisable";
 	}
 	else if (.s_down == 5) {
-		donpcevent "Examiner#sd::Onup";
+		donpcevent "Examiner#sd::OnUp";
 		donpcevent "s_dance#down::OnDisable";
 	}
 	else if (.s_down == 6) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#cen::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#cen::OnUp";
 		donpcevent "s_dance#cen::OnEnable";
 		donpcevent "s_dance#down::OnDisable";
 	}
 	else if (.s_down == 7) {
-		donpcevent "Examiner#sd::Onup";
+		donpcevent "Examiner#sd::OnUp";
 		donpcevent "s_dance#down::OnDisable";
 	}
 	else if (.s_down == 8) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#right::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#right::OnUp";
 		donpcevent "s_dance#right::OnEnable";
 		donpcevent "s_dance#down::OnDisable";
 	}
 	else if (.s_down == 9) {
-		donpcevent "Examiner#sd::Onup";
+		donpcevent "Examiner#sd::OnUp";
 		donpcevent "s_dance#down::OnDisable";
 	}
 	else if (.s_down == 10) {
-		donpcevent "Examiner#sd::Onup";
+		donpcevent "Examiner#sd::OnUp";
 		donpcevent "s_dance#down::OnDisable";
 	}
 	end;
@@ -5243,53 +5242,53 @@ OnDisable:
 	disablenpc "s_dance#left";
 	end;
 
-Onup:
+OnUp:
 	set .s_left,.s_left + 1;
 	end;
 
-Onreset:
+OnReset:
 	set .s_left,0;
 	end;
 
 OnTouch:
 	soundeffect "effect\\sign_left.wav",1;
 	if (.s_left == 1) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#right::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#right::OnUp";
 		donpcevent "s_dance#right::OnEnable";
 		donpcevent "s_dance#left::OnDisable";
 	}
 	else if (.s_left == 2) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#right::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#right::OnUp";
 		donpcevent "s_dance#right::OnEnable";
 		donpcevent "s_dance#left::OnDisable";
 	}
 	else if (.s_left == 3) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#down::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#down::OnUp";
 		donpcevent "s_dance#down::OnEnable";
 		donpcevent "s_dance#left::OnDisable";
 	}
 	else if (.s_left == 4) {
-		donpcevent "Examiner#sd::Onup";
+		donpcevent "Examiner#sd::OnUp";
 		donpcevent "s_dance#left::OnDisable";
 	}
 	else if (.s_left == 5) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#up::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#up::OnUp";
 		donpcevent "s_dance#up::OnEnable";
 		donpcevent "s_dance#left::OnDisable";
 	}
 	else if (.s_left == 6) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#right::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#right::OnUp";
 		donpcevent  "s_dance#right::OnEnable";
 		donpcevent "s_dance#left::OnDisable";
 	}
 	else if (.s_left == 7) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#down::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#down::OnUp";
 		donpcevent "s_dance#down::OnEnable";
 		donpcevent "s_dance#left::OnDisable";
 	}
@@ -5311,59 +5310,59 @@ OnDisable:
 	disablenpc "s_dance#right";
 	end;
 
-Onup:
+OnUp:
 	set .s_right,.s_right + 1;
 	end;
 
-Onreset:
+OnReset:
 	set .s_right,0;
 	end;
 
 OnTouch:
 	soundeffect "effect\\sign_right.wav",1;
 	if (.s_right == 1) {
-		donpcevent "Examiner#sd::Onup";
+		donpcevent "Examiner#sd::OnUp";
 		donpcevent "s_dance#right::OnDisable";
 	}
 	else if (.s_right == 2) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#up::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#up::OnUp";
 		donpcevent "s_dance#up::OnEnable";
 		donpcevent "s_dance#right::OnDisable";
 	}
 	else if (.s_right == 3) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#down::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#down::OnUp";
 		donpcevent "s_dance#down::OnEnable";
 		donpcevent "s_dance#right::OnDisable";
 	}
 	else if (.s_right == 4) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#up::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#up::OnUp";
 		donpcevent "s_dance#up::OnEnable";
 		donpcevent "s_dance#right::OnDisable";
 	}
 	else if (.s_right == 5) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#down::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#down::OnUp";
 		donpcevent "s_dance#down::OnEnable";
 		donpcevent "s_dance#right::OnDisable";
 	}
 	else if (.s_right == 6) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#down::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#down::OnUp";
 		donpcevent "s_dance#down::OnEnable";
 		donpcevent "s_dance#right::OnDisable";
 	}
 	else if (.s_right == 7) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#cen::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#cen::OnUp";
 		donpcevent "s_dance#cen::OnEnable";
 		donpcevent "s_dance#right::OnDisable";
 	}
 	else if (.s_right == 8) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#left::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#left::OnUp";
 		donpcevent "s_dance#left::OnEnable";
 		donpcevent "s_dance#right::OnDisable";
 	}
@@ -5385,33 +5384,33 @@ OnDisable:
 	disablenpc "s_dance#cen";
 	end;
 	
-Onup:
+OnUp:
 	set .s_center,.s_center + 1;
 	end;
 
-Onreset:
+OnReset:
 	set .s_center,0;
 	end;
 
 OnTouch:
 	soundeffect "effect\\sign_center.wav",1;
 	if (.s_center == 1) {
-		donpcevent "Examiner#sd::Onup";
+		donpcevent "Examiner#sd::OnUp";
 		donpcevent "s_dance#cen::OnDisable";
 	}
 	else if (.s_center == 2) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#down::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#down::OnUp";
 		donpcevent "s_dance#down::OnEnable";
 		donpcevent "s_dance#cen::OnDisable";
 	}
 	else if (.s_center == 3) {
-		donpcevent "Examiner#sd::Onup";
+		donpcevent "Examiner#sd::OnUp";
 		donpcevent "s_dance#cen::OnDisable";
 	}
 	else if (.s_center == 4) {
-		donpcevent "Examiner#sd::Onup";
-		donpcevent "s_dance#right::Onup";
+		donpcevent "Examiner#sd::OnUp";
+		donpcevent "s_dance#right::OnUp";
 		donpcevent "s_dance#right::OnEnable";
 		donpcevent "s_dance#cen::OnDisable";
 	}
@@ -5443,7 +5442,7 @@ OnTouch:
 	donpcevent "Examiner#sd::OnDisable";
 	end;
 
-Onup:
+OnUp:
 	set .s_check,.s_check + 1;
 	end;
 
@@ -6847,10 +6846,8 @@ yuno,330,100,4	script	Knight#ss	734,{
 	}
 }
 
-//============================================================ 
 // The Sign (Part 2)
-//============================================================ 
-
+//============================================================
 geffen_in,159,48,5	script	Lonely-looking Woman	711,{
 	callfunc "F_UpdateSignVars";
 	mes "[Brenda Howard]";
@@ -8295,10 +8292,8 @@ himinn,48,86,5	script	Valkyrie#sign	811,{
 	}
 }
 
-//============================================================ 
 // The Sign (Part 3)
-//============================================================ 
-
+//============================================================
 que_sign01,196,39,4	script	Serin#dummy	90,{
 	end;
 
@@ -8311,7 +8306,7 @@ OnEnable:
 	enablenpc "Serin#dummy";
 	end;
 
-Onstart:
+OnStart:
 	initnpctimer;
 	end;
 
@@ -8379,7 +8374,7 @@ que_sign01,196,39,4	script	Serin#serin	90,{
 		delitem 7305,1; //Authority_Of_Nine_World
 		set sign_q,133;
 		donpcevent "Serin#dummy::OnEnable";
-		donpcevent "Serin#dummy::Onstart";
+		donpcevent "Serin#dummy::OnStart";
 		donpcevent "Serin#serin::OnDisable";
 		close;
 	}
@@ -12230,7 +12225,7 @@ geffen,119,48,0	script	Fountain#s	111,{
 
 que_sign01,196,44,0	script	Starter#serin	-1,32,32,{
 OnTouch:
-	donpcevent "Timer#serin::Onstart";
+	donpcevent "Timer#serin::OnStart";
 	disablenpc "Starter#serin";
 	end;
 
@@ -12255,7 +12250,7 @@ OnEnable:
 }
 
 que_sign01,1,0,0	script	Timer#serin	-1,{
-Onstart:
+OnStart:
 	initnpctimer;
 	end;
 
@@ -12270,7 +12265,7 @@ OnTimer620000:
 	donpcevent "Serin#serin::OnEnable";
 	donpcevent "Dark Lord#serin::OnDisable";
 	donpcevent "Serin#dummy::OnDisable";
-	donpcevent "CallMonster#serin::Onreset";
+	donpcevent "CallMonster#serin::OnReset";
 	stopnpctimer;
 	end;
 }
@@ -12285,13 +12280,13 @@ OnMyMobDead:
 		donpcevent "Serin#serin::OnEnable";
 	end;
 
-Onreset:
+OnReset:
 	killmonster "que_sign01","CallMonster#serin::OnMyMobDead";
 }
 
 que_sign01,197,195,0	script	Starter#witch	-1,32,32,{
 OnTouch:
-	donpcevent "Timer#witch::Onstart";
+	donpcevent "Timer#witch::OnStart";
 	disablenpc "Starter#witch";
 	end;
 
@@ -12301,7 +12296,7 @@ OnEnable:
 }
 
 que_sign01,1,1,0	script	Timer#witch	-1,{
-Onstart:
+OnStart:
 	initnpctimer;
 	end;
 
@@ -12312,7 +12307,7 @@ OnTimer600000:
 OnTimer620000:
 	donpcevent "Starter#witch::OnEnable";
 	donpcevent "Warp#witch::OnDisable";
-	donpcevent "CallMonster#witch::Onreset";
+	donpcevent "CallMonster#witch::OnReset";
 	donpcevent "Serin#witch::OnEnable";
 	set $@sign_w1,0;
 	stopnpctimer;
@@ -12354,7 +12349,7 @@ OnMyMobDead:
 	}
 	end;
 
-Onreset:
+OnReset:
 	killmonster "que_sign01","CallMonster#witch::OnMyMobDead";
 	end;
 }

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

@@ -278,7 +278,7 @@ umbala,139,227,3	script	Priest#arch	60,{
 		mes "And in Asgard, the world of the Gods, there is the Word spring.";
 		next;
 		mes "[Priest Dayan]";
-		mes "Mimir'’s spring wells with intelligence, myth says that if Odin lets you have his eye that you will gain all of the knowledge within that spring.";
+		mes "Mimir's spring wells with intelligence, myth says that if Odin lets you have his eye that you will gain all of the knowledge within that spring.";
 		next;
 		mes "[Priest Dayan]";
 		mes Sex?"Brother.":"Sister.";
@@ -1532,8 +1532,8 @@ OnEnable:
 	donpcevent "#arch_redcell::OnRed";
 	donpcevent "mob#arch_1::OnKill";
 	donpcevent "mob#arch_2::OnKill";
-	donpcevent "start#arch::OnTimeoff";
-	donpcevent "start#arch::OnTimeon";
+	donpcevent "start#arch::OnTimeOff";
+	donpcevent "start#arch::OnTimeOn";
 	donpcevent "#arch_val01::OnKill";
 	donpcevent "#arch_val02::OnKill";
 	donpcevent "mob#arch_1::OnKill";
@@ -1541,10 +1541,10 @@ OnEnable:
 	donpcevent "mob#arch_1::OnEnable";
 	donpcevent "#arch_val01::OnEnable";
 	end;
-OnTimeon:
+OnTimeOn:
 	initnpctimer;
 	end;
-OnTimeoff:
+OnTimeOff:
 	stopnpctimer;
 	end;
 OnTimer60000:

npc/re/jobs/novice/novice.txt

@@ -1798,9 +1798,8 @@ new_3-3,121,41,4	duplicate(NvBruce)	Bruce#nv3	57
 new_4-3,121,41,4	duplicate(NvBruce)	Bruce#nv4	57
 new_5-3,121,41,4	duplicate(NvBruce)	Bruce#nv5	57
 
-//============================================================================
 // Eden Group Officer (Real Combat Training)
-//============================================================================
+//============================================================
 -	script	Eden Group Officer#nv::NvEdn	-1,{
 	if(BaseLevel < 10) {
 		mes "[Eden Group Officer]";

npc/re/quests/quests_dicastes.txt

@@ -3641,11 +3641,11 @@ dic_in01,245,119,4	script	Shay#ep133_13	884,{
 	cutin "ep13_shy",2;
 	mes "[Shay]";
 	switch (rand(1,5)) {
-		Case 1: mes ".. Burman Flone."; break;
-		Case 2: mes "What?"; break;
-		Case 3: mes "Boring. What is it?"; break;
-		Case 4: mes "Sigh... Ready to order?"; break;
-		Case 5:
+		case 1: mes ".. Burman Flone."; break;
+		case 2: mes "What?"; break;
+		case 3: mes "Boring. What is it?"; break;
+		case 4: mes "Sigh... Ready to order?"; break;
+		case 5:
 			mes "Another failure?.";
 			mes "I'm talking to myself. Don't bother.";
 			mes "What do you want?";