11 files changed, 256 insertions, 193 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index bb4b694e5..6985d3b05 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,12 @@
 Date		Added
 ======
+2009/05/17
+	* Rev. 13782 First round of bug fixes for the Okolnir scripts. (bugreport:3085) [L0ne_W0lf]
+	- Fixed two spawn locations of the key stones in Piamete's room.
+	- Fixed calling an event that doesn't exist when killing Piamete.
+	- Fixed the Wish Maiden not enabling when the boss is killed.
+	- Fixed two NPC named that were missed when translating.
+	- Fixed Dialog that was overlooked in some files and not others.
 2009/05/15
 	* Rev. 13781 Falicious Okolnir update - Brynhild creation quest. Basic unoptimized version. [L0ne_W0lf]
 	* Rev. 13780 Falicious Okolnir update - Asprika creation quest. Basic unoptimized version. [L0ne_W0lf]
diff --git a/npc/quests/okolnir/godse_aru01.txt b/npc/quests/okolnir/godse_aru01.txt
index 1394f64da..add9434f6 100644
--- a/npc/quests/okolnir/godse_aru01.txt
+++ b/npc/quests/okolnir/godse_aru01.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -11,6 +11,12 @@
 //= God Item SE Creation scipt (Asprika)
 //===== Additional Comments: ================================= 
 //= 1.0 First version. [L0ne_W0lf]
+//= 1.1 First round of bug fixes. (bugreport:3085) [L0ne_W0lf]
+//=     Fixed two spawn locations of the key stones in Piamete's room.
+//=     Fixed calling an event that doesn't exist when killing Piamete.
+//=     Fixed the Wish Maiden not enabling when the boss is killed.
+//=     Fixed two NPC named that were missed when translating.
+//=     Fixed Dialog that was overlooked in some files and not others.
 //============================================================ 
 
 arug_cas01,161,371,3	script	Guide#gq_aru01	899,{
@@ -209,8 +215,8 @@ que_qaru01,345,82,3	script	Wish Maiden#gq_aru01	403,{
 						else {
 							cutin "wish_maiden13",1;
 							mes "[Wish Maiden]";
-							mes "¿ÀÄݴϸ£ÀÇ ¹®À» ¿­ ÀÚ´Â ¿­´Ù¼¸À» ³Ñ¾î¾ß ÇÏ°í ½º¹°À» ³Ñ¾î¼± ¾ÈµÈ´Ù.";
-							mes "ÇÔ²² ÇÒ À̵éÀ» ´Ù½Ã µ¥·Á¿À¶ó.";
+							mes "You need to have 16 to 20 members present to open the gate of Okolnir.";
+							mes "Come back when you are ready.";
 							close2;
 						}
 						break;
@@ -1000,8 +1006,8 @@ OnDisable:
 	disablenpc "#aru01_cage04";
 	disablenpc "#aru01_cage05";
 	disablenpc "#aru01_cage06";
-	donpcevent "windpath03_aru01::OnDisable";
-	donpcevent "windpath04_aru01::OnDisable";
+	disablenpc "windpath03_aru01";
+	disablenpc "windpath04_aru01";
 	set $gqse_aru01_miro,0;
 	set $gqse_aru01_pcc,0;
 	set $gqse_aru01_gd,0;
@@ -1087,8 +1093,8 @@ OnTimer3600000:
 	disablenpc "#aru01_cage04";
 	disablenpc "#aru01_cage05";
 	disablenpc "#aru01_cage06";
-	donpcevent "windpath03_aru01::OnDisable";
-	donpcevent "windpath04_aru01::OnDisable";
+	disablenpc "windpath03_aru01";
+	disablenpc "windpath04_aru01";
 	end;
 
 OnTimer3605000:
@@ -1771,8 +1777,8 @@ OnTimer8000:
 OnTimer12000:
 	mapannounce "que_qaru01","Piamette : The keeper of the key is protecting my cage.",bc_map,"0xdb7093";
 	monster "que_qaru01",108,151,"Key Stone",1905,1,"#gdtimer02_aru01::OnMyMobDead";
-	monster "que_qaru01",107,135,"Key Stone",1905,1,"#gdtimer02_aru01::OnMyMobDead";
-	monster "que_qaru01",113,114,"Key Stone",1905,1,"#gdtimer02_aru01::OnMyMobDead";
+	monster "que_qaru01",109,135,"Key Stone",1905,1,"#gdtimer02_aru01::OnMyMobDead";
+	monster "que_qaru01",115,116,"Key Stone",1905,1,"#gdtimer02_aru01::OnMyMobDead";
 	monster "que_qaru01",158,106,"Key Stone",1905,1,"#gdtimer02_aru01::OnMyMobDead";
 	monster "que_qaru01",163,133,"Key Stone",1905,1,"#gdtimer02_aru01::OnMyMobDead";
 	monster "que_qaru01",150,154,"Key Stone",1905,1,"#gdtimer02_aru01::OnMyMobDead";
@@ -1842,8 +1848,8 @@ OnTimer5000:
 
 OnMyMobDead:
 	mapannounce "que_qaru01","Piamette has been released, so the warp gate toward the South is working now.",bc_map,"0x00ff00";
-	donpcevent "windpath03_aru01::OnEnable";
-	donpcevent "windpath04_aru01::OnEnable";
+	enablenpc "windpath03_aru01";
+	enablenpc "windpath04_aru01";
 	donpcevent "#nm_switch_aru01::OnEnable";
 	end;
 }
@@ -2998,9 +3004,9 @@ OnMyMobDead:
 	end;
 }
 
-que_qaru01,247,330,5	script	½ÅÀü¼öÈ£ÀÚ#aru01_ac01	1933,4,4,{
+que_qaru01,247,330,5	script	Temple Keeper#aru01_ac01	1933,4,4,{
 OnInit:
-	disablenpc "½ÅÀü¼öÈ£ÀÚ#aru01_ac01";
+	disablenpc "Temple Keeper#aru01_ac01";
 	end;
 
 OnDisable:
@@ -3019,9 +3025,9 @@ OnMyMobDead:
 	end;
 }
 
-que_qaru01,255,330,3	script	½ÅÀü¼öÈ£ÀÚ#aru01_ac02	1933,4,4,{
+que_qaru01,255,330,3	script	Temple Keeper#aru01_ac02	1933,4,4,{
 OnInit:
-	disablenpc "½ÅÀü¼öÈ£ÀÚ#aru01_ac02";
+	disablenpc "Temple Keeper#aru01_ac02";
 	end;
 
 OnDisable:
@@ -3042,12 +3048,12 @@ OnMyMobDead:
 
 que_qaru01,251,255,3	script	Wish Maiden#aru01_boss	1931,{
 OnInit:
-	disablenpc "Wish Maiden#aru01_boss";
+	hideonnpc "Wish Maiden#aru01_boss";
 	end;
 
 OnDisable:
 	killmonster "que_qaru01","Wish Maiden#aru01_boss::OnMyMobDead";
-	disablenpc "Wish Maiden#aru01_boss";
+	hideonnpc "Wish Maiden#aru01_boss";
 	stopnpctimer;
 	end;
 
@@ -3065,7 +3071,7 @@ OnTimer4000:
 
 OnTimer5000:
 	specialeffect EF_ICECRASH;
-	disablenpc "Wish Maiden#aru01_boss";
+	hideonnpc "Wish Maiden#aru01_boss";
 	specialeffect EF_SPHERE;
 	monster "que_qaru01",252,340,"Wish Maiden",1931,1,"Wish Maiden#aru01_boss::OnMyMobDead";
 	stopnpctimer;
@@ -3119,7 +3125,7 @@ que_qaru01,252,340,3	script	Wish Maiden#aru01_gift	403,{
 				close2;
 				cutin "wish_maiden11",255;
 				disablenpc "Wish Maiden#aru01_gift";
-				donpcevent "#to_agit_aru01_gate::OnEnable";
+				enablenpc "#to_agit_aru01_gate";
 				end;
 			}
 			else {
@@ -3225,7 +3231,7 @@ OnTimer3600000:
 		set $gqse_aru01_time,0;
 		enablenpc "Wish Maiden#gq_aru01";
 		enablenpc "Piamette#aru01";
-		donpcevent "Wish Maiden#aru01_boss::OnEnable";
+		hideoffnpc "Wish Maiden#aru01_boss";
 		stopnpctimer;
 	}
 	end;
diff --git a/npc/quests/okolnir/godse_aru02.txt b/npc/quests/okolnir/godse_aru02.txt
index 05933b994..2a3cb2c53 100644
--- a/npc/quests/okolnir/godse_aru02.txt
+++ b/npc/quests/okolnir/godse_aru02.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -11,6 +11,12 @@
 //= God Item SE Creation scipt (Asprika)
 //===== Additional Comments: ================================= 
 //= 1.0 First version. [L0ne_W0lf]
+//= 1.1 First round of bug fixes. (bugreport:3085) [L0ne_W0lf]
+//=     Fixed two spawn locations of the key stones in Piamete's room.
+//=     Fixed calling an event that doesn't exist when killing Piamete.
+//=     Fixed the Wish Maiden not enabling when the boss is killed.
+//=     Fixed two NPC named that were missed when translating.
+//=     Fixed Dialog that was overlooked in some files and not others.
 //============================================================ 
 
 arug_cas02,349,347,3	script	Guide#gq_aru02	899,{
