Canonicalize event label capitalization

5 files changed, 53 insertions, 53 deletions

diff --git a/world/map/npc/052-2/chest.txt b/world/map/npc/052-2/chest.txt
index 11725a9a..f1c9872e 100644
--- a/world/map/npc/052-2/chest.txt
+++ b/world/map/npc/052-2/chest.txt
@@ -29,7 +29,7 @@ L_ShouldNotBeHere:
     percentheal -100, 0;
     end;
 
-onInit:
+OnInit:
     setarray $@illia_item_common_rewards, 601, 636, 637, 638, 639, 625, 626, 658, 571, 579, 876, 782, 545, 758, 4028, 602, 536, 720, 532, 570, 642;
     setarray $@illia_item_unique_rewards, 877, 878, 879, 880;
     end;
@@ -139,30 +139,30 @@ L_PrepareLeaving:
 L_Leave:
     set @illia_got_rewards, 3;
     set @illia_current_num_rewards, 0;
-    addtimer 1000, "Chest::onMsg1";
-    addtimer 4000, "Chest::onMsg2";
-    addtimer 7000, "Chest::onMsg3";
-    addtimer 9000, "Chest::onFx";
-    addtimer 10000, "Chest::onRing";
+    addtimer 1000, "Chest::OnMsg1";
+    addtimer 4000, "Chest::OnMsg2";
+    addtimer 7000, "Chest::OnMsg3";
+    addtimer 9000, "Chest::OnFx";
+    addtimer 10000, "Chest::OnRing";
     close;
 
-onMsg1:
+OnMsg1:
     message strcharinfo(0), "At the moment you are wearing the ring, you start to feel dizzy...";
     end;
 
-onMsg2:
+OnMsg2:
     message strcharinfo(0), "Who is Luvia? Something isn't right... It looks like your memory is rewritten.";
     end;
 
-onMsg3:
+OnMsg3:
     message strcharinfo(0), "Damn, this ring! That Valia! Someone...";
     end;
 
-onFx:
+OnFx:
     misceffect FX_MAGIC_BLUE_TELEPORT, strcharinfo(0);
     end;
 
-onRing:
+OnRing:
     warp "007-1.gat", 85 + rand(0,2), 75 + rand(0,2);
     if (strcharinfo(0) == $@ILLIA_HERO$)
         goto L_ScheduleEnd;
diff --git a/world/map/npc/052-2/janitor.txt b/world/map/npc/052-2/janitor.txt
index 32ed405c..7ee68955 100644
--- a/world/map/npc/052-2/janitor.txt
+++ b/world/map/npc/052-2/janitor.txt
@@ -17,7 +17,7 @@ OnCommandClean:
 end;
 
 OnCommandClean:
-    killmonster "052-2.gat", "#ItemsInvoker::onDeath";
+    killmonster "052-2.gat", "#ItemsInvoker::OnDeath";
     npcwarp 1, 1, "#ItemsInvoker";
     end;
 
@@ -29,8 +29,8 @@ OnCommandClean:
 end;
 
 OnCommandClean:
-    killmonster "052-2.gat", "#LuviaDaemon::onDeath";
-    killmonster "052-2.gat", "#LuviaDaemon::onWGD";
+    killmonster "052-2.gat", "#LuviaDaemon::OnDeath";
+    killmonster "052-2.gat", "#LuviaDaemon::OnWGD";
     npcwarp 83, 28, "#LuviaDaemon";
     npcwarp 88, 15, "Luvia";
     end;
