diff --git a/Data/Scripts/999_Main/999_Main.rb b/Data/Scripts/999_Main/999_Main.rb
index 4020112a8..b574a6217 100644
--- a/Data/Scripts/999_Main/999_Main.rb
+++ b/Data/Scripts/999_Main/999_Main.rb
@@ -75,14 +75,16 @@ def sortCustomBattlers()
     next if !filename.end_with?(".png")
     headNum = filename.split('.')[0]
     oldPath = Settings::CUSTOM_BATTLERS_FOLDER + filename
-    newPath = Settings::CUSTOM_BATTLERS_FOLDER_INDEXED + headNum.to_s + "/" + filename
+    newDir = Settings::CUSTOM_BATTLERS_FOLDER_INDEXED + headNum.to_s
+    newPath = newDir + "/" + filename
     begin
       if File.file?(newPath)
         alreadyExists[oldPath] = newPath
         echo "\nFile " + newPath + " already exists... Skipping."
 
       else
-        File.rename(oldPath, newPath)
+          Dir.mkdir(newDir) if !Dir.exist?(newDir)
+          File.rename(oldPath, newPath)
         $game_temp.nb_imported_sprites+=1
         echo "\nSorted " + filename + " into " + newPath
       end
diff --git a/Data/System.rxdata b/Data/System.rxdata
index 611de1b38..335c0093c 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