@@ -209,8 +215,8 @@ que_qaru02,345,82,3	script	Wish Maiden#gq_aru02	403,{
 						else {
 							cutin "wish_maiden13",1;
 							mes "[Wish Maiden]";
-							mes "¿ÀÄݴϸ£ÀÇ ¹®À» ¿­ ÀÚ´Â ¿­´Ù¼¸À» ³Ñ¾î¾ß ÇÏ°í ½º¹°À» ³Ñ¾î¼± ¾ÈµÈ´Ù.";
-							mes "ÇÔ²² ÇÒ À̵éÀ» ´Ù½Ã µ¥·Á¿À¶ó.";
+							mes "You need to have 16 to 20 members present to open the gate of Okolnir.";
+							mes "Come back when you are ready.";
 							close2;
 						}
 						break;
@@ -1000,8 +1006,8 @@ OnDisable:
 	disablenpc "#aru02_cage04";
 	disablenpc "#aru02_cage05";
 	disablenpc "#aru02_cage06";
-	donpcevent "windpath03_aru02::OnDisable";
-	donpcevent "windpath04_aru02::OnDisable";
+	disablenpc "windpath03_aru02";
+	disablenpc "windpath04_aru02";
 	set $gqse_aru02_miro,0;
 	set $gqse_aru02_pcc,0;
 	set $gqse_aru02_gd,0;
@@ -1087,8 +1093,8 @@ OnTimer3600000:
 	disablenpc "#aru02_cage04";
 	disablenpc "#aru02_cage05";
 	disablenpc "#aru02_cage06";
-	donpcevent "windpath03_aru02::OnDisable";
-	donpcevent "windpath04_aru02::OnDisable";
+	disablenpc "windpath03_aru02";
+	disablenpc "windpath04_aru02";
 	end;
 
 OnTimer3605000:
@@ -1771,8 +1777,8 @@ OnTimer8000:
 OnTimer12000:
 	mapannounce "que_qaru02","Piamette : The keeper of the key is protecting my cage.",bc_map,"0xdb7093";
 	monster "que_qaru02",108,151,"Key Stone",1905,1,"#gdtimer02_aru02::OnMyMobDead";
-	monster "que_qaru02",107,135,"Key Stone",1905,1,"#gdtimer02_aru02::OnMyMobDead";
-	monster "que_qaru02",113,114,"Key Stone",1905,1,"#gdtimer02_aru02::OnMyMobDead";
+	monster "que_qaru02",109,135,"Key Stone",1905,1,"#gdtimer02_aru02::OnMyMobDead";
+	monster "que_qaru02",115,116,"Key Stone",1905,1,"#gdtimer02_aru02::OnMyMobDead";
 	monster "que_qaru02",158,106,"Key Stone",1905,1,"#gdtimer02_aru02::OnMyMobDead";
 	monster "que_qaru02",163,133,"Key Stone",1905,1,"#gdtimer02_aru02::OnMyMobDead";
 	monster "que_qaru02",150,154,"Key Stone",1905,1,"#gdtimer02_aru02::OnMyMobDead";
@@ -1842,8 +1848,8 @@ OnTimer5000:
 
 OnMyMobDead:
 	mapannounce "que_qaru02","Piamette has been released, so the warp gate toward the South is working now.",bc_map,"0x00ff00";
-	donpcevent "windpath03_aru02::OnEnable";
-	donpcevent "windpath04_aru02::OnEnable";
+	enablenpc "windpath03_aru02";
+	enablenpc "windpath04_aru02";
 	donpcevent "#nm_switch_aru02::OnEnable";
 	end;
 }
@@ -2998,9 +3004,9 @@ OnMyMobDead:
 	end;
 }
 
-que_qaru02,247,330,5	script	½ÅÀü¼öÈ£ÀÚ#aru02_ac01	1933,4,4,{
+que_qaru02,247,330,5	script	Temple Keeper#aru02_ac01	1933,4,4,{
 OnInit:
-	disablenpc "½ÅÀü¼öÈ£ÀÚ#aru02_ac01";
+	disablenpc "Temple Keeper#aru02_ac01";
 	end;
 
 OnDisable:
@@ -3019,9 +3025,9 @@ OnMyMobDead:
 	end;
 }
 
-que_qaru02,255,330,3	script	½ÅÀü¼öÈ£ÀÚ#aru02_ac02	1933,4,4,{
+que_qaru02,255,330,3	script	Temple Keeper#aru02_ac02	1933,4,4,{
 OnInit:
-	disablenpc "½ÅÀü¼öÈ£ÀÚ#aru02_ac02";
+	disablenpc "Temple Keeper#aru02_ac02";
 	end;
 
 OnDisable:
@@ -3042,12 +3048,12 @@ OnMyMobDead:
 
 que_qaru02,251,255,3	script	Wish Maiden#aru02_boss	1931,{
 OnInit:
-	disablenpc "Wish Maiden#aru02_boss";
+	hideonnpc "Wish Maiden#aru02_boss";
 	end;
 
 OnDisable:
 	killmonster "que_qaru02","Wish Maiden#aru02_boss::OnMyMobDead";
-	disablenpc "Wish Maiden#aru02_boss";
+	hideonnpc "Wish Maiden#aru02_boss";
 	stopnpctimer;
 	end;
 
@@ -3065,7 +3071,7 @@ OnTimer4000:
 
 OnTimer5000:
 	specialeffect EF_ICECRASH;
-	disablenpc "Wish Maiden#aru02_boss";
+	hideonnpc "Wish Maiden#aru02_boss";
 	specialeffect EF_SPHERE;
 	monster "que_qaru02",252,340,"Wish Maiden",1931,1,"Wish Maiden#aru02_boss::OnMyMobDead";
 	stopnpctimer;
@@ -3119,7 +3125,7 @@ que_qaru02,252,340,3	script	Wish Maiden#aru02_gift	403,{
 				close2;
 				cutin "wish_maiden11",255;
 				disablenpc "Wish Maiden#aru02_gift";
-				donpcevent "#to_agit_aru02_gate::OnEnable";
+				enablenpc "#to_agit_aru02_gate";
 				end;
 			}
 			else {
@@ -3225,7 +3231,7 @@ OnTimer3600000:
 		set $gqse_aru02_time,0;
 		enablenpc "Wish Maiden#gq_aru02";
 		enablenpc "Piamette#aru02";
-		donpcevent "Wish Maiden#aru02_boss::OnEnable";
+		hideoffnpc "Wish Maiden#aru02_boss";
 		stopnpctimer;
 	}
 	end;
diff --git a/npc/quests/okolnir/godse_aru03.txt b/npc/quests/okolnir/godse_aru03.txt
index a84cc3fde..fac4f9682 100644
--- a/npc/quests/okolnir/godse_aru03.txt
+++ b/npc/quests/okolnir/godse_aru03.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -11,6 +11,12 @@
 //= God Item SE Creation scipt (Asprika)
 //===== Additional Comments: ================================= 
 //= 1.0 First version. [L0ne_W0lf]
+//= 1.1 First round of bug fixes. (bugreport:3085) [L0ne_W0lf]
+//=     Fixed two spawn locations of the key stones in Piamete's room.
+//=     Fixed calling an event that doesn't exist when killing Piamete.
+//=     Fixed the Wish Maiden not enabling when the boss is killed.
+//=     Fixed two NPC named that were missed when translating.
+//=     Fixed Dialog that was overlooked in some files and not others.
 //============================================================ 
 
 arug_cas03,324,161,3	script	Guide#gq_aru03	899,{
@@ -209,8 +215,8 @@ que_qaru03,345,82,3	script	Wish Maiden#gq_aru03	403,{
 						else {
 							cutin "wish_maiden13",1;
 							mes "[Wish Maiden]";
-							mes "¿ÀÄݴϸ£ÀÇ ¹®À» ¿­ ÀÚ´Â ¿­´Ù¼¸À» ³Ñ¾î¾ß ÇÏ°í ½º¹°À» ³Ñ¾î¼± ¾ÈµÈ´Ù.";
-							mes "ÇÔ²² ÇÒ À̵éÀ» ´Ù½Ã µ¥·Á¿À¶ó.";
+							mes "You need to have 16 to 20 members present to open the gate of Okolnir.";
+							mes "Come back when you are ready.";
 							close2;
 						}
 						break;
@@ -1000,8 +1006,8 @@ OnDisable:
 	disablenpc "#aru03_cage04";
 	disablenpc "#aru03_cage05";
 	disablenpc "#aru03_cage06";
-	donpcevent "windpath03_aru03::OnDisable";
-	donpcevent "windpath04_aru03::OnDisable";
+	disablenpc "windpath03_aru03";
+	disablenpc "windpath04_aru03";
 	set $gqse_aru03_miro,0;
 	set $gqse_aru03_pcc,0;
 	set $gqse_aru03_gd,0;
