Arreglos en mochila y favs

LA BASE DE SKY/Data/Scripts/048_UI/021_UI_PokeMart.rb

@@ -46,6 +46,26 @@ def getDisplayNamePlural(item)
     return item_name_plural
   end
 
+  def getDisplayNameMachineNumber(item)
+    item_data = GameData::Item.get(item)
+    item_name = item_data.name
+    if item_data.is_machine?
+      machine = item_data.move
+      item_name = _INTL("{1}", item_name)
+    end
+    return item_name
+  end
+
+  def getDisplayNameMachineName(item)
+    item_data = GameData::Item.get(item)
+    item_name = item_data.name
+    if item_data.is_machine?
+      machine = item_data.move
+      item_name = _INTL("{1}", GameData::Move.get(machine).name)
+    end
+    return item_name
+  end
+
   def getDescription(item)
     return GameData::Item.get(item).description
   end

LA BASE DE SKY/Data/Scripts/067_Scripts de la base/004_Bag with interactuable party.rb

@@ -228,10 +228,17 @@ def drawItem(index, _count, rect)
         baseColor   = Color.new(78, 86, 100)
         shadowColor = Color.new(157, 171, 178)
       end
-      textpos.push(
-        [@adapter.getDisplayName(item), rect.x, rect.y + 4, :left, baseColor, shadowColor]
-      )
       item_data = GameData::Item.get(item)
+      if item_data.is_machine?
+        textpos.push(
+          [@adapter.getDisplayNameMachineNumber(item), rect.x, rect.y + 4, :left, baseColor, shadowColor],
+          [@adapter.getDisplayNameMachineName(item), rect.x+70, rect.y + 4, :left, baseColor, shadowColor]
+        )
+      else
+        textpos.push(
+          [@adapter.getDisplayName(item), rect.x, rect.y + 4, :left, baseColor, shadowColor]
+        )
+      end
       showing_register_icon = false
       if item_data.is_important?
         if @bag.registered?(item)
@@ -249,20 +256,20 @@ def drawItem(index, _count, rect)
         end
       end
       if @bag.favourite?(item)
-        if !pbCanRegisterItem?(item) && !item_data.show_quantity?
+        if !pbCanRegisterItem?(item) && !item_data.show_quantity? && !item_data.is_key_item? 
           pbDrawImagePositions(
             self.contents,
             [["Graphics/UI/Bag Screen with Party/favourite", rect.x + rect.width - 30, rect.y + 13, 0, 0, -1, 24]]
           )
-        elsif !pbCanRegisterItem?(item) && item_data.show_quantity?
+        elsif item_data.is_key_item?
           pbDrawImagePositions(
             self.contents,
-            [["Graphics/UI/Bag Screen with Party/favourite", rect.x + rect.width - 75, rect.y + 13, 0, 0, -1, 24]]
+            [["Graphics/UI/Bag Screen with Party/favourite", rect.x + rect.width - 92, rect.y + 13, 0, 0, -1, 24]]
           )
         else
           pbDrawImagePositions(
             self.contents,
-            [["Graphics/UI/Bag Screen with Party/favourite", rect.x + rect.width - 95, rect.y + 13, 0, 0, -1, 24]]
+            [["Graphics/UI/Bag Screen with Party/favourite", rect.x + rect.width - 88, rect.y + 13, 0, 0, -1, 24]]
           )
         end
       end
@@ -730,8 +737,6 @@ def pbStartScene(bag, party = $player.party, choosing = false, filterproc = nil,
     @sprites["msgwindow"].letterbyletter = true
     pbBottomLeftLines(@sprites["msgwindow"], 2)
 
-    pbUpdateAnnotation
-
     ## Dibujar textos de Ordenar y Buscar
     overlay_aux = @sprites["overlay_aux"].bitmap
     pbSetTinyFont(overlay_aux)
@@ -740,14 +745,11 @@ def pbStartScene(bag, party = $player.party, choosing = false, filterproc = nil,
       [[_INTL("Z: Ordenar"), 232, 7, nil, POCKETNAMEBASECOLOR, POCKETNAMEOUTLINECOLOR, :outline, Graphics.width],
        [_INTL("D: Buscar"), 317, 7, nil, POCKETNAMEBASECOLOR, POCKETNAMEOUTLINECOLOR, :outline, Graphics.width]]
     )
-
+    pbUpdateAnnotation
     pbDeactivateWindows(@sprites)
     pbRefresh
     pbFadeInAndShow(@sprites)
     $game_temp.bag_scene = self if $bag.has?(:EGGHATCHER)
-
-
-
   end
 
   def pbPocketColor