Tidying up from previous commit

Data/Scripts/002_BattleSettings.rb

@@ -65,9 +65,6 @@ module Settings
 
   #=============================================================================
 
-  # An array of items which act as Mega Rings for the player (NPCs don't need a
-  # Mega Ring item, just a Mega Stone held by their Pokémon).
-  MEGA_RINGS        = [:MEGARING, :MEGABRACELET, :MEGACUFF, :MEGACHARM]
   # The Game Switch which, while ON, prevents all Pokémon in battle from Mega
   # Evolving even if they otherwise could.
   NO_MEGA_EVOLUTION = 34

Data/Scripts/016_UI/020_UI_PokeMart.rb

@@ -187,8 +187,8 @@ class PokemonMart_Scene
       @sprites["itemtextwindow"].text =
         (itemwindow.item) ? @adapter.getDescription(itemwindow.item) : _INTL("Quit shopping.")
       @sprites["qtywindow"].visible = !itemwindow.item.nil?
-      @sprites["qtywindow"].text    = _INTL("In Bag:<r>x{1}", @adapter.getQuantity(itemwindow.item))
+      @sprites["qtywindow"].text    = _INTL("In Bag:<r>{1}", @adapter.getQuantity(itemwindow.item))
-      @sprites["qtywindow"].y       = Graphics.height - 108 - @sprites["qtywindow"].height
+      @sprites["qtywindow"].y       = Graphics.height - 102 - @sprites["qtywindow"].height
       itemwindow.refresh
     end
     @sprites["moneywindow"].text = _INTL("Money:\r\n<r>{1}", @adapter.getMoneyString)
@@ -243,8 +243,8 @@ class PokemonMart_Scene
     @sprites["qtywindow"].height = 64
     @sprites["qtywindow"].baseColor = Color.new(88, 88, 80)
     @sprites["qtywindow"].shadowColor = Color.new(168, 184, 184)
-    @sprites["qtywindow"].text = _INTL("In Bag:<r>x{1}", @adapter.getQuantity(@sprites["itemwindow"].item))
+    @sprites["qtywindow"].text = _INTL("In Bag:<r>{1}", @adapter.getQuantity(@sprites["itemwindow"].item))
-    @sprites["qtywindow"].y    = Graphics.height - 108 - @sprites["qtywindow"].height
+    @sprites["qtywindow"].y    = Graphics.height - 102 - @sprites["qtywindow"].height
     pbDeactivateWindows(@sprites)
     @buying = buying
     pbRefresh
@@ -439,66 +439,52 @@ class PokemonMart_Scene
     itemprice = @adapter.getPrice(item, !@buying)
     itemprice /= 2 if !@buying
     pbDisplay(helptext, true)
-    using(numwindow = Window_AdvancedTextPokemon.new("")) {   # Showing number of items
+    using(numwindow = Window_AdvancedTextPokemon.new("")) do   # Showing number of items
-      qty = @adapter.getQuantity(item)
+      pbPrepareWindow(numwindow)
-      using(inbagwindow = Window_AdvancedTextPokemon.new("")) {   # Showing quantity in bag
+      numwindow.viewport = @viewport
-        pbPrepareWindow(numwindow)
+      numwindow.width = 224
-        pbPrepareWindow(inbagwindow)
+      numwindow.height = 64
-        numwindow.viewport = @viewport
+      numwindow.baseColor = Color.new(88, 88, 80)
-        numwindow.width = 224
+      numwindow.shadowColor = Color.new(168, 184, 184)
-        numwindow.height = 64
+      numwindow.text = _INTL("x{1}<r>$ {2}", curnumber, (curnumber * itemprice).to_s_formatted)
-        numwindow.baseColor = Color.new(88, 88, 80)
+      pbBottomRight(numwindow)
-        numwindow.shadowColor = Color.new(168, 184, 184)
+      numwindow.y -= helpwindow.height
-        inbagwindow.visible = @buying
+      loop do
-        inbagwindow.viewport = @viewport
+        Graphics.update
-        inbagwindow.width = 190
+        Input.update
-        inbagwindow.height = 64
+        numwindow.update
-        inbagwindow.baseColor = Color.new(88, 88, 80)
+        update
-        inbagwindow.shadowColor = Color.new(168, 184, 184)
+        if Input.repeat?(Input::LEFT)
-        inbagwindow.text = _INTL("In Bag:<r>{1}  ", qty)
+          pbPlayCursorSE
-        numwindow.text = _INTL("x{1}<r>$ {2}", curnumber, (curnumber * itemprice).to_s_formatted)
+          curnumber -= 10
-        pbBottomRight(numwindow)
+          curnumber = 1 if curnumber < 1
-        numwindow.y -= helpwindow.height
+          numwindow.text = _INTL("x{1}<r>$ {2}", curnumber, (curnumber * itemprice).to_s_formatted)
-        pbBottomLeft(inbagwindow)
+        elsif Input.repeat?(Input::RIGHT)
-        inbagwindow.y -= helpwindow.height
+          pbPlayCursorSE
-        loop do
+          curnumber += 10
-          Graphics.update
+          curnumber = maximum if curnumber > maximum
-          Input.update
+          numwindow.text = _INTL("x{1}<r>$ {2}", curnumber, (curnumber * itemprice).to_s_formatted)
-          numwindow.update
+        elsif Input.repeat?(Input::UP)
-          inbagwindow.update
+          pbPlayCursorSE
-          self.update
+          curnumber += 1
-          if Input.repeat?(Input::LEFT)
+          curnumber = 1 if curnumber > maximum
-            pbPlayCursorSE
+          numwindow.text = _INTL("x{1}<r>$ {2}", curnumber, (curnumber * itemprice).to_s_formatted)
-            curnumber -= 10
+        elsif Input.repeat?(Input::DOWN)
-            curnumber = 1 if curnumber < 1
+          pbPlayCursorSE
-            numwindow.text = _INTL("x{1}<r>$ {2}", curnumber, (curnumber * itemprice).to_s_formatted)
+          curnumber -= 1
-          elsif Input.repeat?(Input::RIGHT)
+          curnumber = maximum if curnumber < 1
-            pbPlayCursorSE
+          numwindow.text = _INTL("x{1}<r>$ {2}", curnumber, (curnumber * itemprice).to_s_formatted)
-            curnumber += 10
+        elsif Input.trigger?(Input::USE)
-            curnumber = maximum if curnumber > maximum
+          pbPlayDecisionSE
-            numwindow.text = _INTL("x{1}<r>$ {2}", curnumber, (curnumber * itemprice).to_s_formatted)
+          ret = curnumber
-          elsif Input.repeat?(Input::UP)
+          break
-            pbPlayCursorSE
+        elsif Input.trigger?(Input::BACK)
-            curnumber += 1
+          pbPlayCancelSE
-            curnumber = 1 if curnumber > maximum
+          ret = 0
-            numwindow.text = _INTL("x{1}<r>$ {2}", curnumber, (curnumber * itemprice).to_s_formatted)
+          break
-          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)
-          elsif Input.trigger?(Input::USE)
-            pbPlayDecisionSE
-            ret = curnumber
-            break
-          elsif Input.trigger?(Input::BACK)
-            pbPlayCancelSE
-            ret = 0
-            break
-          end
         end
-      }
+      end
-    }
+    end
     helpwindow.visible = false
     return ret
   end