diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata
index 41edc8e26..7967a5432 100644
Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ
diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata
index 826e1e8a6..8e67182ba 100644
Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ
diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata
index 901f2bb2b..2249bec14 100644
Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ
diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata
index 7bb619832..86c848c5e 100644
Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ
diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata
index be622f513..004ee903d 100644
Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ
diff --git a/Data/Items.rxdata b/Data/Items.rxdata
index fe767fa0b..3e62ba6d2 100644
Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ
diff --git a/Data/Map380.rxdata b/Data/Map380.rxdata
index 75ccf9624..8cd0743ff 100644
Binary files a/Data/Map380.rxdata and b/Data/Map380.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index 83844d866..7ac53fa8f 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/050_AddOns/Autosave.rb b/Data/Scripts/050_AddOns/Autosave.rb
index 7708f5bdb..d74ea88bb 100644
--- a/Data/Scripts/050_AddOns/Autosave.rb
+++ b/Data/Scripts/050_AddOns/Autosave.rb
@@ -29,18 +29,19 @@ def Kernel.tryAutosave()
   Kernel.Autosave if $game_switches[AUTOSAVE_ENABLED_SWITCH]
 end
 
-if AUTOSAVE_STEPS_SWITCH
-  Events.onMapUpdate+=proc {|sender,e|
-    stepsNum = pbGet(AUTOSAVE_STEPS_VAR)
-    if stepsNum > 0 && !$PokemonGlobal.sliding
-      return if $PokemonGlobal.stepcount < 100
-      if $PokemonGlobal.stepcount % stepsNum == 0
-        $PokemonGlobal.stepcount+=1
-        Kernel.tryAutosave()
-      end
+Events.onMapUpdate += proc { |sender, e|
+  next if !$game_switches
+  next if !$game_switches[AUTOSAVE_STEPS_SWITCH]
+  stepsNum = pbGet(AUTOSAVE_STEPS_VAR)
+  if stepsNum > 0 && !$PokemonGlobal.sliding
+    return if $PokemonGlobal.stepcount < 100
+    if $PokemonGlobal.stepcount % stepsNum == 0
+      $PokemonGlobal.stepcount += 1
+      Kernel.tryAutosave()
     end
-  }
-end
+  end
+}
+
 
 
 class AutosaveOptionsScene < PokemonOption_Scene
diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata
index a45219f5e..61cba7ea2 100644
Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ
diff --git a/Data/States.rxdata b/Data/States.rxdata
index 868d49e59..0f9b4ae5d 100644
Binary files a/Data/States.rxdata and b/Data/States.rxdata differ
diff --git a/Data/System.rxdata b/Data/System.rxdata
index 759113e45..85d57afa5 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata
index ba9820343..a005fc327 100644
Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ
diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata
index c7ea19a7a..d9bd35260 100644
Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