diff --git a/world/map/npc/052-2/lobby.txt b/world/map/npc/052-2/lobby.txt
index c651266c..744a0a2a 100644
--- a/world/map/npc/052-2/lobby.txt
+++ b/world/map/npc/052-2/lobby.txt
@@ -107,7 +107,7 @@ OnNN:
 {
 end;
 
-onInit:
+OnInit:
     setarray $@illia_lobby_voices$, "Finally.", "I was...", "Waiting...", "For you!";
     end;
 
@@ -236,7 +236,7 @@ OnTimer24500:
     npctalk "Demonotis!";
     misceffect FX_EVIL_SUMMON;
     callsub S_GetHeroRect;
-    areamonster "052-2.gat", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1101, 20 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::onDSDeath";
+    areamonster "052-2.gat", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1101, 20 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::OnDSDeath";
     callsub S_ClearHeroRect;
     end;
 
@@ -246,7 +246,7 @@ OnTimer44000:
     npctalk "Demonotis!";
     misceffect FX_EVIL_SUMMON;
     callsub S_GetHeroRect;
-    areamonster "052-2.gat", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1101, 28 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::onDSDeath";
+    areamonster "052-2.gat", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1101, 28 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::OnDSDeath";
     callsub S_ClearHeroRect;
     end;
 
@@ -256,7 +256,7 @@ OnTimer77000:
     npctalk "Demonotis!";
     misceffect FX_EVIL_SUMMON;
     callsub S_GetHeroRect;
-    areamonster "052-2.gat", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1101, 42 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::onDSDeath";
+    areamonster "052-2.gat", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1101, 42 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::OnDSDeath";
     callsub S_ClearHeroRect;
     // That was the last spawn: reset the timer to start the CheckInvoke loop.
     set $@illia_level_5_progress, 5;
@@ -289,7 +289,7 @@ OnTimer18500:
     misceffect FX_EVIL_SUMMON;
     misceffect FX_MAGIC_DARK_EXPLOSION;
     callsub S_GetHeroRect;
-    areamonster "052-2.gat", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1103, 8 + (16 - 480/(30+$Illia_Luvia_Harvest))/3, "Luvia?::onWGDeath";
+    areamonster "052-2.gat", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1103, 8 + (16 - 480/(30+$Illia_Luvia_Harvest))/3, "Luvia?::OnWGDeath";
     callsub S_ClearHeroRect;
     end;
 
@@ -309,19 +309,19 @@ OnTimer2000:
         end;
     setnpctimer 0;
     // Mock players randomly (more or less once every 40 secs) and if still enough mobs running after them
-    if ($@illia_level_5_progress == 5 && rand(20) == 0 && (mobcount("052-2.gat", "Luvia?::onDSDeath") > 20))
+    if ($@illia_level_5_progress == 5 && rand(20) == 0 && (mobcount("052-2.gat", "Luvia?::OnDSDeath") > 20))
         npctalk "Ahaha! Run... Run!";
-    if ($@illia_level_5_progress == 5 && (mobcount("052-2.gat", "Luvia?::onDSDeath") < 0))
+    if ($@illia_level_5_progress == 5 && (mobcount("052-2.gat", "Luvia?::OnDSDeath") < 0))
         goto L_AllWavesClear;
-    if ($@illia_level_5_progress == 7 && (mobcount("052-2.gat", "Luvia?::onWGDeath") < 0))
+    if ($@illia_level_5_progress == 7 && (mobcount("052-2.gat", "Luvia?::OnWGDeath") < 0))
         goto L_AllWavesClear;
     end;
 
 L_Clear:
     stopnpctimer;
     setnpctimer 0;
-    killmonster "052-2.gat", "Luvia?::onDSDeath";
-    killmonster "052-2.gat", "Luvia?::onWGDeath";
+    killmonster "052-2.gat", "Luvia?::OnDSDeath";
+    killmonster "052-2.gat", "Luvia?::OnWGDeath";
     end;
 
 L_AllWavesClear:
@@ -372,10 +372,10 @@ S_ClearHeroRect:
     set $@illia_lobby_y2, 0;
     return;
 
-onDSDeath:
+OnDSDeath:
     end;
 
-onWGDeath:
+OnWGDeath:
     end;
 
 }
diff --git a/world/map/npc/052-2/partyroom.txt b/world/map/npc/052-2/partyroom.txt
index fc1094f5..edbade40 100644
--- a/world/map/npc/052-2/partyroom.txt
+++ b/world/map/npc/052-2/partyroom.txt
@@ -142,7 +142,7 @@ OnTimer5500:
     enablenpc "#LuviaDaemon";
     misceffect FX_EVIL_SUMMON;
     misceffect FX_CHANNELLING_CAST;
-    monster "052-2.gat", $@illia_luvia_x, $@illia_luvia_y, "", 1102, 1, "#LuviaDaemon::onDeath";
+    monster "052-2.gat", $@illia_luvia_x, $@illia_luvia_y, "", 1102, 1, "#LuviaDaemon::OnDeath";
     set $@illia_luvia_x, 0;
     set $@illia_luvia_y, 0;
     end;
