Rewrote Pokémon storage screen code

Data/Scripts/016b_UI redesign/000_UI_base.rb

@@ -340,6 +340,7 @@ module UI
     end
 
     def initialize_message_box
+      # TODO: It looks like :message_box isn't used anywhere.
       @sprites[:message_box] = Window_AdvancedTextPokemon.new("")
       @sprites[:message_box].viewport       = @viewport
       @sprites[:message_box].z              = 2000
@@ -385,10 +386,14 @@ module UI
 
     #---------------------------------------------------------------------------
 
+    def position_speech_box(text = "")
+      pbBottomLeftLines(@sprites[:speech_box], 2)
+    end
+
     def show_message(text)
       @sprites[:speech_box].visible = true
       @sprites[:speech_box].text = text
-      pbBottomLeftLines(@sprites[:speech_box], 2)
+      position_speech_box(text)
       yielded = false
       loop do
         Graphics.update
@@ -414,7 +419,7 @@ module UI
       ret = false
       @sprites[:speech_box].visible = true
       @sprites[:speech_box].text    = text
-      pbBottomLeftLines(@sprites[:speech_box], 2)
+      position_speech_box(text)
       using(cmd_window = Window_CommandPokemon.new([_INTL("Yes"), _INTL("No")])) do
         cmd_window.z       = @viewport.z + 1
         cmd_window.visible = false
@@ -444,6 +449,40 @@ module UI
       return ret
     end
 
+    def show_confirm_serious_message(text)
+      ret = false
+      @sprites[:speech_box].visible = true
+      @sprites[:speech_box].text    = text
+      position_speech_box(text)
+      using(cmd_window = Window_CommandPokemon.new([_INTL("No"), _INTL("Yes")])) do
+        cmd_window.z       = @viewport.z + 1
+        cmd_window.visible = false
+        pbBottomRight(cmd_window)
+        cmd_window.y -= @sprites[:speech_box].height
+        cmd_window.visible = true if !@sprites[:speech_box].busy?
+        loop do
+          Graphics.update
+          Input.update
+          update_visuals
+          cmd_window.visible = true if !@sprites[:speech_box].busy?
+          cmd_window.update
+          if !@sprites[:speech_box].busy?
+            if Input.trigger?(Input::BACK)
+              pbPlayCancelSE
+              ret = false
+              break
+            elsif Input.trigger?(Input::USE) && @sprites[:speech_box].resume
+              pbPlayDecisionSE
+              ret = (cmd_window.index == 1)
+              break
+            end
+          end
+        end
+      end
+      @sprites[:speech_box].visible = false
+      return ret
+    end
+
     # Used for dialogue.
     # align: Where the command window is in relation to the message window.
     #        :horizontal is side by side, :vertical is command window above.
@@ -547,7 +586,7 @@ module UI
     def choose_number_as_money_multiplier(help_text, money_per_unit, maximum, init_value = 1)
       @sprites[:speech_box].visible = true
       @sprites[:speech_box].text = help_text
-      pbBottomLeftLines(@sprites[:speech_box], 2)
+      position_speech_box(text)
       # Show the help text
       loop do
         Graphics.update
@@ -701,6 +740,10 @@ module UI
 
     alias pbConfirm show_confirm_message
 
+    def show_confirm_serious_message(text)
+      return @visuals.show_confirm_serious_message(text)
+    end
+
     def show_choice_message(text, options, initial_index = 0)
       return @visuals.show_choice_message(text, options, initial_index)
     end

Data/Scripts/016b_UI redesign/005_UI_Party.rb

@@ -766,10 +766,6 @@ class UI::Party < UI::BaseScreen
 
   #-----------------------------------------------------------------------------
 
-  def set_index(new_index)
-    @visuals.set_index(new_index)
-  end
-
   def pokemon
     return (index < @party.length) ? @party[index] : nil
   end
@@ -778,6 +774,10 @@ class UI::Party < UI::BaseScreen
     return @visuals.can_access_storage?
   end
 
+  def set_index(new_index)
+    @visuals.set_index(new_index)
+  end
+
   def set_help_text(text)
     @visuals.set_help_text(text)
   end
@@ -1306,9 +1306,7 @@ UIActionHandlers.add(UI::Party::SCREEN_ID, :clear_sub_mode, {
 UIActionHandlers.add(UI::Party::SCREEN_ID, :open_storage, {
   :effect => proc { |screen|
     pbFadeOutInWithUpdate(screen.sprites) do
-      storage_scene = PokemonStorageScene.new
-      storage_screen = PokemonStorageScreen.new(storage_scene, $PokemonStorage)
-      storage_screen.pbStartScreen(0)
+      UI::PokemonStorage.new($PokemonStorage, mode: :organize).main
       screen.refresh_party
       screen.refresh
     end

Data/Scripts/016b_UI redesign/006_UI_Summary.rb

@@ -181,6 +181,7 @@ class UI::PokemonSummaryVisuals < UI::BaseVisuals
       :draw_page_icons,
       :draw_poke_ball,
       :draw_pokemon_name,
+      :draw_party_icons,
       :draw_markings,
       :draw_egg_memo
     ]

Data/Scripts/016b_UI redesign/019_UI_PC.rb

@@ -24,10 +24,7 @@ module UI::PC
     command = 0
     loop do
       choice = pbMessage(_INTL("Which PC should be accessed?"), command_list, -1, nil, command)
-      if choice < 0
-        pbPlayCloseMenuSE
-        break
-      end
+      break if choice < 0
       break if commands[choice]["effect"].call
     end
     pbSEPlay("PC close")
@@ -220,9 +217,7 @@ MenuHandlers.add(:pc_menu, :pokemon_storage, {
       when :organize
         pbPlayDecisionSE
         pbFadeOutIn do
-          scene = PokemonStorageScene.new
-          screen = PokemonStorageScreen.new(scene, $PokemonStorage)
-          screen.pbStartScreen(0)
+          UI::PokemonStorage.new($PokemonStorage, mode: :organize).main
         end
       when :withdraw
         if $PokemonStorage.party_full?
@@ -231,9 +226,7 @@ MenuHandlers.add(:pc_menu, :pokemon_storage, {
         end
         pbPlayDecisionSE
         pbFadeOutIn do
-          scene = PokemonStorageScene.new
-          screen = PokemonStorageScreen.new(scene, $PokemonStorage)
-          screen.pbStartScreen(1)
+          UI::PokemonStorage.new($PokemonStorage, mode: :withdraw).main
         end
       when :deposit
         if $player.able_pokemon_count <= 1
@@ -242,9 +235,7 @@ MenuHandlers.add(:pc_menu, :pokemon_storage, {
         end
         pbPlayDecisionSE
         pbFadeOutIn do
-          scene = PokemonStorageScene.new
-          screen = PokemonStorageScreen.new(scene, $PokemonStorage)
-          screen.pbStartScreen(2)
+          UI::PokemonStorage.new($PokemonStorage, mode: :deposit).main
         end
       else
         break