Hats menu navigation improvements

2025-12-06 06:01:46 +00:00 · 2025-03-10 12:59:14 -04:00
parent 3d6e76a41e
commit 36851c7bb7
11 changed files with 432 additions and 18 deletions
--- a/Data/Map036.rxdata
+++ b/Data/Map036.rxdata
--- a/Data/MapInfos.rxdata
+++ b/Data/MapInfos.rxdata
--- a/Data/Scripts/050_Outfits/UI/clothesShop/0_OutfitsMartAdapter.rb
+++ b/Data/Scripts/050_Outfits/UI/clothesShop/0_OutfitsMartAdapter.rb
@@ -25,6 +25,11 @@ class OutfitsMartAdapter < PokemonMartAdapter
    return outfit_id == @worn_clothes
  end

+  def player_changed_clothes?()
+    return false
+    #implement in inheriting classes
+  end
+
  def toggleText()
    return ""
  end
--- a/Data/Scripts/050_Outfits/UI/clothesShop/ClothesMartAdapter.rb
+++ b/Data/Scripts/050_Outfits/UI/clothesShop/ClothesMartAdapter.rb
@@ -77,6 +77,10 @@ class ClothesMartAdapter < OutfitsMartAdapter
    return $Trainer.clothes
  end

+  def player_changed_clothes?()
+    $Trainer.clothes != @worn_clothes
+  end
+
  def putOnOutfit(item)
    putOnClothes(item.id) if item
    @worn_clothes = item.id if item
--- a/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter.rb
+++ b/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter.rb
@@ -68,6 +68,32 @@ class ClothesShopPresenter < PokemonMartScreen
    return true
  end

+  def confirmPutClothes(item)
+    putOnClothes(item)
+  end
+
+  def quitMenuPrompt(item)
+    boolean_changes_detected = @adapter.player_changed_clothes?
+    return true if !boolean_changes_detected
+    pbPlayCancelSE
+    cmd_confirm = "Set outfit"
+    cmd_discard = "Discard changes"
+    cmd_cancel = "Cancel"
+    options = [cmd_confirm,cmd_discard,cmd_cancel]
+    choice = pbMessage("You have unsaved changes!",options,2)
+    case options[choice]
+    when cmd_confirm
+      confirmPutClothes(item)
+      pbPlayDecisionSE
+      return true
+    when cmd_discard
+      pbPlayCloseMenuSE
+      return true
+    else
+      return false
+    end
+  end
+
  def pbBuyScreen
    @scene.pbStartBuyScene(@stock, @adapter)
    @scene.select_specific_item(@adapter.worn_clothes) if !@adapter.isShop?
@@ -77,11 +103,9 @@ class ClothesShopPresenter < PokemonMartScreen
      #break if !item
      if !item
        break if @adapter.isShop?
-        if pbConfirm(_INTL("Discard the changes to your outfit?"))
-          break
-        else
-          item = @scene.pbChooseBuyItem
-        end
+        quit_menu_choice = quitMenuPrompt(item)
+        break if quit_menu_choice
+        item = @scene.pbChooseBuyItem
      end


@@ -96,7 +120,7 @@ class ClothesShopPresenter < PokemonMartScreen
          return
        else
          if pbConfirm(_INTL("Would you like to put on the {1}?", item.name))
-            putOnClothes(item)
+            confirmPutClothes(item)
            return
          end
          next
--- a/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter_HatsMenu.rb
+++ b/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter_HatsMenu.rb
@@ -77,7 +77,6 @@ class ClothesShopPresenter < PokemonMartScreen

    playOutfitChangeAnimation()
    pbMessage(_INTL("You put on the hat(s)!\\wtnp[30]"))
-    @scene.pbEndBuyScene
  end

  def dyeOptions(secondary_hat=false,item)
@@ -115,6 +114,12 @@ class ClothesShopPresenter < PokemonMartScreen
    return ret
  end

+  def confirmPutClothes(item)
+    putOnHats()
+    $Trainer.hat_color = @adapter.get_dye_color($Trainer.hat)
+    $Trainer.hat2_color = @adapter.get_dye_color($Trainer.hat2)
+  end
+
  def playerHatActionsMenu(item)
    cmd_confirm = "Confirm"
    cmd_remove = "Remove hat"