@@ -1087,8 +1093,8 @@ OnTimer3600000:
 	disablenpc "#aru03_cage04";
 	disablenpc "#aru03_cage05";
 	disablenpc "#aru03_cage06";
-	donpcevent "windpath03_aru03::OnDisable";
-	donpcevent "windpath04_aru03::OnDisable";
+	disablenpc "windpath03_aru03";
+	disablenpc "windpath04_aru03";
 	end;
 
 OnTimer3605000:
@@ -1771,8 +1777,8 @@ OnTimer8000:
 OnTimer12000:
 	mapannounce "que_qaru03","Piamette : The keeper of the key is protecting my cage.",bc_map,"0xdb7093";
 	monster "que_qaru03",108,151,"Key Stone",1905,1,"#gdtimer02_aru03::OnMyMobDead";
-	monster "que_qaru03",107,135,"Key Stone",1905,1,"#gdtimer02_aru03::OnMyMobDead";
-	monster "que_qaru03",113,114,"Key Stone",1905,1,"#gdtimer02_aru03::OnMyMobDead";
+	monster "que_qaru03",109,135,"Key Stone",1905,1,"#gdtimer02_aru03::OnMyMobDead";
+	monster "que_qaru03",115,116,"Key Stone",1905,1,"#gdtimer02_aru03::OnMyMobDead";
 	monster "que_qaru03",158,106,"Key Stone",1905,1,"#gdtimer02_aru03::OnMyMobDead";
 	monster "que_qaru03",163,133,"Key Stone",1905,1,"#gdtimer02_aru03::OnMyMobDead";
 	monster "que_qaru03",150,154,"Key Stone",1905,1,"#gdtimer02_aru03::OnMyMobDead";
@@ -1842,8 +1848,8 @@ OnTimer5000:
 
 OnMyMobDead:
 	mapannounce "que_qaru03","Piamette has been released, so the warp gate toward the South is working now.",bc_map,"0x00ff00";
-	donpcevent "windpath03_aru03::OnEnable";
-	donpcevent "windpath04_aru03::OnEnable";
+	enablenpc "windpath03_aru03";
+	enablenpc "windpath04_aru03";
 	donpcevent "#nm_switch_aru03::OnEnable";
 	end;
 }
@@ -2998,9 +3004,9 @@ OnMyMobDead:
 	end;
 }
 
-que_qaru03,247,330,5	script	½ÅÀü¼öÈ£ÀÚ#aru03_ac01	1933,4,4,{
+que_qaru03,247,330,5	script	Temple Keeper#aru03_ac01	1933,4,4,{
 OnInit:
-	disablenpc "½ÅÀü¼öÈ£ÀÚ#aru03_ac01";
+	disablenpc "Temple Keeper#aru03_ac01";
 	end;
 
 OnDisable:
@@ -3019,9 +3025,9 @@ OnMyMobDead:
 	end;
 }
 
-que_qaru03,255,330,3	script	½ÅÀü¼öÈ£ÀÚ#aru03_ac02	1933,4,4,{
+que_qaru03,255,330,3	script	Temple Keeper#aru03_ac02	1933,4,4,{
 OnInit:
-	disablenpc "½ÅÀü¼öÈ£ÀÚ#aru03_ac02";
+	disablenpc "Temple Keeper#aru03_ac02";
 	end;
 
 OnDisable:
@@ -3042,12 +3048,12 @@ OnMyMobDead:
 
 que_qaru03,251,255,3	script	Wish Maiden#aru03_boss	1931,{
 OnInit:
-	disablenpc "Wish Maiden#aru03_boss";
+	hideonnpc "Wish Maiden#aru03_boss";
 	end;
 
 OnDisable:
 	killmonster "que_qaru03","Wish Maiden#aru03_boss::OnMyMobDead";
-	disablenpc "Wish Maiden#aru03_boss";
+	hideonnpc "Wish Maiden#aru03_boss";
 	stopnpctimer;
 	end;
 
@@ -3065,7 +3071,7 @@ OnTimer4000:
 
 OnTimer5000:
 	specialeffect EF_ICECRASH;
-	disablenpc "Wish Maiden#aru03_boss";
+	hideonnpc "Wish Maiden#aru03_boss";
 	specialeffect EF_SPHERE;
 	monster "que_qaru03",252,340,"Wish Maiden",1931,1,"Wish Maiden#aru03_boss::OnMyMobDead";
 	stopnpctimer;
@@ -3119,7 +3125,7 @@ que_qaru03,252,340,3	script	Wish Maiden#aru03_gift	403,{
 				close2;
 				cutin "wish_maiden11",255;
 				disablenpc "Wish Maiden#aru03_gift";
-				donpcevent "#to_agit_aru03_gate::OnEnable";
+				enablenpc "#to_agit_aru03_gate";
 				end;
 			}
 			else {
@@ -3225,7 +3231,7 @@ OnTimer3600000:
 		set $gqse_aru03_time,0;
 		enablenpc "Wish Maiden#gq_aru03";
 		enablenpc "Piamette#aru03";
-		donpcevent "Wish Maiden#aru03_boss::OnEnable";
+		hideoffnpc "Wish Maiden#aru03_boss";
 		stopnpctimer;
 	}
 	end;
diff --git a/npc/quests/okolnir/godse_aru04.txt b/npc/quests/okolnir/godse_aru04.txt
index 27d5cdc20..1e0f61721 100644
--- a/npc/quests/okolnir/godse_aru04.txt
+++ b/npc/quests/okolnir/godse_aru04.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -11,6 +11,12 @@
 //= God Item SE Creation scipt (Asprika)
 //===== Additional Comments: ================================= 
 //= 1.0 First version. [L0ne_W0lf]
+//= 1.1 First round of bug fixes. (bugreport:3085) [L0ne_W0lf]
+//=     Fixed two spawn locations of the key stones in Piamete's room.
+//=     Fixed calling an event that doesn't exist when killing Piamete.
+//=     Fixed the Wish Maiden not enabling when the boss is killed.
+//=     Fixed two NPC named that were missed when translating.
+//=     Fixed Dialog that was overlooked in some files and not others.
 //============================================================ 
 
 arug_cas04,324,161,3	script	Guide#gq_aru04	899,{
@@ -209,8 +215,8 @@ que_qaru04,345,82,3	script	Wish Maiden#gq_aru04	403,{
 						else {
 							cutin "wish_maiden13",1;
 							mes "[Wish Maiden]";
-							mes "¿ÀÄݴϸ£ÀÇ ¹®À» ¿­ ÀÚ´Â ¿­´Ù¼¸À» ³Ñ¾î¾ß ÇÏ°í ½º¹°À» ³Ñ¾î¼± ¾ÈµÈ´Ù.";
-							mes "ÇÔ²² ÇÒ À̵éÀ» ´Ù½Ã µ¥·Á¿À¶ó.";
+							mes "You need to have 16 to 20 members present to open the gate of Okolnir.";
+							mes "Come back when you are ready.";
 							close2;
 						}
 						break;
@@ -1000,8 +1006,8 @@ OnDisable:
 	disablenpc "#aru04_cage04";
 	disablenpc "#aru04_cage05";
 	disablenpc "#aru04_cage06";
-	donpcevent "windpath03_aru04::OnDisable";
-	donpcevent "windpath04_aru04::OnDisable";
+	disablenpc "windpath03_aru04";
+	disablenpc "windpath04_aru04";
 	set $gqse_aru04_miro,0;
 	set $gqse_aru04_pcc,0;
 	set $gqse_aru04_gd,0;
@@ -1087,8 +1093,8 @@ OnTimer3600000:
 	disablenpc "#aru04_cage04";
 	disablenpc "#aru04_cage05";
 	disablenpc "#aru04_cage06";
-	donpcevent "windpath03_aru04::OnDisable";
-	donpcevent "windpath04_aru04::OnDisable";
+	disablenpc "windpath03_aru04";
+	disablenpc "windpath04_aru04";
 	end;
 
 OnTimer3605000:
@@ -1771,8 +1777,8 @@ OnTimer8000:
 OnTimer12000:
 	mapannounce "que_qaru04","Piamette : The keeper of the key is protecting my cage.",bc_map,"0xdb7093";
 	monster "que_qaru04",108,151,"Key Stone",1905,1,"#gdtimer02_aru04::OnMyMobDead";
-	monster "que_qaru04",107,135,"Key Stone",1905,1,"#gdtimer02_aru04::OnMyMobDead";
-	monster "que_qaru04",113,114,"Key Stone",1905,1,"#gdtimer02_aru04::OnMyMobDead";
+	monster "que_qaru04",109,135,"Key Stone",1905,1,"#gdtimer02_aru04::OnMyMobDead";
+	monster "que_qaru04",115,116,"Key Stone",1905,1,"#gdtimer02_aru04::OnMyMobDead";
 	monster "que_qaru04",158,106,"Key Stone",1905,1,"#gdtimer02_aru04::OnMyMobDead";
 	monster "que_qaru04",163,133,"Key Stone",1905,1,"#gdtimer02_aru04::OnMyMobDead";
 	monster "que_qaru04",150,154,"Key Stone",1905,1,"#gdtimer02_aru04::OnMyMobDead";
