8 files changed, 24 insertions, 15 deletions
diff --git a/world/map/npc/functions/banker.txt b/world/map/npc/functions/banker.txt
index 9492f0f5..2caa2ad0 100644
--- a/world/map/npc/functions/banker.txt
+++ b/world/map/npc/functions/banker.txt
@@ -213,7 +213,7 @@ L_Balance:
     mes "[" + @npcname$ + "]";
     mes "\"Your current bank balance is:";
     mes #BankAccount + " GP\"";
-    if (#BankOptions & OPT_BANK_CLOSE) close;
+    if (#BankOptions & OPT_BANK_CLOSE) goto L_Return;
     goto L_Start;
 
 L_Nev:
diff --git a/world/map/npc/functions/debug.txt b/world/map/npc/functions/debug.txt
index 7885c821..df942241 100755
--- a/world/map/npc/functions/debug.txt
+++ b/world/map/npc/functions/debug.txt
@@ -912,7 +912,8 @@ L_ResetAll:
     goto L_Begin;
 
 L_Close:
-    close;
+    close2;
+    return;
 
 }
 
diff --git a/world/map/npc/functions/ferry.txt b/world/map/npc/functions/ferry.txt
index aad92b14..e0d68707 100644
--- a/world/map/npc/functions/ferry.txt
+++ b/world/map/npc/functions/ferry.txt
@@ -123,7 +123,8 @@ L_WorldFerry:
     goto L_Close;
 
 L_Close:
-    close;
+    close2;
+    return;
 }
 
 function|script|BoardFerry
diff --git a/world/map/npc/functions/inn.txt b/world/map/npc/functions/inn.txt
index e45c398c..7cf281bd 100644
--- a/world/map/npc/functions/inn.txt
+++ b/world/map/npc/functions/inn.txt
@@ -25,7 +25,8 @@ L_Close:
     mes "[" + @npcname$ + "]";
     mes "\"See you.\"";
     set @npcname$, "";
-    close;
+    close2;
+    return;
 
 L_NoMoney:
     mes "[" + @npcname$ + "]";
diff --git a/world/map/npc/functions/magic.txt b/world/map/npc/functions/magic.txt
index 38acb817..aaa8a618 100644
--- a/world/map/npc/functions/magic.txt
+++ b/world/map/npc/functions/magic.txt
@@ -13,7 +13,7 @@
 function|script|MagicGainBasic
 {
     set MAGIC_FLAGS, MAGIC_FLAGS | MFLAG_DRANK_POTION;
-    close;
+    return;
 }
 
 // ------------------------------------------------------------
diff --git a/world/map/npc/functions/slot_machine.txt b/world/map/npc/functions/slot_machine.txt
index c25dba03..cc8e5a70 100644
--- a/world/map/npc/functions/slot_machine.txt
+++ b/world/map/npc/functions/slot_machine.txt
@@ -27,16 +27,17 @@ L_Play:
     mes "Congratulations! You won!";
     mes "You get 10 casino coins";
     getitem "CasinoCoins", 10;
-    close;
+    goto L_Close;
 
 L_Lost:
     mes "You lost!";
-    close;
+    goto L_Close;
 
 L_NoCoin:
     mes "Insert coin";
-    close;
+    goto L_Close;
 
 L_Close:
-    close;
+    close2;
+    return;
 }
diff --git a/world/map/npc/functions/undead_debug.txt b/world/map/npc/functions/undead_debug.txt
index b0466f65..15e3bcd9 100644
--- a/world/map/npc/functions/undead_debug.txt
+++ b/world/map/npc/functions/undead_debug.txt
@@ -78,7 +78,8 @@ L_TeroganItems:
     goto L_Main;
 
 L_Close:
-    close;
+    close2;
+    return;
 }
 
 // Debug for Krukan
diff --git a/world/map/npc/functions/water_bottle.txt b/world/map/npc/functions/water_bottle.txt
index b9a73740..e5f80766 100644
--- a/world/map/npc/functions/water_bottle.txt
+++ b/world/map/npc/functions/water_bottle.txt
@@ -8,7 +8,7 @@ function|script|WaterBottle
     input @count;
 
     if (@count == 0)
-        close;
+        goto L_Close;
     set @cost, @count * @COST_PER_BOTTLE;
     set @empty, countitem("EmptyBottle");
 
@@ -25,17 +25,21 @@ function|script|WaterBottle
     set Zeny, Zeny - @cost;
     delitem "EmptyBottle", @count;
     getitem "BottleOfWater", @count;
-    close;
+    goto L_Close;
 
 L_NotEnoughBottles:
     mes "You don't have that many empty bottles!";
-    close;
+    goto L_Close;
 
 L_NotEnoughMoney:
     mes "You don't have enough gp! You need " + @cost + "gp.";
-    close;
+    goto L_Close;
 
 L_NotEnoughSlots:
     mes "You don't have room for these bottles!";
-    close;
+    goto L_Close;
+
+L_Close:
+    close2;
+    return;
 }