From c07a36c3332c2d7e4e21188909a9da892a1ec4a2 Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Sun, 17 Sep 2017 10:16:56 -0700
Subject: [PATCH] Fix event flag get set

yay order of operations
also update prompt messages for more guidance
Closes #1464
---
 PKHeX.Core/Saves/SaveFile.cs                  |  4 ++--
 .../Subforms/Save Editors/Gen3/SAV_Misc3.cs   | 21 ++++++++++++-------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/PKHeX.Core/Saves/SaveFile.cs b/PKHeX.Core/Saves/SaveFile.cs
index ba9975889..d77c6635f 100644
--- a/PKHeX.Core/Saves/SaveFile.cs
+++ b/PKHeX.Core/Saves/SaveFile.cs
@@ -286,7 +286,7 @@ public bool GetEventFlag(int flagNumber)
         {
             if (flagNumber > EventFlagMax)
                 throw new ArgumentException($"Event Flag to get ({flagNumber}) is greater than max ({EventFlagMax}).");
-            int ofs = EventFlag + flagNumber >> 3;
+            int ofs = EventFlag + (flagNumber >> 3);
             var n = flagNumber & 7;
             return (Data[ofs] >> n & 1) != 0;
         }
@@ -301,7 +301,7 @@ public void SetEventFlag(int flagNumber, bool value)
         {
             if (flagNumber > EventFlagMax)
                 throw new ArgumentException($"Event Flag to set ({flagNumber}) is greater than max ({EventFlagMax}).");
-            int ofs = EventFlag + flagNumber >> 3;
+            int ofs = EventFlag + (flagNumber >> 3);
             var n = flagNumber & 7;
             Data[ofs] &= (byte)~(1 << (n & 7));
             Data[ofs] |= (byte)((value ? 1 : 0) << n);
diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen3/SAV_Misc3.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen3/SAV_Misc3.cs
index e9efdbfb4..659aa908e 100644
--- a/PKHeX.WinForms/Subforms/Save Editors/Gen3/SAV_Misc3.cs	
+++ b/PKHeX.WinForms/Subforms/Save Editors/Gen3/SAV_Misc3.cs	
@@ -148,7 +148,7 @@ private void B_GetTickets_Click(object sender, EventArgs e)
 
             const int oldsea = 0x178;
             int[] tickets = {0x109, 0x113, 0x172, 0x173, oldsea }; // item IDs
-            if (!SAV.Japanese && DialogResult.Yes != WinFormsUtil.Prompt(MessageBoxButtons.YesNo, $"Add {itemlist[oldsea]}?"))
+            if (!SAV.Japanese && DialogResult.Yes != WinFormsUtil.Prompt(MessageBoxButtons.YesNo, $"Non Japanese save file. Add {itemlist[oldsea]} (unreleased)?"))
                 tickets = tickets.Take(tickets.Length - 1).ToArray(); // remove old sea map
 
             var p = Pouches.FirstOrDefault(z => z.Type == InventoryType.KeyItems);
@@ -174,6 +174,17 @@ private void B_GetTickets_Click(object sender, EventArgs e)
                 return;
             }
 
+            var added = string.Join(", ", missing.Select(u => itemlist[u]));
+            var addmsg = $"Add the following items?{Environment.NewLine}{added}";
+            if (have.Any())
+            {
+                string had = string.Join(", ", have.Select(u => itemlist[u]));
+                var havemsg = $"Already have:{Environment.NewLine}{had}";
+                addmsg += Environment.NewLine + Environment.NewLine + havemsg;
+            }
+            if (DialogResult.Yes != WinFormsUtil.Prompt(MessageBoxButtons.YesNo, addmsg))
+                return;
+
             // insert items at the end
             for (int i = 0; i < missing.Count; i++)
             {
@@ -182,13 +193,7 @@ private void B_GetTickets_Click(object sender, EventArgs e)
                 item.Count = 1;
             }
 
-            var added = string.Join(", ", missing.Select(u => itemlist[u]));
-            string alert = "Inserted the following items to the Key Items Pouch:" + Environment.NewLine + added;
-            if (have.Any())
-            {
-                string had = string.Join(", ", have.Select(u => itemlist[u]));
-                alert += string.Format("{0}{0}Already had the following items:{0}{1}", Environment.NewLine, had);
-            }
+            string alert = $"Inserted the following items to the Key Items Pouch:{Environment.NewLine}{added}";
             WinFormsUtil.Alert(alert);
             SAV.Inventory = Pouches;