@@ -1842,8 +1848,8 @@ OnTimer5000:
 
 OnMyMobDead:
 	mapannounce "que_qaru04","Piamette has been released, so the warp gate toward the South is working now.",bc_map,"0x00ff00";
-	donpcevent "windpath03_aru04::OnEnable";
-	donpcevent "windpath04_aru04::OnEnable";
+	enablenpc "windpath03_aru04";
+	enablenpc "windpath04_aru04";
 	donpcevent "#nm_switch_aru04::OnEnable";
 	end;
 }
@@ -2998,9 +3004,9 @@ OnMyMobDead:
 	end;
 }
 
-que_qaru04,247,330,5	script	½ÅÀü¼öÈ£ÀÚ#aru04_ac01	1933,4,4,{
+que_qaru04,247,330,5	script	Temple Keeper#aru04_ac01	1933,4,4,{
 OnInit:
-	disablenpc "½ÅÀü¼öÈ£ÀÚ#aru04_ac01";
+	disablenpc "Temple Keeper#aru04_ac01";
 	end;
 
 OnDisable:
@@ -3019,9 +3025,9 @@ OnMyMobDead:
 	end;
 }
 
-que_qaru04,255,330,3	script	½ÅÀü¼öÈ£ÀÚ#aru04_ac02	1933,4,4,{
+que_qaru04,255,330,3	script	Temple Keeper#aru04_ac02	1933,4,4,{
 OnInit:
-	disablenpc "½ÅÀü¼öÈ£ÀÚ#aru04_ac02";
+	disablenpc "Temple Keeper#aru04_ac02";
 	end;
 
 OnDisable:
@@ -3042,12 +3048,12 @@ OnMyMobDead:
 
 que_qaru04,251,255,3	script	Wish Maiden#aru04_boss	1931,{
 OnInit:
-	disablenpc "Wish Maiden#aru04_boss";
+	hideonnpc "Wish Maiden#aru04_boss";
 	end;
 
 OnDisable:
 	killmonster "que_qaru04","Wish Maiden#aru04_boss::OnMyMobDead";
-	disablenpc "Wish Maiden#aru04_boss";
+	hideonnpc "Wish Maiden#aru04_boss";
 	stopnpctimer;
 	end;
 
@@ -3065,7 +3071,7 @@ OnTimer4000:
 
 OnTimer5000:
 	specialeffect EF_ICECRASH;
-	disablenpc "Wish Maiden#aru04_boss";
+	hideonnpc "Wish Maiden#aru04_boss";
 	specialeffect EF_SPHERE;
 	monster "que_qaru04",252,340,"Wish Maiden",1931,1,"Wish Maiden#aru04_boss::OnMyMobDead";
 	stopnpctimer;
@@ -3119,7 +3125,7 @@ que_qaru04,252,340,3	script	Wish Maiden#aru04_gift	403,{
 				close2;
 				cutin "wish_maiden11",255;
 				disablenpc "Wish Maiden#aru04_gift";
-				donpcevent "#to_agit_aru04_gate::OnEnable";
+				enablenpc "#to_agit_aru04_gate";
 				end;
 			}
 			else {
@@ -3225,7 +3231,7 @@ OnTimer3600000:
 		set $gqse_aru04_time,0;
 		enablenpc "Wish Maiden#gq_aru04";
 		enablenpc "Piamette#aru04";
-		donpcevent "Wish Maiden#aru04_boss::OnEnable";
+		hideoffnpc "Wish Maiden#aru04_boss";
 		stopnpctimer;
 	}
 	end;
diff --git a/npc/quests/okolnir/godse_aru05.txt b/npc/quests/okolnir/godse_aru05.txt
index a56b6899b..f8c0531fb 100644
--- a/npc/quests/okolnir/godse_aru05.txt
+++ b/npc/quests/okolnir/godse_aru05.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -11,6 +11,12 @@
 //= God Item SE Creation scipt (Asprika)
 //===== Additional Comments: ================================= 
 //= 1.0 First version. [L0ne_W0lf]
+//= 1.1 First round of bug fixes. (bugreport:3085) [L0ne_W0lf]
+//=     Fixed two spawn locations of the key stones in Piamete's room.
+//=     Fixed calling an event that doesn't exist when killing Piamete.
+//=     Fixed the Wish Maiden not enabling when the boss is killed.
+//=     Fixed two NPC named that were missed when translating.
+//=     Fixed Dialog that was overlooked in some files and not others.
 //============================================================ 
 
 arug_cas05,324,161,3	script	Guide#gq_aru05	899,{
@@ -209,8 +215,8 @@ que_qaru05,345,82,3	script	Wish Maiden#gq_aru05	403,{
 						else {
 							cutin "wish_maiden13",1;
 							mes "[Wish Maiden]";
-							mes "¿ÀÄݴϸ£ÀÇ ¹®À» ¿­ ÀÚ´Â ¿­´Ù¼¸À» ³Ñ¾î¾ß ÇÏ°í ½º¹°À» ³Ñ¾î¼± ¾ÈµÈ´Ù.";
-							mes "ÇÔ²² ÇÒ À̵éÀ» ´Ù½Ã µ¥·Á¿À¶ó.";
+							mes "You need to have 16 to 20 members present to open the gate of Okolnir.";
+							mes "Come back when you are ready.";
 							close2;
 						}
 						break;
@@ -1000,8 +1006,8 @@ OnDisable:
 	disablenpc "#aru05_cage04";
 	disablenpc "#aru05_cage05";
 	disablenpc "#aru05_cage06";
-	donpcevent "windpath03_aru05::OnDisable";
-	donpcevent "windpath04_aru05::OnDisable";
+	disablenpc "windpath03_aru05";
+	disablenpc "windpath04_aru05";
 	set $gqse_aru05_miro,0;
 	set $gqse_aru05_pcc,0;
 	set $gqse_aru05_gd,0;
@@ -1087,8 +1093,8 @@ OnTimer3600000:
 	disablenpc "#aru05_cage04";
 	disablenpc "#aru05_cage05";
 	disablenpc "#aru05_cage06";
-	donpcevent "windpath03_aru05::OnDisable";
-	donpcevent "windpath04_aru05::OnDisable";
+	disablenpc "windpath03_aru05";
+	disablenpc "windpath04_aru05";
 	end;
 
 OnTimer3605000:
@@ -1771,8 +1777,8 @@ OnTimer8000:
 OnTimer12000:
 	mapannounce "que_qaru05","Piamette : The keeper of the key is protecting my cage.",bc_map,"0xdb7093";
 	monster "que_qaru05",108,151,"Key Stone",1905,1,"#gdtimer02_aru05::OnMyMobDead";
-	monster "que_qaru05",107,135,"Key Stone",1905,1,"#gdtimer02_aru05::OnMyMobDead";
-	monster "que_qaru05",113,114,"Key Stone",1905,1,"#gdtimer02_aru05::OnMyMobDead";
+	monster "que_qaru05",109,135,"Key Stone",1905,1,"#gdtimer02_aru05::OnMyMobDead";
+	monster "que_qaru05",115,116,"Key Stone",1905,1,"#gdtimer02_aru05::OnMyMobDead";
 	monster "que_qaru05",158,106,"Key Stone",1905,1,"#gdtimer02_aru05::OnMyMobDead";
 	monster "que_qaru05",163,133,"Key Stone",1905,1,"#gdtimer02_aru05::OnMyMobDead";
 	monster "que_qaru05",150,154,"Key Stone",1905,1,"#gdtimer02_aru05::OnMyMobDead";
@@ -1842,8 +1848,8 @@ OnTimer5000:
 
 OnMyMobDead:
 	mapannounce "que_qaru05","Piamette has been released, so the warp gate toward the South is working now.",bc_map,"0x00ff00";
-	donpcevent "windpath03_aru05::OnEnable";
-	donpcevent "windpath04_aru05::OnEnable";
+	enablenpc "windpath03_aru05";
+	enablenpc "windpath04_aru05";
 	donpcevent "#nm_switch_aru05::OnEnable";
 	end;
 }
@@ -2998,9 +3004,9 @@ OnMyMobDead:
 	end;
 }
 
-que_qaru05,247,330,5	script	½ÅÀü¼öÈ£ÀÚ#aru05_ac01	1933,4,4,{
+que_qaru05,247,330,5	script	Temple Keeper#aru05_ac01	1933,4,4,{
 OnInit:
-	disablenpc "½ÅÀü¼öÈ£ÀÚ#aru05_ac01";
+	disablenpc "Temple Keeper#aru05_ac01";
 	end;
 
 OnDisable:
@@ -3019,9 +3025,9 @@ OnMyMobDead:
 	end;
 }
 
-que_qaru05,255,330,3	script	½ÅÀü¼öÈ£ÀÚ#aru05_ac02	1933,4,4,{
+que_qaru05,255,330,3	script	Temple Keeper#aru05_ac02	1933,4,4,{
 OnInit:
-	disablenpc "½ÅÀü¼öÈ£ÀÚ#aru05_ac02";
+	disablenpc "Temple Keeper#aru05_ac02";
 	end;
 
 OnDisable:
@@ -3042,12 +3048,12 @@ OnMyMobDead:
 
 que_qaru05,251,255,3	script	Wish Maiden#aru05_boss	1931,{
 OnInit:
-	disablenpc "Wish Maiden#aru05_boss";
+	hideonnpc "Wish Maiden#aru05_boss";
 	end;
 
 OnDisable:
 	killmonster "que_qaru05","Wish Maiden#aru05_boss::OnMyMobDead";
-	disablenpc "Wish Maiden#aru05_boss";
+	hideonnpc "Wish Maiden#aru05_boss";
 	stopnpctimer;
 	end;
 
@@ -3065,7 +3071,7 @@ OnTimer4000:
 
 OnTimer5000:
 	specialeffect EF_ICECRASH;
-	disablenpc "Wish Maiden#aru05_boss";
+	hideonnpc "Wish Maiden#aru05_boss";
 	specialeffect EF_SPHERE;
 	monster "que_qaru05",252,340,"Wish Maiden",1931,1,"Wish Maiden#aru05_boss::OnMyMobDead";
 	stopnpctimer;
@@ -3119,7 +3125,7 @@ que_qaru05,252,340,3	script	Wish Maiden#aru05_gift	403,{
 				close2;
 				cutin "wish_maiden11",255;
 				disablenpc "Wish Maiden#aru05_gift";
-				donpcevent "#to_agit_aru05_gate::OnEnable";
+				enablenpc "#to_agit_aru05_gate";
 				end;
 			}
 			else {
@@ -3225,7 +3231,7 @@ OnTimer3600000:
 		set $gqse_aru05_time,0;
 		enablenpc "Wish Maiden#gq_aru05";
 		enablenpc "Piamette#aru05";
-		donpcevent "Wish Maiden#aru05_boss::OnEnable";
+		hideoffnpc "Wish Maiden#aru05_boss";
 		stopnpctimer;
 	}
 	end;
diff --git a/npc/quests/okolnir/godse_sch01.txt b/npc/quests/okolnir/godse_sch01.txt
index 3d5773ee5..8f5d09623 100644
--- a/npc/quests/okolnir/godse_sch01.txt
+++ b/npc/quests/okolnir/godse_sch01.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -11,6 +11,12 @@
 //= God Item SE Creation scipt (Brynhild)
 //===== Additional Comments: ================================= 
 //= 1.0 First version. [L0ne_W0lf]
+//= 1.1 First round of bug fixes. (bugreport:3085) [L0ne_W0lf]
+//=     Fixed two spawn locations of the key stones in Piamete's room.
+//=     Fixed calling an event that doesn't exist when killing Piamete.
+//=     Fixed the Wish Maiden not enabling when the boss is killed.
+//=     fixed two NPC named that were missed when translating.
+//=     Fixed Dialog that was overlooked in some files and not others.
 //============================================================ 
 
 schg_cas01,376,307,3	script	Guide#gq_sch01	899,{
@@ -209,8 +215,8 @@ que_qsch01,345,82,3	script	Wish Maiden#gq_sch01	403,{
 						else {
 							cutin "wish_maiden13",1;
 							mes "[Wish Maiden]";
-							mes "¿ÀÄݴϸ£ÀÇ ¹®À» ¿­ ÀÚ´Â ¿­´Ù¼¸À» ³Ñ¾î¾ß ÇÏ°í ½º¹°À» ³Ñ¾î¼± ¾ÈµÈ´Ù.";
-							mes "ÇÔ²² ÇÒ À̵éÀ» ´Ù½Ã µ¥·Á¿À¶ó.";
+							mes "You need to have 16 to 20 members present to open the gate of Okolnir.";
+							mes "Come back when you are ready.";
 							close2;
 						}
 						break;
@@ -998,8 +1004,8 @@ OnDisable:
 	disablenpc "#sch01_cage04";
 	disablenpc "#sch01_cage05";
 	disablenpc "#sch01_cage06";
-	donpcevent "windpath03_sch01::OnDisable";
-	donpcevent "windpath04_sch01::OnDisable";
+	disablenpc "windpath03_sch01";
+	disablenpc "windpath04_sch01";
 	set $gqse_sch01_miro,0;
 	set $gqse_sch01_pcc,0;
 	set $gqse_sch01_gd,0;
@@ -1085,8 +1091,8 @@ OnTimer3600000:
 	disablenpc "#sch01_cage04";
 	disablenpc "#sch01_cage05";
 	disablenpc "#sch01_cage06";
-	donpcevent "windpath03_sch01::OnDisable";
-	donpcevent "windpath04_sch01::OnDisable";
+	disablenpc "windpath03_sch01";
+	disablenpc "windpath04_sch01";
 	end;
 
 OnTimer3605000:
@@ -1769,8 +1775,8 @@ OnTimer8000:
 OnTimer12000:
 	mapannounce "que_qsch01","Piamette : The keeper of the key is protecting my cage.",bc_map,"0xdb7093";
 	monster "que_qsch01",108,151,"Key Stone",1905,1,"#gdtimer02_sch01::OnMyMobDead";
-	monster "que_qsch01",107,135,"Key Stone",1905,1,"#gdtimer02_sch01::OnMyMobDead";
-	monster "que_qsch01",113,114,"Key Stone",1905,1,"#gdtimer02_sch01::OnMyMobDead";
+	monster "que_qsch01",109,135,"Key Stone",1905,1,"#gdtimer02_sch01::OnMyMobDead";
+	monster "que_qsch01",115,116,"Key Stone",1905,1,"#gdtimer02_sch01::OnMyMobDead";
 	monster "que_qsch01",158,106,"Key Stone",1905,1,"#gdtimer02_sch01::OnMyMobDead";
 	monster "que_qsch01",163,133,"Key Stone",1905,1,"#gdtimer02_sch01::OnMyMobDead";
 	monster "que_qsch01",150,154,"Key Stone",1905,1,"#gdtimer02_sch01::OnMyMobDead";
@@ -1840,8 +1846,8 @@ OnTimer5000:
 
 OnMyMobDead:
 	mapannounce "que_qsch01","Piamette has been released, so the warp gate toward the South is working now.",bc_map,"0x00ff00";
-	donpcevent "windpath03_sch01::OnEnable";
-	donpcevent "windpath04_sch01::OnEnable";
+	enablenpc "windpath03_sch01";
+	enablenpc "windpath04_sch01";
 	donpcevent "#nm_switch_sch01::OnEnable";
 	end;
 }
@@ -2996,9 +3002,9 @@ OnMyMobDead:
 	end;
 }
 
-que_qsch01,247,330,5	script	½ÅÀü¼öÈ£ÀÚ#sch01_ac01	1933,4,4,{
+que_qsch01,247,330,5	script	Temple Keeper#sch01_ac01	1933,4,4,{
 OnInit:
-	disablenpc "½ÅÀü¼öÈ£ÀÚ#sch01_ac01";
+	disablenpc "Temple Keeper#sch01_ac01";
 	end;
 
 OnDisable:
@@ -3017,9 +3023,9 @@ OnMyMobDead:
 	end;
 }
 
-que_qsch01,255,330,3	script	½ÅÀü¼öÈ£ÀÚ#sch01_ac02	1933,4,4,{
+que_qsch01,255,330,3	script	Temple Keeper#sch01_ac02	1933,4,4,{
 OnInit:
-	disablenpc "½ÅÀü¼öÈ£ÀÚ#sch01_ac02";
+	disablenpc "Temple Keeper#sch01_ac02";
 	end;
 
 OnDisable:
@@ -3040,12 +3046,12 @@ OnMyMobDead:
 
 que_qsch01,251,255,3	script	Wish Maiden#sch01_boss	1931,{
 OnInit:
-	disablenpc "Wish Maiden#sch01_boss";
+	hideonnpc "Wish Maiden#sch01_boss";
 	end;
 
 OnDisable:
 	killmonster "que_qsch01","Wish Maiden#sch01_boss::OnMyMobDead";
-	disablenpc "Wish Maiden#sch01_boss";
+	hideonnpc "Wish Maiden#sch01_boss";
 	stopnpctimer;
 	end;
 
@@ -3063,7 +3069,7 @@ OnTimer4000:
 
 OnTimer5000:
 	specialeffect EF_ICECRASH;
-	disablenpc "Wish Maiden#sch01_boss";
+	hideonnpc "Wish Maiden#sch01_boss";
 	specialeffect EF_SPHERE;
 	monster "que_qsch01",252,340,"Wish Maiden",1931,1,"Wish Maiden#sch01_boss::OnMyMobDead";
 	stopnpctimer;
@@ -3117,7 +3123,7 @@ que_qsch01,252,340,3	script	Wish Maiden#sch01_gift	403,{
 				close2;
 				cutin "wish_maiden11",255;
 				disablenpc "Wish Maiden#sch01_gift";