@@ -128,10 +133,8 @@ class ClothesShopPresenter < PokemonMartScreen
      removeHat(item)
      return true
    elsif options[choice] == cmd_confirm
-      putOnHats()
-      $Trainer.hat_color = @adapter.get_dye_color($Trainer.hat)
-      $Trainer.hat2_color = @adapter.get_dye_color($Trainer.hat2)
-
+      confirmPutClothes(nil)
+      @scene.pbEndBuyScene
      return false
    elsif options[choice] == cmd_dye
      #removeDye(item)  selectHatColor
--- a/Data/Scripts/050_Outfits/UI/clothesShop/HairMartAdapter.rb
+++ b/Data/Scripts/050_Outfits/UI/clothesShop/HairMartAdapter.rb
@@ -31,6 +31,10 @@ class HairMartAdapter < OutfitsMartAdapter
    @version = newVersion
  end

+  def player_changed_clothes?()
+    $Trainer.hairstyle != @worn_hair
+  end
+
  #player can't "own" hairstyles
  # if you want to go back one you had before, you have to pay again
  def itemOwned(item)
--- a/Data/Scripts/050_Outfits/UI/clothesShop/HatsMartAdapter.rb
+++ b/Data/Scripts/050_Outfits/UI/clothesShop/HatsMartAdapter.rb
@@ -9,12 +9,22 @@ class HatsMartAdapter < OutfitsMartAdapter
    super(stock,isShop,isSecondaryHat)
    @worn_clothes =  $Trainer.hat
    @worn_clothes2 =  $Trainer.hat2
+    @second_hat_visible = true
+  end
+
+  #Used in shops only
+  def toggleSecondHat()
+    @second_hat_visible = !@second_hat_visible
+    $Trainer.hat2 = @second_hat_visible ? @worn_clothes2 : nil
  end

  def toggleEvent(item)
-    return if isShop?
-    $Trainer.set_hat(nil,@is_secondary_hat)
-    @worn_clothes = nil
+    if isShop?
+      toggleSecondHat
+    else
+      $Trainer.set_hat(nil,@is_secondary_hat)
+      @worn_clothes = nil
+    end
  end

  def set_secondary_hat(value)
@@ -33,7 +43,8 @@ class HatsMartAdapter < OutfitsMartAdapter
  end

  def switchVersion(item,delta=1)
-    return if isShop?
+    pbSEPlay("GUI storage put down", 80, 100)
+    return toggleSecondHat if isShop?
    @is_secondary_hat = !@is_secondary_hat
  end

@@ -58,6 +69,7 @@ class HatsMartAdapter < OutfitsMartAdapter

      previewWindow.set_hat(hat1.id,false) if hat1
      previewWindow.set_hat(hat2.id,true) if hat2
+      previewWindow.set_hat(nil,true) if !@second_hat_visible #for toggling in shops

      hat1_color=0
      hat2_color=0
@@ -139,6 +151,12 @@ class HatsMartAdapter < OutfitsMartAdapter
    return $Trainer.hat(@is_secondary_hat)
  end

+  def player_changed_clothes?()
+    echoln("Trainer hat: #{$Trainer.hat}, Worn hat: #{@worn_clothes}")
+    echoln("Trainer hat2: #{$Trainer.hat2}, Worn hat2: #{@worn_clothes2}")
+    $Trainer.hat != @worn_clothes || $Trainer.hat2 != @worn_clothes2
+  end
+
  def putOnOutfit(item)
    return unless item.is_a?(Outfit)
    putOnHat(item.id,false,@is_secondary_hat)
