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

1 files changed, 26 insertions, 18 deletions

diff --git a/world/map/npc/001-1/children.txt b/world/map/npc/001-1/children.txt
index 31dcc87b..91aa2e1f 100644
--- a/world/map/npc/001-1/children.txt
+++ b/world/map/npc/001-1/children.txt
@@ -15,41 +15,45 @@
 L_1:
     mes "[Aisha]";
     mes "\"Maggots are soo slimey!\"";
-    close;
+    goto L_Close;
 
 L_2:
     mes "[Aisha]";
     mes "\"Want to play ball with me?\"";
-    close;
+    goto L_Close;
 
 L_3:
     mes "[Aisha]";
     mes "\"There are so many monsters; I hate scorpions!\"";
-    close;
+    goto L_Close;
 
 L_4:
     mes "[Aisha]";
     mes "\"When I grow up, I want to be strong enough to kill a scorpion!\"";
-    close;
+    goto L_Close;
 
 L_5:
     mes "[Aisha]";
     mes "\"Mommy told me that you can sell the things that monsters drop.\"";
-    close;
+    goto L_Close;
 
 L_6:
     mes "[Aisha]";
     mes "\"Have you tried to eat a roasted maggot?  They are sooo yummy!  And you feel much healthier afterwards, too!\"";
-    close;
+    goto L_Close;
 
 L_7:
     mes "[Aisha]";
     mes "\"I want to be a Doctor when I grow up!\"";
-    close;
+    goto L_Close;
 
 L_8:
     mes "[Aisha]";
     mes "\"That volcano was sooo scary!  The earth was shaking and everything was breaking down... but now they have rebuilt everything.\"";
+    goto L_Close;
+
+L_Close:
+    set @TEMP, 0;
     close;
 }
 
@@ -69,35 +73,35 @@ L_8:
 
 L_1:
     mes "\"If I learned anything from school, Grenxen founded Tulimshar.\"";
-    close;
+    goto L_Close;
 
 L_2:
     mes "\"When I was picking rocks from the field, I saw a red scorpion.\"";
-    close;
+    goto L_Close;
 
 L_3:
     mes "\"Its polite to state your name before talking to anyone.\"";
-    close;
+    goto L_Close;
 
 L_4:
     mes "\"I have a Scorpion Doll!\"";
-    close;
+    goto L_Close;
 
 L_5:
     mes "\"I always take some spare Cactus Juice with me on the field.  They are heavy, though.\"";
-    close;
+    goto L_Close;
 
 L_6:
     mes "\"When you are feeling bad, eating something can usually help you heal faster.\"";
-    close;
+    goto L_Close;
 
 L_7:
     mes "\"Grenxen is the Demon that founded Tulimshar.\"";
-    close;
+    goto L_Close;
 
 L_8:
     mes "\"That volcano eruption was scary; much of Tulimshar was destroyed.  But the mayor had everything rebuilt quickly.\"";
-    close;
+    goto L_Close;
 
 L_9:
     mes "\"I know a very bad word.  But I must not say it, because monsters will come and get me if I do!\"";
@@ -105,7 +109,7 @@ L_9:
     menu
         "A bad word?", L_tell,
         "Oh, you better keep it for yourself then.", -;
-    close;
+    goto L_Close;
 
 L_tell:
     mes "[Nina]";
@@ -115,12 +119,12 @@ L_tell:
         "If I promise to never tell anyone, can you tell me the word?", L_keepword,
         "I understand, you do not need to tell me...", L_giveword,
         "Goodbye!", -;
-    close;
+    goto L_Close;
 
 L_keepword:
     mes "[Nina]";
     mes "\"No.\"";
-    close;
+    goto L_Close;
 
 L_giveword:
     mes "[Nina]";
@@ -131,5 +135,9 @@ L_giveword:
     mes "[Nina]";
     mes "Terrified, she looks around once more.";
     mes "\"But you mustn't tell anyone!\"";
+    goto L_Close;
+
+L_Close:
+    set @TEMP, 0;
     close;
 }