diff options
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/014-1/wedding-officiator.txt | 2 | ||||
| -rw-r--r-- | 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; } |