-				donpcevent "#to_agit_sch01_gate::OnEnable";
+				enablenpc "#to_agit_sch01_gate";
 				end;
 			}
 			else {
@@ -3223,7 +3229,7 @@ OnTimer3600000:
 		set $gqse_sch01_time,0;
 		enablenpc "Wish Maiden#gq_sch01";
 		enablenpc "Piamette#sch01";
-		donpcevent "Wish Maiden#sch01_boss::OnEnable";
+		hideoffnpc "Wish Maiden#sch01_boss";
 		stopnpctimer;
 	}
 	end;
diff --git a/npc/quests/okolnir/godse_sch02.txt b/npc/quests/okolnir/godse_sch02.txt
index d46226eac..aca3c37ae 100644
--- a/npc/quests/okolnir/godse_sch02.txt
+++ b/npc/quests/okolnir/godse_sch02.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -11,6 +11,11 @@
 //= God Item SE Creation scipt (Brynhild)
 //===== Additional Comments: ================================= 
 //= 1.0 First version. [L0ne_W0lf]
+//= 1.1 First round of bug fixes. (bugreport:3085) [L0ne_W0lf]
+//=     Fixed two spawn locations of the key stones in Piamete's room.
+//=     Fixed calling an event that doesn't exist when killing Piamete.
+//=     Fixed the Wish Maiden not enabling when the boss is killed.
+//=     fixed two NPC named that were missed when translating.
 //============================================================ 
 
 schg_cas02,181,335,3	script	Guide#gq_sch02	899,{
@@ -998,8 +1003,8 @@ OnDisable:
 	disablenpc "#sch02_cage04";
 	disablenpc "#sch02_cage05";
 	disablenpc "#sch02_cage06";
-	donpcevent "windpath03_sch02::OnDisable";
-	donpcevent "windpath04_sch02::OnDisable";
+	disablenpc "windpath03_sch02";
+	disablenpc "windpath04_sch02";
 	set $gqse_sch02_miro,0;
 	set $gqse_sch02_pcc,0;
 	set $gqse_sch02_gd,0;
@@ -1085,8 +1090,8 @@ OnTimer3600000:
 	disablenpc "#sch02_cage04";
 	disablenpc "#sch02_cage05";
 	disablenpc "#sch02_cage06";
-	donpcevent "windpath03_sch02::OnDisable";
-	donpcevent "windpath04_sch02::OnDisable";
+	disablenpc "windpath03_sch02";
+	disablenpc "windpath04_sch02";
 	end;
 
 OnTimer3605000:
@@ -1769,8 +1774,8 @@ OnTimer8000:
 OnTimer12000:
 	mapannounce "que_qsch02","Piamette : The keeper of the key is protecting my cage.",bc_map,"0xdb7093";
 	monster "que_qsch02",108,151,"Key Stone",1905,1,"#gdtimer02_sch02::OnMyMobDead";
-	monster "que_qsch02",107,135,"Key Stone",1905,1,"#gdtimer02_sch02::OnMyMobDead";
-	monster "que_qsch02",113,114,"Key Stone",1905,1,"#gdtimer02_sch02::OnMyMobDead";
+	monster "que_qsch02",109,135,"Key Stone",1905,1,"#gdtimer02_sch02::OnMyMobDead";
+	monster "que_qsch02",115,116,"Key Stone",1905,1,"#gdtimer02_sch02::OnMyMobDead";
 	monster "que_qsch02",158,106,"Key Stone",1905,1,"#gdtimer02_sch02::OnMyMobDead";
 	monster "que_qsch02",163,133,"Key Stone",1905,1,"#gdtimer02_sch02::OnMyMobDead";
 	monster "que_qsch02",150,154,"Key Stone",1905,1,"#gdtimer02_sch02::OnMyMobDead";
@@ -1840,8 +1845,8 @@ OnTimer5000:
 
 OnMyMobDead:
 	mapannounce "que_qsch02","Piamette has been released, so the warp gate toward the South is working now.",bc_map,"0x00ff00";
-	donpcevent "windpath03_sch02::OnEnable";
-	donpcevent "windpath04_sch02::OnEnable";
+	enablenpc "windpath03_sch02";
+	enablenpc "windpath04_sch02";
 	donpcevent "#nm_switch_sch02::OnEnable";
 	end;
 }
@@ -2996,9 +3001,9 @@ OnMyMobDead:
 	end;
 }
 
-que_qsch02,247,330,5	script	½ÅÀü¼öÈ£ÀÚ#sch02_ac01	1933,4,4,{
+que_qsch02,247,330,5	script	Temple Keeper#sch02_ac01	1933,4,4,{
 OnInit:
-	disablenpc "½ÅÀü¼öÈ£ÀÚ#sch02_ac01";
+	disablenpc "Temple Keeper#sch02_ac01";
 	end;
 
 OnDisable:
@@ -3017,9 +3022,9 @@ OnMyMobDead:
 	end;
 }
 
-que_qsch02,255,330,3	script	½ÅÀü¼öÈ£ÀÚ#sch02_ac02	1933,4,4,{
+que_qsch02,255,330,3	script	Temple Keeper#sch02_ac02	1933,4,4,{
 OnInit:
-	disablenpc "½ÅÀü¼öÈ£ÀÚ#sch02_ac02";
+	disablenpc "Temple Keeper#sch02_ac02";
 	end;
 
 OnDisable:
@@ -3040,12 +3045,12 @@ OnMyMobDead:
 
 que_qsch02,251,255,3	script	Wish Maiden#sch02_boss	1931,{
 OnInit:
-	disablenpc "Wish Maiden#sch02_boss";
+	hideonnpc "Wish Maiden#sch02_boss";
 	end;
 
 OnDisable:
 	killmonster "que_qsch02","Wish Maiden#sch02_boss::OnMyMobDead";
-	disablenpc "Wish Maiden#sch02_boss";
+	hideonnpc "Wish Maiden#sch02_boss";
 	stopnpctimer;
 	end;
 
@@ -3063,7 +3068,7 @@ OnTimer4000:
 
 OnTimer5000:
 	specialeffect EF_ICECRASH;
-	disablenpc "Wish Maiden#sch02_boss";
+	hideonnpc "Wish Maiden#sch02_boss";
 	specialeffect EF_SPHERE;
 	monster "que_qsch02",252,340,"Wish Maiden",1931,1,"Wish Maiden#sch02_boss::OnMyMobDead";
 	stopnpctimer;
@@ -3117,7 +3122,7 @@ que_qsch02,252,340,3	script	Wish Maiden#sch02_gift	403,{
 				close2;
 				cutin "wish_maiden11",255;
 				disablenpc "Wish Maiden#sch02_gift";
-				donpcevent "#to_agit_sch02_gate::OnEnable";
+				enablenpc "#to_agit_sch02_gate";
 				end;
 			}
 			else {
@@ -3223,7 +3228,7 @@ OnTimer3600000:
 		set $gqse_sch02_time,0;
 		enablenpc "Wish Maiden#gq_sch02";
 		enablenpc "Piamette#sch02";
-		donpcevent "Wish Maiden#sch02_boss::OnEnable";
+		hideoffnpc "Wish Maiden#sch02_boss";
 		stopnpctimer;
 	}
 	end;
diff --git a/npc/quests/okolnir/godse_sch03.txt b/npc/quests/okolnir/godse_sch03.txt
index 57966ba32..0950f3f6e 100644
--- a/npc/quests/okolnir/godse_sch03.txt
+++ b/npc/quests/okolnir/godse_sch03.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -11,6 +11,11 @@
 //= God Item SE Creation scipt (Brynhild)
 //===== Additional Comments: ================================= 
 //= 1.0 First version. [L0ne_W0lf]
+//= 1.1 First round of bug fixes. (bugreport:3085) [L0ne_W0lf]
+//=     Fixed two spawn locations of the key stones in Piamete's room.
+//=     Fixed calling an event that doesn't exist when killing Piamete.
+//=     Fixed the Wish Maiden not enabling when the boss is killed.
+//=     fixed two NPC named that were missed when translating.
 //============================================================ 
 
 schg_cas03,84,101,3	script	Guide#gq_sch03	899,{
@@ -998,8 +1003,8 @@ OnDisable:
 	disablenpc "#sch03_cage04";
 	disablenpc "#sch03_cage05";
 	disablenpc "#sch03_cage06";
-	donpcevent "windpath03_sch03::OnDisable";
-	donpcevent "windpath04_sch03::OnDisable";
+	disablenpc "windpath03_sch03";
+	disablenpc "windpath04_sch03";
 	set $gqse_sch03_miro,0;
 	set $gqse_sch03_pcc,0;
 	set $gqse_sch03_gd,0;
@@ -1085,8 +1090,8 @@ OnTimer3600000:
 	disablenpc "#sch03_cage04";
 	disablenpc "#sch03_cage05";
 	disablenpc "#sch03_cage06";
-	donpcevent "windpath03_sch03::OnDisable";
-	donpcevent "windpath04_sch03::OnDisable";
+	disablenpc "windpath03_sch03";
+	disablenpc "windpath04_sch03";
 	end;
 
 OnTimer3605000:
@@ -1769,8 +1774,8 @@ OnTimer8000:
 OnTimer12000:
 	mapannounce "que_qsch03","Piamette : The keeper of the key is protecting my cage.",bc_map,"0xdb7093";
 	monster "que_qsch03",108,151,"Key Stone",1905,1,"#gdtimer02_sch03::OnMyMobDead";
