indexed custom battlers

Data/Scripts/050_AddOns/FusionSprites.rb

@@ -163,10 +163,12 @@ module GameData
       if dex_number <= Settings::NB_POKEMON
         folder = dex_number.to_s
         filename = sprintf("%s.png", dex_number)
+        head_id=nil
       else
         if dex_number >= Settings::ZAPMOLCUNO_NB
           specialPath = getSpecialSpriteName(dex_number)
           return pbResolveBitmap(specialPath)
+          head_id=nil
         else
           body_id = getBodyID(dex_number)
           head_id = getHeadID(dex_number, body_id)
@@ -174,7 +176,7 @@ module GameData
           filename = sprintf("%s.%s.png", head_id, body_id)
         end
       end
-      customPath = pbResolveBitmap(Settings::CUSTOM_BATTLERS_FOLDER + filename)
+      customPath = pbResolveBitmap(Settings::CUSTOM_BATTLERS_FOLDER + "/" + head_id.to_s + "/" +filename)
       species = getSpecies(dex_number)
       use_custom = customPath && !species.always_use_generated
       if use_custom

Data/Scripts/050_AddOns/Gen 2.rb

@@ -106,7 +106,7 @@ BATTLERSPATH = "Battlers"
 def GetSpritePath(poke1, poke2, isFused)
   #Check if custom exists
   spritename = GetSpriteName(poke1, poke2, isFused)
-  pathCustom = sprintf("Graphics/%s/%s.png", DOSSIERCUSTOMSPRITES, spritename)
+  pathCustom = sprintf("Graphics/%s/%s/%s.png", DOSSIERCUSTOMSPRITES,poke2, spritename)
   pathReg = sprintf("Graphics/%s/%s/%s.png", BATTLERSPATH, poke2, spritename)
   path = pbResolveBitmap(pathCustom) && $game_variables[196] == 0 ? pathCustom : pathReg
   return path

Data/Scripts/050_AddOns/IntroScreen.rb

@@ -20,11 +20,6 @@ class Scene_Intro
     intro_bgm = "INTRO_music_cries"
     intro_movie = Movie.new(intro_frames_path,intro_bgm,230,true)
     intro_movie.playInViewPort(@viewport)
-    while(!intro_movie.finished)
-      echo intro_movie.finished
-      echo "\n"
-      wait(8)
-    end
   end
 
   def main

Data/Scripts/050_AddOns/Movie.rb

@@ -42,13 +42,7 @@ class Movie
 
     pbBGMPlay(@bgm)
     while (@currentFrame <= @maxFrame)# && !(@canStopEarly && Input::ACTION))
-      Input.update
-      if Input.trigger?(Input::C)
-        echo "bruh"
-        echo "\n"
-
-      end
-      break if Input.trigger?(Input::ACTION) && @canStopEarly
+      break if Input.trigger?(Input::C) && @canStopEarly
       frame = sprintf(@framesPath, @currentFrame)
       picture = Sprite.new(viewport)
       picture.bitmap = pbBitmap(frame)

Data/Scripts/050_AddOns/MultiSaves.rb

@@ -356,6 +356,7 @@ class PokemonLoadScreen
     when cmd_continue
       @scene.pbEndScene
       Game.load(@save_data)
+      $game_switches[SWITCH_V5_1]=true
       return
     when cmd_new_game
       @scene.pbEndScene

Data/Scripts/050_AddOns/UI_Pokedex_SpritesPage.rb

@@ -147,12 +147,12 @@ class PokemonPokedexInfo_Scene
     head_id = getHeadID(@species, body_id)
 
     baseFilename = head_id.to_s + "." + body_id.to_s
-    baseFilePath = Settings::CUSTOM_BATTLERS_FOLDER + baseFilename + ".png"
+    baseFilePath = Settings::CUSTOM_BATTLERS_FOLDER + "/" + head_id.to_s + "/" + baseFilename + ".png"
     if pbResolveBitmap(baseFilePath)
       ret << baseFilePath
     end
     POSSIBLE_ALTS.each { |alt_letter|
-      altFilePath = Settings::CUSTOM_BATTLERS_FOLDER + baseFilename + alt_letter + ".png"
+      altFilePath = Settings::CUSTOM_BATTLERS_FOLDER  + "/" + head_id.to_s + "/" + baseFilename + alt_letter + ".png"
       if pbResolveBitmap(altFilePath)
         ret << altFilePath
       end

Data/Scripts/050_AddOns/mapExporter2.rb

@@ -1,8 +1,10 @@
 
+EXPORT_EXCEPT_MAP_IDS= [768,722,723,724,720]
+
 def exportAllMaps
-  for id in 725..768
+  for id in 768..784
     begin
-      MapExporter.export(id, [:Events])
+      MapExporter.export(id, [:Events]) if !EXPORT_EXCEPT_MAP_IDS.include?(id)
     rescue
       echo "error in " +(id.to_s) +"\n"
     end