More migration

Data/Scripts/998_InfiniteFusion/QoL/PIF_GameOptions/PIFOptions.rb

@@ -0,0 +1,59 @@
+
+#TODO
+
+# attr_accessor :quicksurf
+# attr_accessor :level_caps
+# attr_accessor :battle_type
+# attr_accessor :download_sprites
+# attr_accessor :speedup
+# attr_accessor :speedup_speed
+# attr_accessor :max_nb_sprites_download
+# attr_accessor :on_mobile
+# attr_accessor :type_icons
+# attr_accessor :use_generated_dex_entries
+# attr_accessor :use_custom_eggs
+#
+#
+#
+# #===============================================================================#
+# # Options menu handlers
+# #===============================================================================#
+# MenuHandlers.add(:options_menu, :only_speedup_battles, {
+#   "name" => _INTL("Speed Up Settings"),
+#   "order" => 25,
+#   "type" => EnumOption,
+#   "parameters" => [_INTL("Always"), _INTL("Only Battles")],
+#   "description" => _INTL("Choose which aspect is sped up."),
+#   "get_proc" => proc { next $PokemonSystem.only_speedup_battles },
+#   "set_proc" => proc { |value, scene|
+#     $GameSpeed = 0 if value != $PokemonSystem.only_speedup_battles
+#     $PokemonSystem.only_speedup_battles = value
+#     $CanToggle = value == 0
+#   }
+# })
+#
+# MenuHandlers.add(:options_menu, :speedup_type, {
+#   "name" => _INTL("Speed-up type"),
+#   "order" => 25,
+#   "type" => EnumOption,
+#   "parameters" => [_INTL("Hold"), _INTL("Toggle")],
+#   "description" => _INTL("Pick how you want speed-up to be enabled."),
+#   "get_proc" => proc { next $PokemonSystem.speedup_type },
+#   "set_proc" => proc { |value, scene|
+#     $PokemonSystem.speedup_type = value
+#   }
+# })
+#
+# MenuHandlers.add(:options_menu, :speedup_speed, {
+#   "name" => _INTL("Speed-up speed"),
+#   "order" => 27,
+#   "type" => SliderOption,
+#   "parameters" => [0, 10, 0.5], # [minimum_value, maximum_value, interval]
+#   "description" => _INTL("Sets by how much to speed up the game."),
+#   "get_proc" => proc { next $PokemonSystem.speedup_speed },
+#   "set_proc" => proc { |value, scene|
+#     next if $PokemonSystem.speedup_speed == value
+#     $PokemonSystem.speedup_speed = value
+#   }
+# })# frozen_string_literal: true
+#

Data/Scripts/998_InfiniteFusion/QoL/PIF_GameOptions/PIF_PokemonSystem.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+class PokemonSystem
+  attr_accessor :quicksurf
+  attr_accessor :level_caps
+  attr_accessor :battle_type
+  attr_accessor :download_sprites
+  attr_accessor :speedup
+  attr_accessor :speedup_speed
+  attr_accessor :max_nb_sprites_download
+  attr_accessor :on_mobile
+  attr_accessor :type_icons
+  attr_accessor :use_generated_dex_entries
+  attr_accessor :use_custom_eggs
+
+  unless method_defined?(:initialize_with_new_options)
+    alias_method :initialize_with_new_options, :initialize
+
+    def initialize
+      initialize_with_new_options
+      @quicksurf = 0
+      @battle_type = 0
+      @download_sprites = 0
+      @max_nb_sprites_download = 5
+      @on_mobile = false
+      @type_icons = true
+      @use_generated_dex_entries = true
+      @use_custom_eggs = true
+    end
+  end
+end

Data/Scripts/998_InfiniteFusion/QoL/SpeedUp.rb

@@ -21,20 +21,6 @@ $GameSpeed = 0
 $CanToggle = true
 $RefreshEventsForTurbo = false
 #===============================================================================#
-# Set $CanToggle depending on the saved setting
-#===============================================================================#
-module Game
-  class << self
-    alias_method :original_load, :load unless method_defined?(:original_load)
-  end
-
-  def self.load(save_data)
-    original_load(save_data)
-    # echoln "UNSCALED #{System.unscaled_uptime} * #{SPEEDUP_STAGES[$GameSpeed]} - #{$GameSpeed}"
-    $CanToggle = true #$PokemonSystem.only_speedup_battles == 0
-  end
-end
-#===============================================================================#
 # Handle incrementing speed stages if $CanToggle allows it
 #===============================================================================#
 module Input
@@ -238,7 +224,6 @@ end
 # PokemonSystem Accessors
 #===============================================================================#
 class PokemonSystem
-  alias_method :original_initialize, :initialize unless method_defined?(:original_initialize)
   attr_accessor :only_speedup_battles
   attr_accessor :battle_speed
 
@@ -246,8 +231,9 @@ class PokemonSystem
   attr_accessor :speedup_speed
   attr_accessor :speedup_enabled
 
+  alias_method :original_initialize_forSpeedup, :initialize unless method_defined?(:original_initialize_forSpeedup)
   def initialize
-    original_initialize
+    original_initialize_forSpeedup
     @only_speedup_battles = 0 # Speed up setting (0=always, 1=battle_only)
     @battle_speed = 0 # Depends on the SPEEDUP_STAGES array size
     @speedup_type = SPEED_UP_TYPE_HOLD