Update 6.8

Data/Scripts/016_UI/005_UI_Party.rb

@@ -141,7 +141,12 @@ class PokemonPartyBlankPanel < SpriteWrapper
     super(viewport)
     self.x = (index % 2) * Graphics.width / 2
     self.y = 16 * (index % 2) + 96 * (index / 2)
-    @panelbgsprite = AnimatedBitmap.new("Graphics/Pictures/Party/panel_blank")
+    if isDarkMode
+      path = "Graphics/Pictures/Party/panel_blank_dark"
+    else
+      path = "Graphics/Pictures/Party/panel_blank"
+    end
+    @panelbgsprite = AnimatedBitmap.new(path)
     self.bitmap = @panelbgsprite.bitmap
     @text = nil
   end
@@ -428,7 +433,7 @@ class PokemonPartyPanel < SpriteWrapper
         # Draw shiny icon
         if @pokemon.shiny?
           imagePos = []
-          addShinyStarsToGraphicsArray(imagePos, 80, 48, @pokemon.bodyShiny?, @pokemon.headShiny?, @pokemon.debugShiny?, 0, 0, 16, 16)
+          addShinyStarsToGraphicsArray(imagePos, 80, 48, @pokemon.bodyShiny?, @pokemon.headShiny?, @pokemon.debugShiny?, @pokemon.radarShiny?, 0, 0, 16, 16)
           pbDrawImagePositions(@overlaysprite.bitmap, imagePos)
         end
       end
@@ -1015,10 +1020,11 @@ class PokemonPartyScreen
     @scene.pbAnnotate(nil)
   end
 
-  def pbPokemonMultipleEntryScreenEx(ruleset,ableProc=nil)
+  #indexesVar: (Optional) saves the selected indexes in a variable
+  def pbPokemonMultipleEntryScreenEx(ruleset,ableProc=nil,indexesVar=nil)
     annot = []
     statuses = []
-    ordinals = [_INTL("INELIGIBLE"), _INTL("NOT ENTERED"), _INTL("BANNED")]
+    ordinals = [_INTL("INELIGIBLE"), _INTL("NOT ENTERED"), _INTL("CANNOT ENTER")]
     positions = [_INTL("FIRST"), _INTL("SECOND"), _INTL("THIRD"), _INTL("FOURTH"),
                  _INTL("FIFTH"), _INTL("SIXTH"), _INTL("SEVENTH"), _INTL("EIGHTH"),
                  _INTL("NINTH"), _INTL("TENTH"), _INTL("ELEVENTH"), _INTL("TWELFTH")]
@@ -1042,6 +1048,7 @@ class PokemonPartyScreen
       annot[i] = ordinals[statuses[i]]
     end
     @scene.pbStartScene(@party, _INTL("Choose Pokémon and confirm."), annot, true)
+    selected_indexes = []
     loop do
       realorder = []
       for i in 0...@party.length
@@ -1070,6 +1077,7 @@ class PokemonPartyScreen
         for i in realorder;
           ret.push(@party[i]);
         end
+        selected_indexes = realorder.dup
         error = []
         break if ruleset.isValid?(ret, error)
         pbDisplay(error[0])
@@ -1107,6 +1115,7 @@ class PokemonPartyScreen
       end
     end
     @scene.pbEndScene
+    pbSet(indexesVar, selected_indexes) if indexesVar && ret
     return ret
   end
 
@@ -1165,6 +1174,21 @@ class PokemonPartyScreen
     return ret
   end
 
+  def evolvePokemon(pokemon)
+    evolution_species = pokemon.check_evolution_on_level_up
+    if evolution_species
+      pbFadeOutInWithMusic {
+        evo = PokemonEvolutionScene.new
+        evo.pbStartScreen(pokemon, evolution_species)
+        evo.pbEvolution
+        evo.pbEndScreen
+        pbRefresh
+      }
+    else
+      pbDisplay(_INTL("{1} Pokémon cannot evolve.",pokemon.name))
+      pokemon.evolve_from_party = false
+    end
+  end
 
   def pbPokemonHat(pokemon)
     cmd = 0
@@ -1227,10 +1251,10 @@ class PokemonPartyScreen
     return retval
   end
 
-  def fuseFromParty(pokemon)
+  def fuseFromParty(pokemon,partyPosition)
     splicerItem = selectSplicer()
     return unless splicerItem
-    if pbDNASplicing(pokemon,@scene,splicerItem)
+    if pbDNASplicing(pokemon,@scene,splicerItem,partyPosition)
       echoln splicerItem
       $PokemonBag.pbDeleteItem(splicerItem, 1) unless splicerItem == :INFINITESPLICERS || splicerItem == :INFINITESPLICERS2
     end
@@ -1240,7 +1264,8 @@ class PokemonPartyScreen
     splicerItem = selectSplicer()
     return unless splicerItem
     isSuperSplicer = [:SUPERSPLICERS,:INFINITESPLICERS2].include?(splicerItem)
-    if pbUnfuse(pokemon,@scene,isSuperSplicer)
+    echoln index
+    if pbUnfuse(pokemon,@scene,index, nil)
       $PokemonBag.pbDeleteItem(splicerItem, 1) unless splicerItem == :INFINITESPLICERS || splicerItem == :INFINITESPLICER2
     end
   end
@@ -1298,9 +1323,10 @@ class PokemonPartyScreen
       cmdLearnMove = -1
       cmdUnfuse = -1
       cmdFuse = -1
-
+      cmdEvolve = -1
 
       # Build the commands
+      commands[cmdEvolve = commands.length] = _INTL("Evolve!") if pkmn.evolve_from_party && pokemonAllowedToEvolve(pkmn)
       commands[cmdSummary = commands.length] = _INTL("Summary")
       commands[cmdDebug = commands.length] = _INTL("Debug") if $DEBUG
       if !pkmn.egg?
@@ -1321,8 +1347,8 @@ class PokemonPartyScreen
           commands[cmdItem = commands.length] = _INTL("Item")
         end
       end
-      commands[cmdNickname = commands.length] = _INTL("Nickname") if !pkmn.egg?
-      commands[cmdLearnMove = commands.length] = _INTL("Remember moves")
+      commands[cmdNickname = commands.length] = _INTL("Nickname") unless pkmn.egg?
+      commands[cmdLearnMove = commands.length] = _INTL("Change moves") unless pkmn.egg?
 
       if playerHasFusionItems
         if pkmn.isFusion?
@@ -1392,6 +1418,8 @@ class PokemonPartyScreen
         @scene.pbSummary(pkmnid) {
           @scene.pbSetHelpText((@party.length > 1) ? _INTL("Choose a Pokémon.") : _INTL("Choose Pokémon or cancel."))
         }
+      elsif cmdEvolve  >= 0 && command == cmdEvolve
+        evolvePokemon(pkmn)
       elsif cmdHat >= 0 && command == cmdHat
         pbPokemonHat(pkmn)
       elsif cmdLearnMove > 0 && command == cmdLearnMove
@@ -1399,7 +1427,7 @@ class PokemonPartyScreen
       elsif cmdNickname >= 0 && command == cmdNickname
         pbPokemonRename(pkmn, pkmnid)
       elsif cmdFuse >= 0 && command == cmdFuse
-        fuseFromParty(pkmn)
+        fuseFromParty(pkmn,pkmnid)
       elsif cmdUnfuse >= 0 && command == cmdUnfuse
         unfuseFromParty(pkmn,pkmnid)
       elsif cmdDebug >= 0 && command == cmdDebug