Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases

Data/Scripts/001_Settings.rb

@@ -6,7 +6,7 @@
 module Settings
   # The version of your game. It has to adhere to the MAJOR.MINOR.PATCH format.
   GAME_VERSION = '5.0.0'
-  GAME_VERSION_NUMBER = "5.3.1.2"
+  GAME_VERSION_NUMBER = "5.3.1.3"
 
   POKERADAR_LIGHT_ANIMATION_RED_ID = 17
   POKERADAR_LIGHT_ANIMATION_GREEN_ID = 18

Data/Scripts/016_UI/001_Non-interactive UI/007_UI_Credits.rb

@@ -82,11 +82,13 @@ Kiwi
 
 Sprite Managers
 avianAnnihilator<s>Blaquaza
-BéBoutton<s>Howls
-Ignus<s>Kiwi
-Maelmc<s>Milchik the Miltank
-rezza<s>Skel'n
-Thorns<s>TM
+BéBoutton<s>CaBiNE
+CoramSun<s>hero.drawing
+Howls<s>Ignus
+Kiwi<s>Maelmc
+Milchik the Miltank<s>Payapon
+Pix<s>Rosemagwin
+Thorns
 
 
 All of the custom fused Pokémon sprites 

Data/Scripts/050_AddOns/MultiSaves.rb

@@ -285,7 +285,9 @@ class PokemonLoadScreen
   def try_load_backup(file_path)
     if File.file?(file_path + ".bak")
       pbMessage(_INTL("The save file is corrupt. A backup will be loaded."))
-      save_data = load_save_file(file_path + ".bak")
+      file_copy(file_path, SaveData.get_backup_file_path)
+      File.rename(file_path + '.bak', file_path)
+      save_data = load_save_file(file_path)
     else
       self.prompt_save_deletion(file_path)
       return {}
@@ -694,6 +696,9 @@ module Game
     $Trainer.save_slot = slot unless auto
     $Trainer.last_time_saved = Time.now
     begin
+      if File.exists?(file_path)
+        file_copy(file_path, file_path + '.bak')
+      end
       SaveData.save_to_file(file_path)
       Graphics.frame_reset
     rescue IOError, SystemCallError

Data/Scripts/050_AddOns/New Items effects.rb

@@ -1569,6 +1569,8 @@ def pbUnfuse(pokemon, scene, supersplicers, pcPosition = nil)
       #On ajoute l'autre dans le pokedex aussi
       $Trainer.pokedex.set_seen(poke1.species)
       $Trainer.pokedex.set_owned(poke1.species)
+      $Trainer.pokedex.set_seen(poke2.species)
+      $Trainer.pokedex.set_owned(poke2.species)
 
       pokemon.species = poke1.species
       pokemon.level = poke1.level