From 823ce771a8b606456f8be043245df3bc5c9f3634 Mon Sep 17 00:00:00 2001
From: Maruno17 <serialcolour@hotmail.com>
Date: Fri, 13 May 2022 21:35:03 +0100
Subject: [PATCH] =?UTF-8?q?Fixed=20cursor=20SE=20sometimes=20playing=20whe?=
 =?UTF-8?q?n=20choosing=20a=20quantity=20in=20the=20Bag/Pok=C3=A9=20Mart?=
 =?UTF-8?q?=20but=20the=20quantity=20doesn't=20change?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Data/Scripts/016_UI/018_UI_ItemStorage.rb | 25 +++++++++++++++--------
 Data/Scripts/016_UI/020_UI_PokeMart.rb    | 25 +++++++++++++++--------
 2 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/Data/Scripts/016_UI/018_UI_ItemStorage.rb b/Data/Scripts/016_UI/018_UI_ItemStorage.rb
index cb730a02f..ffa1ba651 100644
--- a/Data/Scripts/016_UI/018_UI_ItemStorage.rb
+++ b/Data/Scripts/016_UI/018_UI_ItemStorage.rb
@@ -294,6 +294,7 @@ module UIHelper
       numwindow.update
       helpwindow.update
       yield if block_given?
+      oldnumber = curnumber
       if Input.trigger?(Input::BACK)
         ret = 0
         pbPlayCancelSE
@@ -305,23 +306,31 @@ module UIHelper
       elsif Input.repeat?(Input::UP)
         curnumber += 1
         curnumber = 1 if curnumber > maximum
-        numwindow.text = _ISPRINTF("x{1:03d}", curnumber)
-        pbPlayCursorSE
+        if curnumber != oldnumber
+          numwindow.text = _ISPRINTF("x{1:03d}", curnumber)
+          pbPlayCursorSE
+        end
       elsif Input.repeat?(Input::DOWN)
         curnumber -= 1
         curnumber = maximum if curnumber < 1
-        numwindow.text = _ISPRINTF("x{1:03d}", curnumber)
-        pbPlayCursorSE
+        if curnumber != oldnumber
+          numwindow.text = _ISPRINTF("x{1:03d}", curnumber)
+          pbPlayCursorSE
+        end
       elsif Input.repeat?(Input::LEFT)
         curnumber -= 10
         curnumber = 1 if curnumber < 1
-        numwindow.text = _ISPRINTF("x{1:03d}", curnumber)
-        pbPlayCursorSE
+        if curnumber != oldnumber
+          numwindow.text = _ISPRINTF("x{1:03d}", curnumber)
+          pbPlayCursorSE
+        end
       elsif Input.repeat?(Input::RIGHT)
         curnumber += 10
         curnumber = maximum if curnumber > maximum
-        numwindow.text = _ISPRINTF("x{1:03d}", curnumber)
-        pbPlayCursorSE
+        if curnumber != oldnumber
+          numwindow.text = _ISPRINTF("x{1:03d}", curnumber)
+          pbPlayCursorSE
+        end
       end
     end
     numwindow.dispose
diff --git a/Data/Scripts/016_UI/020_UI_PokeMart.rb b/Data/Scripts/016_UI/020_UI_PokeMart.rb
index adab1c894..116c7565d 100644
--- a/Data/Scripts/016_UI/020_UI_PokeMart.rb
+++ b/Data/Scripts/016_UI/020_UI_PokeMart.rb
@@ -475,26 +475,35 @@ class PokemonMart_Scene
         Input.update
         numwindow.update
         update
+        oldnumber = curnumber
         if Input.repeat?(Input::LEFT)
-          pbPlayCursorSE
           curnumber -= 10
           curnumber = 1 if curnumber < 1
-          numwindow.text = _INTL("x{1}<r>$ {2}", curnumber, (curnumber * itemprice).to_s_formatted)
+          if curnumber != oldnumber
+            numwindow.text = _INTL("x{1}<r>$ {2}", curnumber, (curnumber * itemprice).to_s_formatted)
+            pbPlayCursorSE
+          end
         elsif Input.repeat?(Input::RIGHT)
-          pbPlayCursorSE
           curnumber += 10
           curnumber = maximum if curnumber > maximum
-          numwindow.text = _INTL("x{1}<r>$ {2}", curnumber, (curnumber * itemprice).to_s_formatted)
+          if curnumber != oldnumber
+            numwindow.text = _INTL("x{1}<r>$ {2}", curnumber, (curnumber * itemprice).to_s_formatted)
+            pbPlayCursorSE
+          end
         elsif Input.repeat?(Input::UP)
-          pbPlayCursorSE
           curnumber += 1
           curnumber = 1 if curnumber > maximum
-          numwindow.text = _INTL("x{1}<r>$ {2}", curnumber, (curnumber * itemprice).to_s_formatted)
+          if curnumber != oldnumber
+            numwindow.text = _INTL("x{1}<r>$ {2}", curnumber, (curnumber * itemprice).to_s_formatted)
+            pbPlayCursorSE
+          end
         elsif Input.repeat?(Input::DOWN)
-          pbPlayCursorSE
           curnumber -= 1
           curnumber = maximum if curnumber < 1
-          numwindow.text = _INTL("x{1}<r>$ {2}", curnumber, (curnumber * itemprice).to_s_formatted)
+          if curnumber != oldnumber
+            numwindow.text = _INTL("x{1}<r>$ {2}", curnumber, (curnumber * itemprice).to_s_formatted)
+            pbPlayCursorSE
+          end
         elsif Input.trigger?(Input::USE)
           ret = curnumber
           break