--- a/Data/System.rxdata
+++ b/Data/System.rxdata
--- a/Data/sprites/sprites_rate_limit.log
+++ b/Data/sprites/sprites_rate_limit.log
@@ -1,3 +1,2 @@
-1741573772
-1741573773
-1741573773
+1741625839
+1741625839
--- a/Data/sprites/updated_spritesheets_cache
+++ b/Data/sprites/updated_spritesheets_cache
@@ -5,3 +5,360 @@ Graphics/CustomBattlers/spritesheets/spritesheets_custom/192/192.png
 Graphics/CustomBattlers/spritesheets/spritesheets_base/157.png
 Graphics/CustomBattlers/spritesheets/spritesheets_base/170.png
 Graphics/CustomBattlers/spritesheets/spritesheets_custom/170/170.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/173.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/188.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/188/188.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/71.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/453.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/453/453.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/307.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/148.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/148/148.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/106.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/61.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/61/61.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/132.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/72/72.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/107.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/62.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/62/62.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/215.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/71/71.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/68.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/249.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/249/249.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/15.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/104.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/131/131.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/36.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/206.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/206/206.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/50.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/295/295.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/389.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/366.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/366/366.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/462.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/462/462.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/498.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/452/452.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/300.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/468.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/1/1a.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/235.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/211.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/211/211.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/81.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/215/215.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/3.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/352.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/352/352.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/374.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/256.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/256/256.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/16.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/144.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/144/144.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/228.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/357.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/357/357.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/427.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/339.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/339/339.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/337.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/181.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/181/181.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/296/296.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/105.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/275.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/85.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/59.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/59/59.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/162.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/379.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/379/379.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/356.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/196.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/196/196.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/492.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/398.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/398/398.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/285.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/362.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/362/362.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/219.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/424.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/424/424.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/194.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/169.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/169/169.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/335.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/248.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/248/248.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/141.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/445.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/445/445.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/138.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/140.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/140/140.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/25.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/25/25.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/368.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/241.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/241/241.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/73.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/274.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/274/274.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/75.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/75/75.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/137.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/9.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/9/9.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/62/62a.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/449.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/89/89.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/172.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/263.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/326.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/326/326.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/120.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/7.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/7/7.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/101.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/38.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/363.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/363/363.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/143.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/260/260.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/97.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/367/367.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/171.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/452.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/110.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/374/374.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/403.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/259.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/259/259a.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/172/172.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/37.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/451.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/451/451.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/77.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/129.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/129/129.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/412/412.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/390.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/113.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/439.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/327/327.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/70.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/65.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/65/65.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/201/201.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/187.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/412.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/375.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/162/162.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/95.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/161.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/161/161.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/500.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/195.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/195/195.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/96.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/329.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/245.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/337/337.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/230.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/230/230.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/147.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/193.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/193/193.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/18.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/335/335.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/450.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/439/439.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/418.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/5.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/5/5.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/57.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/57/57.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/411.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/288.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/288/288.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/82.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/53.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/53/53.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/102.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/102/102.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/21.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/21/21.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/238.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/238/238.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/155.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/429.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/429/429a.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/305.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/175.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/175/175.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/205.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/70/70.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/227.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/426.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/482.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/482/482.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/30.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/491.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/491/491.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/201.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/117.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/117/117.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/209.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/263/263.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/203.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/133.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/166/166a.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/1.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/130.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/130/130.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/444.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/444/444.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/354.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/454.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/454/454a.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/267.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/267/267.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/179.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/100.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/100/100.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/189.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/287/287.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/79.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/414.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/414/414.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/115.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/45/45.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/257.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/367.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/19.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/461.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/461/461b.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/69.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/139.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/139/139.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/93.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/213/213.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/112.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/112/112.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/58.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/80.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/80/80.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/442.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/237.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/237/237.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/232.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/235/235a.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/226.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/469.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/469/469.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/492/492.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/118.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/29.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/29/29a.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/446.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/28.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/28/28.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/265.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/355.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/279.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/279/279.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/275/275.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/26.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/322.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/322/322.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/68/68.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/131.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/437.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/437/437.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/277.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/332.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/332/332.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/314.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/420.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/420/420.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/67.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/295.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/134.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/334.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/396.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/213.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/383.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/383/383.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/244.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/8.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/126.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/126/126.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/132/132.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/17.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/43.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/358.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/358/358.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/111.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/111/111.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/361.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/361/361.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/84.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/84/84.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/339/339a.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/17/17a.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/419.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/419/419.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/146.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/262.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/262/262a.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/142.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/233.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/233/233.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/405.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/27.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/109.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/109/109.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/98.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/369.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/189/189.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/216.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/216/216.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/143/143.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/49.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/154.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/154/154.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/190.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/6.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/6/6.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/222.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/222/222.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/105/105.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/457.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/457/457.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/125.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/323.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/323/323.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/272/272.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/370.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/421.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/421/421a.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/312.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/197.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/197/197.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/463.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/463/463.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/94/94.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/231.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/133/133b.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/183.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/236.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/236/236.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/496/496.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/166.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/31.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/179/179.png