Merge branch 'e19-release-beta1-storyRevamp' into e19-release-beta1

# Conflicts:
#	Data/CommonEvents.rxdata
#	Data/Map019.rxdata
#	Data/Map058.rxdata
#	Data/Map154.rxdata
#	Data/Map208.rxdata
#	Data/Map561.rxdata
#	Data/Map721.rxdata
#	Data/MapInfos.rxdata
#	Data/Scripts/025-Randomizer/RandomizerUtils.rb
#	Data/System.rxdata

Data/Scripts/001_Technical/001_Debugging/003_Errors.rb

@@ -26,8 +26,16 @@ def pbPrintException(e)
     emessage = pbGetExceptionMessage(e)
   end
   # begin message formatting
-  message = "[Pokémon Essentials version #{Essentials::VERSION}]\r\n"
-  message += "#{Essentials::ERROR_TEXT}\r\n"   # For third party scripts to add to
+  message = "[Infinite Fusion version #{Settings::GAME_VERSION_NUMBER}]\r\n"
+  if $game_switches
+    message += "Randomized trainers, " if $game_switches[SWITCH_RANDOM_TRAINERS]
+    message += "Randomized gym trainers, " if $game_switches[SWITCH_RANDOMIZE_GYMS_SEPARATELY]
+    message += "Randomized wild Pokemon (global), " if $game_switches[SWITCH_WILD_RANDOM_GLOBAL]
+    message += "Randomized wild Pokemon (area), " if $game_switches[RandomizerWildPokemonOptionsScene::RANDOM_WILD_AREA]
+    message += "All fused, " if $game_switches[SWITCH_RANDOM_TRAINERS]
+    message += "Randomized trainers, " if $game_switches[RandomizerWildPokemonOptionsScene::REGULAR_TO_FUSIONS]
+  end
+    message += "#{Essentials::ERROR_TEXT}\r\n"   # For third party scripts to add to
   message += "Exception: #{e.class}\r\n"
   message += "Message: #{emessage}\r\n"
   # show last 10/25 lines of backtrace

Data/Scripts/025-Randomizer/RandomizerUtils.rb

@@ -20,7 +20,7 @@ HELD_ITEMS = [:AIRBALLOON, :BRIGHTPOWDER, :EVIOLITE, :FLOATSTONE, :DESTINYKNOT,
               :PETAYABERRY, :APICOTBERRY, :LANSATBERRY, :STARFBERRY, :ENIGMABERRY, :MICLEBERRY, :CUSTAPBERRY,
               :JABOCABERRY, :ROWAPBERRY, :FAIRYGEM]
 
-REMOVED_ITEMS=[:COVERFOSSIL,:PLUMEFOSSIL,:DAMAGEUP,:ACCURACYUP,:ANCIENTSTONE,:ODDKEYSTONE_FULL]
+ITEM_EXCEPTIONS= [:COVERFOSSIL, :PLUMEFOSSIL, :ACCURACYUP,:DAMAGEUP,:ANCIENTSTONE,:ODDKEYSTONE_FULL,:TM00 ]
 
 def pbGetRandomItem(item_id)
   return nil if item_id == nil
@@ -43,7 +43,7 @@ def pbGetRandomItem(item_id)
   items_list = GameData::Item.list_all
   newItem_id = items_list.keys.sample
   newItem = GameData::Item.get(newItem_id)
-  while (newItem.is_machine? || newItem.is_key_item? || REMOVED_ITEMS.include?(item))
+  while (newItem.is_machine? || newItem.is_key_item? || ITEM_EXCEPTIONS.include?(newItem))
     newItem_id = items_list.keys.sample
     newItem = GameData::Item.get(newItem_id)
   end

Data/Scripts/049_Compatibility/MarinUtilities.rb

@@ -1251,17 +1251,8 @@ end
 #     p_msg(msg, title, :question)
 #   end
 #
-#   trace_var(:$scene, proc do |object|
-#     break unless object
-#     unless object.instance_variable_get(:@__old_main)
-#       object.instance_variable_set(:@__old_main, object.method(:main))
-#       def object.main
-#         self.instance_variable_get(:@__old_main).call
-#       rescue
-#         p_err
-#       end
-#     end
-#   end)
+
+
 #
 # else
 #

Data/Scripts/050_AddOns/Autosave.rb

@@ -18,7 +18,9 @@ def pbSetPokemonCenter
 end
 
 def Kernel.Autosave
+  #showSaveIcon()
   pbSave(false)
+  #hideSaveIcon()
 end
 
 

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
@@ -994,22 +978,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