From 631b221422448bcb029780b0f2e0838c33c09c4f Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Fri, 16 Jul 2021 18:22:17 -0300
Subject: Fix typos and update bank accounts

---
 npc/014-1/wedding-officiator.txt |  2 +-
 npc/functions/clear_vars.txt     | 18 ++++--------------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/npc/014-1/wedding-officiator.txt b/npc/014-1/wedding-officiator.txt
index ac3a6e47..8ce2dc32 100644
--- a/npc/014-1/wedding-officiator.txt
+++ b/npc/014-1/wedding-officiator.txt
@@ -7,7 +7,7 @@
     goto L_Main;
 
 L_Main:
-    if (PARTNER)
+    if (getpartnerid() > 0)
         goto L_Main_married;
 
     menu
diff --git a/npc/functions/clear_vars.txt b/npc/functions/clear_vars.txt
index 60567cd8..efaa9d13 100644
--- a/npc/functions/clear_vars.txt
+++ b/npc/functions/clear_vars.txt
@@ -18,6 +18,10 @@ function	script	ClearVariables	{
         setq Quest_Doomsday, 2;
         #DD5_TALLY = 0; // Whatever
     }
+    if (#BankAccount) {
+        BankVault += #BankAccount;
+        #BankAccount = 0;
+    }
     if (QL_CINDY) {
         if (QL_CINDY == 5) QL_CINDY = 0;
         else if (QL_CINDY == 6) QL_CINDY = 1;
@@ -55,20 +59,6 @@ function	script	ClearVariables	{
         QUEST_MAGIC  = 0;
         QUEST_MAGIC2 = 0;
     }
-
-    // Don't ask me what code below does
-    // ----------------------------------
-    /*
-    if (#BankAccount >= 0) return;
-    if (Zeny >= -#BankAccount) {
-        Zeny = Zeny + #BankAccount;
-        #BankAccount = 0;
-    }
-
-    // Partial fix
-    #BankAccount = #BankAccount + Zeny;
-    Zeny = 0;
-    */
     return;
 }
 
-- 
cgit v1.2.3-60-g2f50