-	monster "que_qsch03",107,135,"Key Stone",1905,1,"#gdtimer02_sch03::OnMyMobDead";
-	monster "que_qsch03",113,114,"Key Stone",1905,1,"#gdtimer02_sch03::OnMyMobDead";
+	monster "que_qsch03",109,135,"Key Stone",1905,1,"#gdtimer02_sch03::OnMyMobDead";
+	monster "que_qsch03",115,116,"Key Stone",1905,1,"#gdtimer02_sch03::OnMyMobDead";
 	monster "que_qsch03",158,106,"Key Stone",1905,1,"#gdtimer02_sch03::OnMyMobDead";
 	monster "que_qsch03",163,133,"Key Stone",1905,1,"#gdtimer02_sch03::OnMyMobDead";
 	monster "que_qsch03",150,154,"Key Stone",1905,1,"#gdtimer02_sch03::OnMyMobDead";
@@ -1840,8 +1845,8 @@ OnTimer5000:
 
 OnMyMobDead:
 	mapannounce "que_qsch03","Piamette has been released, so the warp gate toward the South is working now.",bc_map,"0x00ff00";
-	donpcevent "windpath03_sch03::OnEnable";
-	donpcevent "windpath04_sch03::OnEnable";
+	enablenpc "windpath03_sch03";
+	enablenpc "windpath04_sch03";
 	donpcevent "#nm_switch_sch03::OnEnable";
 	end;
 }
@@ -2996,9 +3001,9 @@ OnMyMobDead:
 	end;
 }
 
-que_qsch03,247,330,5	script	½ÅÀü¼öÈ£ÀÚ#sch03_ac01	1933,4,4,{
+que_qsch03,247,330,5	script	Temple Keeper#sch03_ac01	1933,4,4,{
 OnInit:
-	disablenpc "½ÅÀü¼öÈ£ÀÚ#sch03_ac01";
+	disablenpc "Temple Keeper#sch03_ac01";
 	end;
 
 OnDisable:
@@ -3017,9 +3022,9 @@ OnMyMobDead:
 	end;
 }
 
-que_qsch03,255,330,3	script	½ÅÀü¼öÈ£ÀÚ#sch03_ac02	1933,4,4,{
+que_qsch03,255,330,3	script	Temple Keeper#sch03_ac02	1933,4,4,{
 OnInit:
-	disablenpc "½ÅÀü¼öÈ£ÀÚ#sch03_ac02";
+	disablenpc "Temple Keeper#sch03_ac02";
 	end;
 
 OnDisable:
@@ -3040,12 +3045,12 @@ OnMyMobDead:
 
 que_qsch03,251,255,3	script	Wish Maiden#sch03_boss	1931,{
 OnInit:
-	disablenpc "Wish Maiden#sch03_boss";
+	hideonnpc "Wish Maiden#sch03_boss";
 	end;
 
 OnDisable:
 	killmonster "que_qsch03","Wish Maiden#sch03_boss::OnMyMobDead";
-	disablenpc "Wish Maiden#sch03_boss";
+	hideonnpc "Wish Maiden#sch03_boss";
 	stopnpctimer;
 	end;
 
@@ -3063,7 +3068,7 @@ OnTimer4000:
 
 OnTimer5000:
 	specialeffect EF_ICECRASH;
-	disablenpc "Wish Maiden#sch03_boss";
+	hideonnpc "Wish Maiden#sch03_boss";
 	specialeffect EF_SPHERE;
 	monster "que_qsch03",252,340,"Wish Maiden",1931,1,"Wish Maiden#sch03_boss::OnMyMobDead";
 	stopnpctimer;
@@ -3117,7 +3122,7 @@ que_qsch03,252,340,3	script	Wish Maiden#sch03_gift	403,{
 				close2;
 				cutin "wish_maiden11",255;
 				disablenpc "Wish Maiden#sch03_gift";
-				donpcevent "#to_agit_sch03_gate::OnEnable";
+				enablenpc "#to_agit_sch03_gate";
 				end;
 			}
 			else {
@@ -3223,7 +3228,7 @@ OnTimer3600000:
 		set $gqse_sch03_time,0;
 		enablenpc "Wish Maiden#gq_sch03";
 		enablenpc "Piamette#sch03";
-		donpcevent "Wish Maiden#sch03_boss::OnEnable";
+		hideoffnpc "Wish Maiden#sch03_boss";
 		stopnpctimer;
 	}
 	end;
diff --git a/npc/quests/okolnir/godse_sch04.txt b/npc/quests/okolnir/godse_sch04.txt
index d46e2618d..f68e65025 100644
--- a/npc/quests/okolnir/godse_sch04.txt
+++ b/npc/quests/okolnir/godse_sch04.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -11,6 +11,11 @@
 //= God Item SE Creation scipt (Brynhild)
 //===== Additional Comments: ================================= 
 //= 1.0 First version. [L0ne_W0lf]
+//= 1.1 First round of bug fixes. (bugreport:3085) [L0ne_W0lf]
+//=     Fixed two spawn locations of the key stones in Piamete's room.
+//=     Fixed calling an event that doesn't exist when killing Piamete.
+//=     Fixed the Wish Maiden not enabling when the boss is killed.
+//=     fixed two NPC named that were missed when translating.
 //============================================================ 
 
 schg_cas04,376,307,3	script	Guide#gq_sch04	899,{
@@ -998,8 +1003,8 @@ OnDisable:
 	disablenpc "#sch04_cage04";
 	disablenpc "#sch04_cage05";
 	disablenpc "#sch04_cage06";
-	donpcevent "windpath03_sch04::OnDisable";
-	donpcevent "windpath04_sch04::OnDisable";
+	disablenpc "windpath03_sch04";
+	disablenpc "windpath04_sch04";
 	set $gqse_sch04_miro,0;
 	set $gqse_sch04_pcc,0;
 	set $gqse_sch04_gd,0;
@@ -1085,8 +1090,8 @@ OnTimer3600000:
 	disablenpc "#sch04_cage04";
 	disablenpc "#sch04_cage05";
 	disablenpc "#sch04_cage06";
-	donpcevent "windpath03_sch04::OnDisable";
-	donpcevent "windpath04_sch04::OnDisable";
+	disablenpc "windpath03_sch04";
+	disablenpc "windpath04_sch04";
 	end;
 
 OnTimer3605000:
@@ -1769,8 +1774,8 @@ OnTimer8000:
 OnTimer12000:
 	mapannounce "que_qsch04","Piamette : The keeper of the key is protecting my cage.",bc_map,"0xdb7093";
 	monster "que_qsch04",108,151,"Key Stone",1905,1,"#gdtimer02_sch04::OnMyMobDead";
-	monster "que_qsch04",107,135,"Key Stone",1905,1,"#gdtimer02_sch04::OnMyMobDead";
-	monster "que_qsch04",113,114,"Key Stone",1905,1,"#gdtimer02_sch04::OnMyMobDead";
+	monster "que_qsch04",109,135,"Key Stone",1905,1,"#gdtimer02_sch04::OnMyMobDead";
+	monster "que_qsch04",115,116,"Key Stone",1905,1,"#gdtimer02_sch04::OnMyMobDead";
 	monster "que_qsch04",158,106,"Key Stone",1905,1,"#gdtimer02_sch04::OnMyMobDead";
 	monster "que_qsch04",163,133,"Key Stone",1905,1,"#gdtimer02_sch04::OnMyMobDead";
 	monster "que_qsch04",150,154,"Key Stone",1905,1,"#gdtimer02_sch04::OnMyMobDead";
@@ -1840,8 +1845,8 @@ OnTimer5000:
 
 OnMyMobDead:
 	mapannounce "que_qsch04","Piamette has been released, so the warp gate toward the South is working now.",bc_map,"0x00ff00";
-	donpcevent "windpath03_sch04::OnEnable";
-	donpcevent "windpath04_sch04::OnEnable";
+	enablenpc "windpath03_sch04";
+	enablenpc "windpath04_sch04";
 	donpcevent "#nm_switch_sch04::OnEnable";
 	end;
 }
@@ -2996,9 +3001,9 @@ OnMyMobDead:
 	end;
 }
 
-que_qsch04,247,330,5	script	½ÅÀü¼öÈ£ÀÚ#sch04_ac01	1933,4,4,{
+que_qsch04,247,330,5	script	Temple Keeper#sch04_ac01	1933,4,4,{
 OnInit:
-	disablenpc "½ÅÀü¼öÈ£ÀÚ#sch04_ac01";
+	disablenpc "Temple Keeper#sch04_ac01";
 	end;
 
 OnDisable:
@@ -3017,9 +3022,9 @@ OnMyMobDead:
 	end;
 }
 
-que_qsch04,255,330,3	script	½ÅÀü¼öÈ£ÀÚ#sch04_ac02	1933,4,4,{
+que_qsch04,255,330,3	script	Temple Keeper#sch04_ac02	1933,4,4,{
 OnInit:
