Merge remote-tracking branch 'testing/master'v2011.09.08

1 files changed, 12 insertions, 8 deletions

diff --git a/world/map/npc/001-1/guards.txt b/world/map/npc/001-1/guards.txt
index 67bc5f6d..184956da 100644
--- a/world/map/npc/001-1/guards.txt
+++ b/world/map/npc/001-1/guards.txt
@@ -21,42 +21,42 @@ L_Tip:
 L_1:
     mes "[Ekinu the Town Guard]";
     mes "\"Try to carry spare food when on fields or in dungeons, they will come in handy.  I always take beer, but don't tell the Sergeant...\"";
-    close;
+    goto L_Close;
 
 L_2:
     mes "[Ekinu the Town Guard]";
     mes "\"Always carry a map of where you are, ask the Guides in most towns to get one.\"";
-    close;
+    goto L_Close;
 
 L_3:
     mes "[Ekinu the Town Guard]";
     mes "\"When in a dungeon, monsters are more aggressive than if they were outside.\"";
-    close;
+    goto L_Close;
 
 L_4:
     mes "[Ekinu the Town Guard]";
     mes "\"When gambling for money in casinos, make sure you have enough emergency money.\"";
-    close;
+    goto L_Close;
 
 L_5:
     mes "[Ekinu the Town Guard]";
     mes "\"Never underestimate the enemy.\"";
-    close;
+    goto L_Close;
 
 L_6:
     mes "[Ekinu the Town Guard]";
     mes "\"When fighting more than one enemy, try to focus on one at a time.\"";
-    close;
+    goto L_Close;
 
 L_0:
     mes "[Ekinu the Town Guard]";
     mes "\"Let me think of something... Oh! Do NOT attack Red scorpions unless you can kill it for sure!\"";
-    close;
+    goto L_Close;
 
 L_Info:
     mes "[Ekinu the Town Guard]";
     mes "\"Everyone wants information... you won't get it, at least not here.  I'm not even sure what you mean, to be honest.\"";
-    close;
+    goto L_Close;
 
 L_disaster:
     mes "[Ekinu the Town Guard]";
@@ -67,6 +67,10 @@ L_disaster:
     next;
     mes "[Ekinu the Town Guard]";
     mes "\"Well, the mayor rebuilt everything quickly, but I have no idea where he got the GP from...\"";
+    goto L_Close;
+
+L_Close:
+    set @TEMP, 0;
     close;
 }