4 files changed, 8 insertions, 9 deletions
diff --git a/world/map/npc/052-2/chest.txt b/world/map/npc/052-2/chest.txt
index fc57e654..1297e5c0 100644
--- a/world/map/npc/052-2/chest.txt
+++ b/world/map/npc/052-2/chest.txt
@@ -168,7 +168,7 @@ OnRing:
 L_ScheduleEnd:
     set $@ILLIA_STATUS, 253;
     startnpctimer "Valia";
-    cmdothernpc "#IlliaDaemon", "Toggle";
+    donpcevent "#IlliaDaemon::OnCommandToggle";
     end;
 
 L_Close:
diff --git a/world/map/npc/052-2/lobby.txt b/world/map/npc/052-2/lobby.txt
index 7b39233c..71dde1f7 100644
--- a/world/map/npc/052-2/lobby.txt
+++ b/world/map/npc/052-2/lobby.txt
@@ -42,7 +42,7 @@ L_ShouldNotBeHere:
 
 L_StartVoices:
     set $@illia_level_5_progress, 1;
-    cmdothernpc "#MysteriousVoice", "Start";
+    donpcevent "#MysteriousVoice::OnCommandStart";
     end;
 
 L_ShouldNotBeHere:
@@ -121,7 +121,7 @@ OnTimer2000:
     if ($@illia_level_5_progress != 1)
         end;
     npcwarp rand(30,42), rand(32,38), "?";
-    cmdothernpc "?", "Talk";
+    donpcevent "?::OnCommandTalk";
     end;
 
 OnTimer3000:
@@ -138,7 +138,7 @@ OnTimer3000:
     setnpctimer 0;
     set $@illia_lobby_voices_index, 0;
     set $@illia_level_5_progress, 2;
-    cmdothernpc "#LuviaShadow", "Invoke";
+    donpcevent "#LuviaShadow::OnCommandInvoke";
     end;
 
 L_Continue:
@@ -296,7 +296,7 @@ OnTimer20000:
     if ($@illia_level_5_progress != 6)
         end;
     set $@illia_level_5_progress, 7;
-    cmdothernpc "#LuviaShadow", "Escape";
+    donpcevent "#LuviaShadow::OnCommandEscape";
     setnpctimer 0;
     end;
 
diff --git a/world/map/npc/052-2/partyroom.txt b/world/map/npc/052-2/partyroom.txt
index a2857e9c..ba636c9d 100644
--- a/world/map/npc/052-2/partyroom.txt
+++ b/world/map/npc/052-2/partyroom.txt
@@ -18,7 +18,7 @@
 
 L_SpawnLuvia:
     set $@illia_level_7_progress, 1;
-    cmdothernpc "Luvia", "Start";
+    donpcevent "Luvia::OnCommandStart";
     end;
 
 L_ShouldNotBeHere:
@@ -78,7 +78,7 @@ OnTimer15000:
     npctalk "One piece of advice: get prepared!";
     stopnpctimer;
     setnpctimer 0;
-    cmdothernpc "#LuviaDaemon", "Invoke";
+    donpcevent "#LuviaDaemon::OnCommandInvoke";
     end;
 
 }
diff --git a/world/map/npc/052-2/storage.txt b/world/map/npc/052-2/storage.txt
index 1951cfaf..c9cdfd0f 100644
--- a/world/map/npc/052-2/storage.txt
+++ b/world/map/npc/052-2/storage.txt
@@ -22,7 +22,7 @@ L_ShouldNotBeHere:
 
 L_StartItemInvoker:
     set $@illia_level_6_progress, 1;
-    cmdothernpc "#ItemsInvoker", "Start";
+    donpcevent "#ItemsInvoker::OnCommandStart";
     end;
 
 }
@@ -189,4 +189,3 @@ L_ShouldNotBeHere:
     end;
 
 }
-