diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata
index 7967a5432..41edc8e26 100644
Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ
diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata
index 8e67182ba..826e1e8a6 100644
Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ
diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata
index 2249bec14..901f2bb2b 100644
Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ
diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata
index 69ca397f9..9fb53af5e 100644
Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ
diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata
index 004ee903d..be622f513 100644
Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ
diff --git a/Data/Items.rxdata b/Data/Items.rxdata
index 3e62ba6d2..fe767fa0b 100644
Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ
diff --git a/Data/Map058.rxdata b/Data/Map058.rxdata
index 2b718cadf..33e839970 100644
Binary files a/Data/Map058.rxdata and b/Data/Map058.rxdata differ
diff --git a/Data/Map266.rxdata b/Data/Map266.rxdata
index 6230c2406..9cb8cc847 100644
Binary files a/Data/Map266.rxdata and b/Data/Map266.rxdata differ
diff --git a/Data/Map498.rxdata b/Data/Map498.rxdata
index 394a23db6..73b1f884c 100644
Binary files a/Data/Map498.rxdata and b/Data/Map498.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index c55ce3744..534235899 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 5b420185f..412bdde94 100644
--- a/Data/Scripts/050_AddOns/Autosave.rb
+++ b/Data/Scripts/050_AddOns/Autosave.rb
@@ -18,7 +18,9 @@ def pbSetPokemonCenter
 end
 
 def Kernel.Autosave
+  #showSaveIcon()
   pbSave(false)
+  #hideSaveIcon()
 end
 
 
@@ -32,6 +34,7 @@ if AUTOSAVE_STEPS_SWITCH
     if stepsNum > 0 && !$PokemonGlobal.sliding
       return if $PokemonGlobal.stepcount < 100
       if $PokemonGlobal.stepcount % stepsNum == 0
+        $PokemonGlobal.stepcount+=1
         Kernel.tryAutosave()
       end
     end
diff --git a/Data/Scripts/050_AddOns/New Items effects.rb b/Data/Scripts/050_AddOns/New Items effects.rb
index 0b92c1695..5d9beccec 100644
--- a/Data/Scripts/050_AddOns/New Items effects.rb	
+++ b/Data/Scripts/050_AddOns/New Items effects.rb	
@@ -219,22 +219,6 @@ ItemHandlers::UseFromBag.add(:LANTERN, proc { |item|
   next true
 })
 
-ItemHandlers::UseFromBag.add(:AZUREFLUTE, proc { |item|
-  if Kernel.pbConfirmMessage(_INTL("Play the Azure Flute?"))
-    Kernel.pbMessage(_INTL("You blew into the Azure Flute."))
-    if $game_map.map_id == 694
-      Kernel.pbMessage(_INTL("A strange sound echoed from the sky..."))
-      $game_switches[469] = true
-      next true
-    else
-      Kernel.pbMessage(_INTL("But nothing happened..."))
-      next false
-    end
-    #Kernel.pbMessage(_INTL("{1} was transported somewhere...",$Trainer.name))
-    #Kernel.pbTransfer(376,14,51)
-  end
-  return false
-})
 
 ItemHandlers::UseOnPokemon.add(:TRANSGENDERSTONE, proc { |item, pokemon, scene|
   if pokemon.gender == 0
@@ -1041,22 +1025,7 @@ ItemHandlers::UseOnPokemon.add(:GOLDENBANANA, proc { |item, pokemon, scene|
   next pbHPItem(pokemon, 50, scene)
 })
 
-ItemHandlers::UseFromBag.add(:AZUREFLUTE, proc { |item|
-  if Kernel.pbConfirmMessage(_INTL("Play the Azure Flute?"))
-    Kernel.pbMessage(_INTL("You blew into the Azure Flute."))
-    if pbGet(222) >= 30 #if very good karma
-      Kernel.pbMessage(_INTL("A strange sound echoed from the sky..."))
-      Kernel.pbMessage(_INTL("{1} was transported somewhere...", $Trainer.name))
-      Kernel.pbTransfer(376, 14, 51)
-      next true
-    else
-      Kernel.pbMessage(_INTL("But nothing happened..."))
-      next false
-    end
 
-  end
-  return false
-})
 
 ItemHandlers::UseOnPokemon.add(:TRANSGENDERSTONE, proc { |item, pokemon, scene|
   if pokemon.gender == 0
diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata
index 61cba7ea2..a45219f5e 100644
Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ
diff --git a/Data/States.rxdata b/Data/States.rxdata
index 0f9b4ae5d..868d49e59 100644
Binary files a/Data/States.rxdata and b/Data/States.rxdata differ
diff --git a/Data/System.rxdata b/Data/System.rxdata
index 61184ffab..97a89bac0 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata
index 2c6933d73..8d113cbfb 100644
Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ
diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata
index d9bd35260..c7ea19a7a 100644
Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