@@ -182,9 +182,9 @@ S_SpawnWitchGuard:
     npcwarp getx(), gety(), "#LuviaDaemon";
     misceffect FX_EVIL_SUMMON;
     misceffect FX_GROUND_SPAWN;
-    monster "052-2.gat", getx(), gety(), "", 1103, 1, "#LuviaDaemon::onWGD";
+    monster "052-2.gat", getx(), gety(), "", 1103, 1, "#LuviaDaemon::OnWGD";
     detachrid;
-    areatimer "052-2.gat", 73, 11, 115, 49, 0, "#LuviaDaemon::onWGS";
+    areatimer "052-2.gat", 73, 11, 115, 49, 0, "#LuviaDaemon::OnWGS";
     return;
 
 OnTimer30000:
@@ -200,7 +200,7 @@ OnTimer30000:
 L_TriggerTrance:
     set $@illia_level_7_progress, 3;
     set $@illia_luvia_trance_delay, 0;
-    areatimer "052-2.gat", 73, 11, 115, 49, 0, "#LuviaDaemon::onTT";
+    areatimer "052-2.gat", 73, 11, 115, 49, 0, "#LuviaDaemon::OnTT";
     setnpctimer 0;
     end;
 
@@ -209,19 +209,19 @@ L_Clear:
     setnpctimer 0;
     end;
 
-onDeath:
+OnDeath:
     stopnpctimer;
     setnpctimer 0;
     if ($@illia_progress != 7)
         end;
     set $@illia_level_7_progress, 4;
-    killmonster "052-2.gat", "#LuviaDaemon::onWGD";
+    killmonster "052-2.gat", "#LuviaDaemon::OnWGD";
     mapannounce "052-2.gat", "Luvia: How? By mere humans! But we will see again! Enjoy your victory while it lasts, " + $@ILLIA_HERO$ + "!!", 0;
     set @illia_bp, $Illia_Luvia_Harvest * 16 / 10 + 120;
     set BOSS_POINTS, BOSS_POINTS + @illia_bp;
     message strcharinfo(0), "You gain " + @illia_bp + " Boss Points giving you a total of " + BOSS_POINTS + ".";
     set @illia_bp, 0;
-    areatimer "052-2.gat", 73, 11, 115, 49, 2000, "#LuviaDaemon::onW00t";
+    areatimer "052-2.gat", 73, 11, 115, 49, 2000, "#LuviaDaemon::OnW00t";
 
     set $@illia_progress, 8;
     callfunc "UpdateIlliaProgress";
@@ -249,20 +249,20 @@ onDeath:
 
     end;
 
-onWGD:
+OnWGD:
     end;
 
-onWGS:
+OnWGS:
     if ($@illia_level_7_progress == 2)
         message strcharinfo(0), "One of Luvia's guard spawned from the depths to assist her!";
     end;
 
-onTT:
+OnTT:
     if ($@illia_level_7_progress == 3)
         message strcharinfo(0), "Luvia seems to become in trance!";
     end;
 
-onW00t:
+OnW00t:
     message strcharinfo(0), "You defeated this evil sorceress... But what about her sister now?";
     end;
 
