diff --git a/Data/Map005.rxdata b/Data/Map005.rxdata
index 99dcc627b..8acdd18c2 100644
Binary files a/Data/Map005.rxdata and b/Data/Map005.rxdata differ
diff --git a/Data/Map244.rxdata b/Data/Map244.rxdata
index dd191de42..346305e99 100644
Binary files a/Data/Map244.rxdata and b/Data/Map244.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index 9ce9dca20..37ac666b1 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/050_AddOns/MultiSaves.rb b/Data/Scripts/050_AddOns/MultiSaves.rb
index 17293ad15..a96f7c90b 100644
--- a/Data/Scripts/050_AddOns/MultiSaves.rb
+++ b/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
diff --git a/Data/System.rxdata b/Data/System.rxdata
index d5bd5360a..ac24e613c 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