Fix style (split for more readable diff)

4 files changed, 26 insertions, 29 deletions

diff --git a/world/map/npc/001-1/elanore.txt b/world/map/npc/001-1/elanore.txt
index 2a5a0095..8f52e771 100644
--- a/world/map/npc/001-1/elanore.txt
+++ b/world/map/npc/001-1/elanore.txt
@@ -48,68 +48,68 @@ function|script|ElanoreFix|,
     if (sc_check(sc_poison)) goto L_CurePoison;
     if (BaseLevel > 10) goto L_NoHeal;
     set @TEMP,rand(4);
-    if(@TEMP == 1) goto Heal2;
-    if(@TEMP == 2) goto Heal3;
-    if(@TEMP == 3) goto Heal4;
-    goto Heal1;
+    if(@TEMP == 1) goto L_Heal2;
+    if(@TEMP == 2) goto L_Heal3;
+    if(@TEMP == 3) goto L_Heal4;
+    goto L_Heal1;
 
-Heal1:
+L_Heal1:
 
     mes "[Elanore the Healer]";
     mes "\"You don't look too well; let me treat your wounds.\"";
     next;
-    goto Heal_L;
+    goto L_Heal_L;
 
-Heal2:
+L_Heal2:
 
     mes "[Elanore the Healer]";
     mes "\"I will make quick work of your wounds.\"";
     next;
-    goto Heal_L;
+    goto L_Heal_L;
 
-Heal3:
+L_Heal3:
 
     mes "[Elanore the Healer]";
     mes "\"Need a healing?\"";
     next;
-    goto Heal_L;
+    goto L_Heal_L;
 
-Heal4:
+L_Heal4:
 
     mes "[Elanore the Healer]";
     mes "\"Sometimes you just need to run from battle.\"";
     next;
-    goto Heal_L;
+    goto L_Heal_L;
 
-Heal_L:
+L_Heal_L:
     set @TEMP,rand(4);
-    if(@TEMP == 1) goto Heal_2;
-    if(@TEMP == 2) goto Heal_3;
-    if(@TEMP == 3) goto Heal_4;
-    goto Heal_1;
+    if(@TEMP == 1) goto L_Heal_2;
+    if(@TEMP == 2) goto L_Heal_3;
+    if(@TEMP == 3) goto L_Heal_4;
+    goto L_Heal_1;
 
-Heal_1:
+L_Heal_1:
 
     mes "[Elanore the Healer]";
     mes "\"Here you go!\"";
     heal 10000,10000;
     goto L_Close;
 
-Heal_2:
+L_Heal_2:
 
     mes "[Elanore the Healer]";
     mes "\"Painless, wasn't it?";
     heal 10000,10000;
     goto L_Close;
 
-Heal_3:
+L_Heal_3:
 
     mes "[Elanore the Healer]";
     mes "\"You should be more careful.\"";
     heal 10000,10000;
     goto L_Close;
 
-Heal_4:
+L_Heal_4:
 
     mes "[Elanore the Healer]";
     mes "\"Much better, right?!\"";
@@ -164,7 +164,7 @@ OnPCKillEvent:
     goto L_OnPcKillFinish;
 
 L_OnPcKillWipe:
-        set @Q_heal_exp, 0;
+    set @Q_heal_exp, 0;
     goto L_OnPcKillFinish;
 
 L_OnPcKillFinish:
diff --git a/world/map/npc/001-1/mikhail.txt b/world/map/npc/001-1/mikhail.txt
index d0ec2f3d..b2b6d64d 100644
--- a/world/map/npc/001-1/mikhail.txt
+++ b/world/map/npc/001-1/mikhail.txt
@@ -10,8 +10,7 @@
     if (@state >= 6) goto L_Done;
     if (@state == 5) goto L_Progress;
     if (@state == 4) goto L_Start;
-    //else
-                    goto L_Convince_Mikhail_First;
+    goto L_Convince_Mikhail_First;
 
 L_Convince_Mikhail_First:
     mes "[Mikhail]";
diff --git a/world/map/npc/001-1/monster_guide.txt b/world/map/npc/001-1/monster_guide.txt
index 7df38189..eb2b10ce 100644
--- a/world/map/npc/001-1/monster_guide.txt
+++ b/world/map/npc/001-1/monster_guide.txt
@@ -11,9 +11,9 @@ Register:
     mes "[Aidan the Monster Guide]";
     mes "Oh my, you don't seem to be registered as a Quest Participant. Would you like to register?";
     next;
-    goto Choice;
+    goto L_Choice;
 
-Choice:
+L_Choice:
     menu
         "Register",L_R,
         "Not at the moment",
@@ -43,5 +43,5 @@ L_I:
     mes "[Monster Guide]";
     mes "So whaddaya say, sign up won't you?";
     next;
-    goto Choice;
+    goto L_Choice;
 }
diff --git a/world/map/npc/001-1/rewards_master.txt b/world/map/npc/001-1/rewards_master.txt
index e581b907..f078c62b 100644
--- a/world/map/npc/001-1/rewards_master.txt
+++ b/world/map/npc/001-1/rewards_master.txt
@@ -61,8 +61,6 @@ L_NotEnough:
     mes "\"You don't have enough Monster Points for a reward. You'll need to kill some more monsters first.\"";
     goto L_Close;
 
-
-
 L_Give_all:
     // we need to count how many loop iterations are done there,
     // since the server complains about more than 250 (70 according to Jaxad0127)