diff --git a/world/map/npc/052-2/storage.txt b/world/map/npc/052-2/storage.txt
index 43160db8..464eee9b 100644
--- a/world/map/npc/052-2/storage.txt
+++ b/world/map/npc/052-2/storage.txt
@@ -31,7 +31,7 @@ L_StartItemInvoker:
 {
 end;
 
-onInit:
+OnInit:
     setarray $@illia_storage_items, 541, 567, 568, 562;
     setarray $@illia_storage_special_items, 687, 827, 1229;
     // Map coords : x1,y1, x2,y2, ...
@@ -42,10 +42,10 @@ OnCommandStart:
     set $@illia_storage_max_items, 20;
     set $@illia_storage_deviation, (8 + ($Illia_Luvia_Harvest*70)/100)*3;
     initnpctimer;
-    areatimer "052-2.gat", 19, 60, 35, 78, 10, "#ItemsInvoker::onStart";
+    areatimer "052-2.gat", 19, 60, 35, 78, 10, "#ItemsInvoker::OnStart";
     end;
 
-onStart:
+OnStart:
     message strcharinfo(0), "You feel a strange atmosphere in this room... You sense a strong magic rising from the depth!";
     end;
 
@@ -64,7 +64,7 @@ OnTimer1000:
 OnTimer1500:
     // See the note above.
     enablenpc "#ItemsInvoker";
-    areatimer "052-2.gat", 19, 60, 35, 78, 10, "#ItemsInvoker::onItem";
+    areatimer "052-2.gat", 19, 60, 35, 78, 10, "#ItemsInvoker::OnItem";
     misceffect FX_GROUND_SPAWN;
     end;
 
@@ -75,7 +75,7 @@ OnTimer3750:
     set $@item_invoke_index, 0;
     end;
 
-onItem:
+OnItem:
     if (strcharinfo(0) == $@ILLIA_HERO$)
         goto L_ItemSpawn;
     end;
@@ -108,20 +108,20 @@ L_ItemSpawn:
     end;
 
 L_MakeSpecialMonster:
-    monster "052-2.gat", $@item_invoke_x, $@item_invoke_y, "", 1103, 1, "#ItemsInvoker::onDeath";
-    areatimer "052-2.gat", 19, 60, 35, 78, 10, "#ItemsInvoker::onWtf";
+    monster "052-2.gat", $@item_invoke_x, $@item_invoke_y, "", 1103, 1, "#ItemsInvoker::OnDeath";
+    areatimer "052-2.gat", 19, 60, 35, 78, 10, "#ItemsInvoker::OnWtf";
     set $@illia_storage_max_items, $@illia_storage_max_items - 1;
     end;
 
 L_MakeMonster:
-    monster "052-2.gat", $@item_invoke_x, $@item_invoke_y, "", 1101, rand(1, 3), "#ItemsInvoker::onDeath";
+    monster "052-2.gat", $@item_invoke_x, $@item_invoke_y, "", 1101, rand(1, 3), "#ItemsInvoker::OnDeath";
     set $@illia_storage_max_items, $@illia_storage_max_items - 1;
     set @r, 0;
     end;
 
 L_MakeSpecialItem:
     makeitem $@illia_storage_special_items[rand(getarraysize($@illia_storage_special_items))], rand(2, 4), "052-2.gat", $@item_invoke_x, $@item_invoke_y;
-    areatimer "052-2.gat", 19, 60, 35, 78, 10, "#ItemsInvoker::onWow";
+    areatimer "052-2.gat", 19, 60, 35, 78, 10, "#ItemsInvoker::OnWow";
     set $@illia_storage_max_items, $@illia_storage_max_items - 1;
     set @r, 0;
     end;
@@ -129,7 +129,7 @@ L_MakeSpecialItem:
 L_CheckMobs:
     if ($@illia_progress != 6)
         goto L_Clear;
-    if (mobcount("052-2.gat", "#ItemsInvoker::onDeath") < 0)
+    if (mobcount("052-2.gat", "#ItemsInvoker::OnDeath") < 0)
         goto L_Stop;
     setnpctimer 0;
     end;
@@ -139,7 +139,7 @@ L_Clear:
     setnpctimer 0;
     set $@illia_storage_deviation, 0;
     set $@illia_storage_max_items, 0;
-    killmonster "052-2.gat", "#ItemsInvoker::onDeath";
+    killmonster "052-2.gat", "#ItemsInvoker::OnDeath";
     end;
 
 L_Stop:
@@ -152,21 +152,21 @@ L_Stop:
     set $@illia_progress, 7;
     callfunc "UpdateIlliaProgress";
     set $@illia_max_time, $@illia_max_time + 1200;
-    areatimer "052-2.gat", 19, 60, 35, 78, 10, "#ItemsInvoker::onStop";
+    areatimer "052-2.gat", 19, 60, 35, 78, 10, "#ItemsInvoker::OnStop";
     end;
 
-onDeath:
+OnDeath:
     end;
 
-onStop:
+OnStop:
     message strcharinfo(0), "The magic seems to quickly dissipate.";
     end;
 
-onWtf:
+OnWtf:
     message strcharinfo(0), "Look out!";
     end;
 
-onWow:
+OnWow:
     message strcharinfo(0), "Wow, see what appeared!";
     end;