-	disablenpc "½ÅÀü¼öÈ£ÀÚ#sch04_ac02";
+	disablenpc "Temple Keeper#sch04_ac02";
 	end;
 
 OnDisable:
@@ -3040,12 +3045,12 @@ OnMyMobDead:
 
 que_qsch04,251,255,3	script	Wish Maiden#sch04_boss	1931,{
 OnInit:
-	disablenpc "Wish Maiden#sch04_boss";
+	hideonnpc "Wish Maiden#sch04_boss";
 	end;
 
 OnDisable:
 	killmonster "que_qsch04","Wish Maiden#sch04_boss::OnMyMobDead";
-	disablenpc "Wish Maiden#sch04_boss";
+	hideonnpc "Wish Maiden#sch04_boss";
 	stopnpctimer;
 	end;
 
@@ -3063,7 +3068,7 @@ OnTimer4000:
 
 OnTimer5000:
 	specialeffect EF_ICECRASH;
-	disablenpc "Wish Maiden#sch04_boss";
+	hideonnpc "Wish Maiden#sch04_boss";
 	specialeffect EF_SPHERE;
 	monster "que_qsch04",252,340,"Wish Maiden",1931,1,"Wish Maiden#sch04_boss::OnMyMobDead";
 	stopnpctimer;
@@ -3117,7 +3122,7 @@ que_qsch04,252,340,3	script	Wish Maiden#sch04_gift	403,{
 				close2;
 				cutin "wish_maiden11",255;
 				disablenpc "Wish Maiden#sch04_gift";
-				donpcevent "#to_agit_sch04_gate::OnEnable";
+				enablenpc "#to_agit_sch04_gate";
 				end;
 			}
 			else {
@@ -3223,7 +3228,7 @@ OnTimer3600000:
 		set $gqse_sch04_time,0;
 		enablenpc "Wish Maiden#gq_sch04";
 		enablenpc "Piamette#sch04";
-		donpcevent "Wish Maiden#sch04_boss::OnEnable";
+		hideoffnpc "Wish Maiden#sch04_boss";
 		stopnpctimer;
 	}
 	end;
diff --git a/npc/quests/okolnir/godse_sch05.txt b/npc/quests/okolnir/godse_sch05.txt
index 29c70e4b8..08fbf184d 100644
--- a/npc/quests/okolnir/godse_sch05.txt
+++ b/npc/quests/okolnir/godse_sch05.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -11,6 +11,11 @@
 //= God Item SE Creation scipt (Brynhild)
 //===== Additional Comments: ================================= 
 //= 1.0 First version. [L0ne_W0lf]
+//= 1.1 First round of bug fixes. (bugreport:3085) [L0ne_W0lf]
+//=     Fixed two spawn locations of the key stones in Piamete's room.
+//=     Fixed calling an event that doesn't exist when killing Piamete.
+//=     Fixed the Wish Maiden not enabling when the boss is killed.
+//=     fixed two NPC named that were missed when translating.
 //============================================================ 
 
 schg_cas05,376,307,3	script	Guide#gq_sch05	899,{
@@ -998,8 +1003,8 @@ OnDisable:
 	disablenpc "#sch05_cage04";
 	disablenpc "#sch05_cage05";
 	disablenpc "#sch05_cage06";
-	donpcevent "windpath03_sch05::OnDisable";
-	donpcevent "windpath04_sch05::OnDisable";
+	disablenpc "windpath03_sch05";
+	disablenpc "windpath04_sch05";
 	set $gqse_sch05_miro,0;
 	set $gqse_sch05_pcc,0;
 	set $gqse_sch05_gd,0;
@@ -1085,8 +1090,8 @@ OnTimer3600000:
 	disablenpc "#sch05_cage04";
 	disablenpc "#sch05_cage05";
 	disablenpc "#sch05_cage06";
-	donpcevent "windpath03_sch05::OnDisable";
-	donpcevent "windpath04_sch05::OnDisable";
+	disablenpc "windpath03_sch05";
+	disablenpc "windpath04_sch05";
 	end;
 
 OnTimer3605000:
@@ -1769,8 +1774,8 @@ OnTimer8000:
 OnTimer12000:
 	mapannounce "que_qsch05","Piamette : The keeper of the key is protecting my cage.",bc_map,"0xdb7093";
 	monster "que_qsch05",108,151,"Key Stone",1905,1,"#gdtimer02_sch05::OnMyMobDead";
-	monster "que_qsch05",107,135,"Key Stone",1905,1,"#gdtimer02_sch05::OnMyMobDead";
-	monster "que_qsch05",113,114,"Key Stone",1905,1,"#gdtimer02_sch05::OnMyMobDead";
+	monster "que_qsch05",109,135,"Key Stone",1905,1,"#gdtimer02_sch05::OnMyMobDead";
+	monster "que_qsch05",115,116,"Key Stone",1905,1,"#gdtimer02_sch05::OnMyMobDead";
 	monster "que_qsch05",158,106,"Key Stone",1905,1,"#gdtimer02_sch05::OnMyMobDead";
 	monster "que_qsch05",163,133,"Key Stone",1905,1,"#gdtimer02_sch05::OnMyMobDead";
 	monster "que_qsch05",150,154,"Key Stone",1905,1,"#gdtimer02_sch05::OnMyMobDead";
@@ -1840,8 +1845,8 @@ OnTimer5000:
 
 OnMyMobDead:
 	mapannounce "que_qsch05","Piamette has been released, so the warp gate toward the South is working now.",bc_map,"0x00ff00";
-	donpcevent "windpath03_sch05::OnEnable";
-	donpcevent "windpath04_sch05::OnEnable";
+	enablenpc "windpath03_sch05";
+	enablenpc "windpath04_sch05";
 	donpcevent "#nm_switch_sch05::OnEnable";
 	end;
 }
@@ -2996,9 +3001,9 @@ OnMyMobDead:
 	end;
 }
 
-que_qsch05,247,330,5	script	½ÅÀü¼öÈ£ÀÚ#sch05_ac01	1933,4,4,{
+que_qsch05,247,330,5	script	Temple Keeper#sch05_ac01	1933,4,4,{
 OnInit:
-	disablenpc "½ÅÀü¼öÈ£ÀÚ#sch05_ac01";
+	disablenpc "Temple Keeper#sch05_ac01";
 	end;
 
 OnDisable:
@@ -3017,9 +3022,9 @@ OnMyMobDead:
 	end;
 }
 
-que_qsch05,255,330,3	script	½ÅÀü¼öÈ£ÀÚ#sch05_ac02	1933,4,4,{
+que_qsch05,255,330,3	script	Temple Keeper#sch05_ac02	1933,4,4,{
 OnInit:
-	disablenpc "½ÅÀü¼öÈ£ÀÚ#sch05_ac02";
+	disablenpc "Temple Keeper#sch05_ac02";
 	end;
 
 OnDisable:
@@ -3040,12 +3045,12 @@ OnMyMobDead:
 
 que_qsch05,251,255,3	script	Wish Maiden#sch05_boss	1931,{
 OnInit:
-	disablenpc "Wish Maiden#sch05_boss";
+	hideonnpc "Wish Maiden#sch05_boss";
 	end;
 
 OnDisable:
 	killmonster "que_qsch05","Wish Maiden#sch05_boss::OnMyMobDead";
-	disablenpc "Wish Maiden#sch05_boss";
+	hideonnpc "Wish Maiden#sch05_boss";
 	stopnpctimer;
 	end;
 
@@ -3063,7 +3068,7 @@ OnTimer4000:
 
 OnTimer5000:
 	specialeffect EF_ICECRASH;
-	disablenpc "Wish Maiden#sch05_boss";
+	hideonnpc "Wish Maiden#sch05_boss";
 	specialeffect EF_SPHERE;
 	monster "que_qsch05",252,340,"Wish Maiden",1931,1,"Wish Maiden#sch05_boss::OnMyMobDead";
 	stopnpctimer;
@@ -3117,7 +3122,7 @@ que_qsch05,252,340,3	script	Wish Maiden#sch05_gift	403,{
 				close2;
 				cutin "wish_maiden11",255;
 				disablenpc "Wish Maiden#sch05_gift";
-				donpcevent "#to_agit_sch05_gate::OnEnable";
+				enablenpc "#to_agit_sch05_gate";
 				end;
 			}
 			else {
@@ -3138,7 +3143,7 @@ que_qsch05,252,340,3	script	Wish Maiden#sch05_gift	403,{
 			mes "Humans are strong when they are united, but are easily swayed by lust.";
 			next;
 			mes "[Wish Maiden]";
-			mes "Humans are imperfect, do their chief god is there for them when they need help.";
+			mes "Humans are imperfect, so their chief god is there for them when they need help.";
 			mes "....";
 			next;
 			mes "[Wish Maiden]";
@@ -3223,7 +3228,7 @@ OnTimer3600000:
 		set $gqse_sch05_time,0;
 		enablenpc "Wish Maiden#gq_sch05";
 		enablenpc "Piamette#sch05";
-		donpcevent "Wish Maiden#sch05_boss::OnEnable";
+		hideoffnpc "Wish Maiden#sch05_boss";
 		stopnpctimer;
 	}
 	end;