improved map loading time. might cause memory issues

Data/Scripts/003_Game processing/002_Scene_Map.rb

@@ -62,6 +62,11 @@ class Scene_Map
     Graphics.frame_reset
   end
 
+  #todo
+  def cacheNeedsClearing
+    return false
+  end
+
   def transfer_player(cancelVehicles=true)
     $game_temp.player_transferring = false
     pbCancelVehicles($game_temp.player_new_map_id) if cancelVehicles
@@ -78,10 +83,13 @@ class Scene_Map
     when 6 then $game_player.turn_right
     when 8 then $game_player.turn_up
     end
+
     $game_player.straighten
     $game_map.update
     disposeSpritesets
-    RPG::Cache.clear
+    if cacheNeedsClearing()
+      RPG::Cache.clear
+    end
     createSpritesets
     if $game_temp.transition_processing
       $game_temp.transition_processing = false

Data/Scripts/050_AddOns/New Items effects.rb

@@ -744,93 +744,93 @@ ItemHandlers::UseOnPokemon.add(:DAMAGEUP, proc { |item, pokemon, scene|
 })
 
 ##New "stones"
-ItemHandlers::UseOnPokemon.add(:UPGRADE, proc { |item, pokemon, scene|
-  if (pokemon.isShadow? rescue false)
-    scene.pbDisplay(_INTL("It won't have any effect."))
-    next false
-  end
-  newspecies = pbCheckEvolution(pokemon, item)
-  if newspecies <= 0
-    scene.pbDisplay(_INTL("It won't have any effect."))
-    next false
-  else
-    pbFadeOutInWithMusic(99999) {
-      evo = PokemonEvolutionScene.new
-      evo.pbStartScreen(pokemon, newspecies)
-      evo.pbEvolution(false)
-      evo.pbEndScreen
-      scene.pbRefreshAnnotations(proc { |p| pbCheckEvolution(p, item) > 0 })
-      scene.pbRefresh
-    }
-    next true
-  end
-})
-
-ItemHandlers::UseOnPokemon.add(:DUBIOUSDISC, proc { |item, pokemon, scene|
-  if (pokemon.isShadow? rescue false)
-    scene.pbDisplay(_INTL("It won't have any effect."))
-    next false
-  end
-  newspecies = pbCheckEvolution(pokemon, item)
-  if newspecies <= 0
-    scene.pbDisplay(_INTL("It won't have any effect."))
-    next false
-  else
-    pbFadeOutInWithMusic(99999) {
-      evo = PokemonEvolutionScene.new
-      evo.pbStartScreen(pokemon, newspecies)
-      evo.pbEvolution(false)
-      evo.pbEndScreen
-      scene.pbRefreshAnnotations(proc { |p| pbCheckEvolution(p, item) > 0 })
-      scene.pbRefresh
-    }
-    next true
-  end
-})
-
-ItemHandlers::UseOnPokemon.add(:ICESTONE, proc { |item, pokemon, scene|
-  if (pokemon.isShadow? rescue false)
-    scene.pbDisplay(_INTL("It won't have any effect."))
-    next false
-  end
-  newspecies = pbCheckEvolution(pokemon, item)
-  if newspecies <= 0
-    scene.pbDisplay(_INTL("It won't have any effect."))
-    next false
-  else
-    pbFadeOutInWithMusic(99999) {
-      evo = PokemonEvolutionScene.new
-      evo.pbStartScreen(pokemon, newspecies)
-      evo.pbEvolution(false)
-      evo.pbEndScreen
-      scene.pbRefreshAnnotations(proc { |p| pbCheckEvolution(p, item) > 0 })
-      scene.pbRefresh
-    }
-    next true
-  end
-})
-
-ItemHandlers::UseOnPokemon.add(:MAGNETSTONE, proc { |item, pokemon, scene|
-  if (pokemon.isShadow? rescue false)
-    scene.pbDisplay(_INTL("It won't have any effect."))
-    next false
-  end
-  newspecies = pbCheckEvolution(pokemon, item)
-  if newspecies <= 0
-    scene.pbDisplay(_INTL("It won't have any effect."))
-    next false
-  else
-    pbFadeOutInWithMusic(99999) {
-      evo = PokemonEvolutionScene.new
-      evo.pbStartScreen(pokemon, newspecies)
-      evo.pbEvolution(false)
-      evo.pbEndScreen
-      scene.pbRefreshAnnotations(proc { |p| pbCheckEvolution(p, item) > 0 })
-      scene.pbRefresh
-    }
-    next true
-  end
-})
+# ItemHandlers::UseOnPokemon.add(:UPGRADE, proc { |item, pokemon, scene|
+#   if (pokemon.isShadow? rescue false)
+#     scene.pbDisplay(_INTL("It won't have any effect."))
+#     next false
+#   end
+#   newspecies = pbCheckEvolution(pokemon, item)
+#   if newspecies <= 0
+#     scene.pbDisplay(_INTL("It won't have any effect."))
+#     next false
+#   else
+#     pbFadeOutInWithMusic(99999) {
+#       evo = PokemonEvolutionScene.new
+#       evo.pbStartScreen(pokemon, newspecies)
+#       evo.pbEvolution(false)
+#       evo.pbEndScreen
+#       scene.pbRefreshAnnotations(proc { |p| pbCheckEvolution(p, item) > 0 })
+#       scene.pbRefresh
+#     }
+#     next true
+#   end
+# })
+#
+# ItemHandlers::UseOnPokemon.add(:DUBIOUSDISC, proc { |item, pokemon, scene|
+#   if (pokemon.isShadow? rescue false)
+#     scene.pbDisplay(_INTL("It won't have any effect."))
+#     next false
+#   end
+#   newspecies = pbCheckEvolution(pokemon, item)
+#   if newspecies <= 0
+#     scene.pbDisplay(_INTL("It won't have any effect."))
+#     next false
+#   else
+#     pbFadeOutInWithMusic(99999) {
+#       evo = PokemonEvolutionScene.new
+#       evo.pbStartScreen(pokemon, newspecies)
+#       evo.pbEvolution(false)
+#       evo.pbEndScreen
+#       scene.pbRefreshAnnotations(proc { |p| pbCheckEvolution(p, item) > 0 })
+#       scene.pbRefresh
+#     }
+#     next true
+#   end
+# })
+#
+# ItemHandlers::UseOnPokemon.add(:ICESTONE, proc { |item, pokemon, scene|
+#   if (pokemon.isShadow? rescue false)
+#     scene.pbDisplay(_INTL("It won't have any effect."))
+#     next false
+#   end
+#   newspecies = pbCheckEvolution(pokemon, item)
+#   if newspecies <= 0
+#     scene.pbDisplay(_INTL("It won't have any effect."))
+#     next false
+#   else
+#     pbFadeOutInWithMusic(99999) {
+#       evo = PokemonEvolutionScene.new
+#       evo.pbStartScreen(pokemon, newspecies)
+#       evo.pbEvolution(false)
+#       evo.pbEndScreen
+#       scene.pbRefreshAnnotations(proc { |p| pbCheckEvolution(p, item) > 0 })
+#       scene.pbRefresh
+#     }
+#     next true
+#   end
+# })
+# #
+# ItemHandlers::UseOnPokemon.add(:MAGNETSTONE, proc { |item, pokemon, scene|
+#   if (pokemon.isShadow? rescue false)
+#     scene.pbDisplay(_INTL("It won't have any effect."))
+#     next false
+#   end
+#   newspecies = pbCheckEvolution(pokemon, item)
+#   if newspecies <= 0
+#     scene.pbDisplay(_INTL("It won't have any effect."))
+#     next false
+#   else
+#     pbFadeOutInWithMusic(99999) {
+#       evo = PokemonEvolutionScene.new
+#       evo.pbStartScreen(pokemon, newspecies)
+#       evo.pbEvolution(false)
+#       evo.pbEndScreen
+#       scene.pbRefreshAnnotations(proc { |p| pbCheckEvolution(p, item) > 0 })
+#       scene.pbRefresh
+#     }
+#     next true
+#   end
+# })
 
 #easter egg for evolving shellder into slowbro's tail
 ItemHandlers::UseOnPokemon.add(:SLOWPOKETAIL, proc { |item, pokemon, scene|
@@ -851,50 +851,50 @@ ItemHandlers::UseOnPokemon.add(:SLOWPOKETAIL, proc { |item, pokemon, scene|
     next true
   end
 })
-
-ItemHandlers::UseOnPokemon.add(:SHINYSTONE, proc { |item, pokemon, scene|
-  if (pokemon.isShadow? rescue false)
-    scene.pbDisplay(_INTL("It won't have any effect."))
-    next false
-  end
-  newspecies = pbCheckEvolution(pokemon, item)
-  if newspecies <= 0
-    scene.pbDisplay(_INTL("It won't have any effect."))
-    next false
-  else
-    pbFadeOutInWithMusic(99999) {
-      evo = PokemonEvolutionScene.new
-      evo.pbStartScreen(pokemon, newspecies)
-      evo.pbEvolution(false)
-      evo.pbEndScreen
-      scene.pbRefreshAnnotations(proc { |p| pbCheckEvolution(p, item) > 0 })
-      scene.pbRefresh
-    }
-    next true
-  end
-})
-
-ItemHandlers::UseOnPokemon.add(:DAWNSTONE, proc { |item, pokemon, scene|
-  if (pokemon.isShadow? rescue false)
-    scene.pbDisplay(_INTL("It won't have any effect."))
-    next false
-  end
-  newspecies = pbCheckEvolution(pokemon, item)
-  if newspecies <= 0
-    scene.pbDisplay(_INTL("It won't have any effect."))
-    next false
-  else
-    pbFadeOutInWithMusic(99999) {
-      evo = PokemonEvolutionScene.new
-      evo.pbStartScreen(pokemon, newspecies)
-      evo.pbEvolution(false)
-      evo.pbEndScreen
-      scene.pbRefreshAnnotations(proc { |p| pbCheckEvolution(p, item) > 0 })
-      scene.pbRefresh
-    }
-    next true
-  end
-})
+#
+# ItemHandlers::UseOnPokemon.add(:SHINYSTONE, proc { |item, pokemon, scene|
+#   if (pokemon.isShadow? rescue false)
+#     scene.pbDisplay(_INTL("It won't have any effect."))
+#     next false
+#   end
+#   newspecies = pbCheckEvolution(pokemon, item)
+#   if newspecies <= 0
+#     scene.pbDisplay(_INTL("It won't have any effect."))
+#     next false
+#   else
+#     pbFadeOutInWithMusic(99999) {
+#       evo = PokemonEvolutionScene.new
+#       evo.pbStartScreen(pokemon, newspecies)
+#       evo.pbEvolution(false)
+#       evo.pbEndScreen
+#       scene.pbRefreshAnnotations(proc { |p| pbCheckEvolution(p, item) > 0 })
+#       scene.pbRefresh
+#     }
+#     next true
+#   end
+# })
+#
+# ItemHandlers::UseOnPokemon.add(:DAWNSTONE, proc { |item, pokemon, scene|
+#   if (pokemon.isShadow? rescue false)
+#     scene.pbDisplay(_INTL("It won't have any effect."))
+#     next false
+#   end
+#   newspecies = pbCheckEvolution(pokemon, item)
+#   if newspecies <= 0
+#     scene.pbDisplay(_INTL("It won't have any effect."))
+#     next false
+#   else
+#     pbFadeOutInWithMusic(99999) {
+#       evo = PokemonEvolutionScene.new
+#       evo.pbStartScreen(pokemon, newspecies)
+#       evo.pbEvolution(false)
+#       evo.pbEndScreen
+#       scene.pbRefreshAnnotations(proc { |p| pbCheckEvolution(p, item) > 0 })
+#       scene.pbRefresh
+#     }
+#     next true
+#   end
+# })
 
 #TRACKER (for roaming legendaries)
 ItemHandlers::UseInField.add(:REVEALGLASS, proc { |item|
@@ -1449,137 +1449,137 @@ ItemHandlers::UseOnPokemon.add(:DAMAGEUP, proc { |item, pokemon, scene|
 })
 
 ##New "stones"
-ItemHandlers::UseOnPokemon.add(:UPGRADE, proc { |item, pokemon, scene|
-  if (pokemon.isShadow? rescue false)
-    scene.pbDisplay(_INTL("It won't have any effect."))
-    next false
-  end
-  newspecies = pbCheckEvolution(pokemon, item)
-  if newspecies <= 0
-    scene.pbDisplay(_INTL("It won't have any effect."))
-    next false
-  else
-    pbFadeOutInWithMusic(99999) {
-      evo = PokemonEvolutionScene.new
-      evo.pbStartScreen(pokemon, newspecies)
-      evo.pbEvolution(false)
-      evo.pbEndScreen
-      scene.pbRefreshAnnotations(proc { |p| pbCheckEvolution(p, item) > 0 })
-      scene.pbRefresh
-    }
-    next true
-  end
-})
+# ItemHandlers::UseOnPokemon.add(:UPGRADE, proc { |item, pokemon, scene|
+#   if (pokemon.isShadow? rescue false)
+#     scene.pbDisplay(_INTL("It won't have any effect."))
+#     next false
+#   end
+#   newspecies = pbCheckEvolution(pokemon, item)
+#   if newspecies <= 0
+#     scene.pbDisplay(_INTL("It won't have any effect."))
+#     next false
+#   else
+#     pbFadeOutInWithMusic(99999) {
+#       evo = PokemonEvolutionScene.new
+#       evo.pbStartScreen(pokemon, newspecies)
+#       evo.pbEvolution(false)
+#       evo.pbEndScreen
+#       scene.pbRefreshAnnotations(proc { |p| pbCheckEvolution(p, item) > 0 })
+#       scene.pbRefresh
+#     }
+#     next true
+#   end
+# })
+#
+# ItemHandlers::UseOnPokemon.add(:DUBIOUSDISC, proc { |item, pokemon, scene|
+#   if (pokemon.isShadow? rescue false)
+#     scene.pbDisplay(_INTL("It won't have any effect."))
+#     next false
+#   end
+#   newspecies = pbCheckEvolution(pokemon, item)
+#   if newspecies <= 0
+#     scene.pbDisplay(_INTL("It won't have any effect."))
+#     next false
+#   else
+#     pbFadeOutInWithMusic(99999) {
+#       evo = PokemonEvolutionScene.new
+#       evo.pbStartScreen(pokemon, newspecies)
+#       evo.pbEvolution(false)
+#       evo.pbEndScreen
+#       scene.pbRefreshAnnotations(proc { |p| pbCheckEvolution(p, item) > 0 })
+#       scene.pbRefresh
+#     }
+#     next true
+#   end
+# })
+#
+# ItemHandlers::UseOnPokemon.add(:ICESTONE, proc { |item, pokemon, scene|
+#   if (pokemon.isShadow? rescue false)
+#     scene.pbDisplay(_INTL("It won't have any effect."))
+#     next false
+#   end
+#   newspecies = pbCheckEvolution(pokemon, item)
+#   if newspecies <= 0
+#     scene.pbDisplay(_INTL("It won't have any effect."))
+#     next false
+#   else
+#     pbFadeOutInWithMusic(99999) {
+#       evo = PokemonEvolutionScene.new
+#       evo.pbStartScreen(pokemon, newspecies)
+#       evo.pbEvolution(false)
+#       evo.pbEndScreen
+#       scene.pbRefreshAnnotations(proc { |p| pbCheckEvolution(p, item) > 0 })
+#       scene.pbRefresh
+#     }
+#     next true
+#   end
+# })
+#
+# ItemHandlers::UseOnPokemon.add(:MAGNETSTONE, proc { |item, pokemon, scene|
+#   if (pokemon.isShadow? rescue false)
+#     scene.pbDisplay(_INTL("It won't have any effect."))
+#     next false
+#   end
+#   newspecies = pbCheckEvolution(pokemon, item)
+#   if newspecies <= 0
+#     scene.pbDisplay(_INTL("It won't have any effect."))
+#     next false
+#   else
+#     pbFadeOutInWithMusic(99999) {
+#       evo = PokemonEvolutionScene.new
+#       evo.pbStartScreen(pokemon, newspecies)
+#       evo.pbEvolution(false)
+#       evo.pbEndScreen
+#       scene.pbRefreshAnnotations(proc { |p| pbCheckEvolution(p, item) > 0 })
+#       scene.pbRefresh
+#     }
+#     next true
+#   end
+# })
 
-ItemHandlers::UseOnPokemon.add(:DUBIOUSDISC, proc { |item, pokemon, scene|
-  if (pokemon.isShadow? rescue false)
-    scene.pbDisplay(_INTL("It won't have any effect."))
-    next false
-  end
-  newspecies = pbCheckEvolution(pokemon, item)
-  if newspecies <= 0
-    scene.pbDisplay(_INTL("It won't have any effect."))
-    next false
-  else
-    pbFadeOutInWithMusic(99999) {
-      evo = PokemonEvolutionScene.new
-      evo.pbStartScreen(pokemon, newspecies)
-      evo.pbEvolution(false)
-      evo.pbEndScreen
-      scene.pbRefreshAnnotations(proc { |p| pbCheckEvolution(p, item) > 0 })
-      scene.pbRefresh
-    }
-    next true
-  end
-})
-
-ItemHandlers::UseOnPokemon.add(:ICESTONE, proc { |item, pokemon, scene|
-  if (pokemon.isShadow? rescue false)
-    scene.pbDisplay(_INTL("It won't have any effect."))
-    next false
-  end
-  newspecies = pbCheckEvolution(pokemon, item)
-  if newspecies <= 0
-    scene.pbDisplay(_INTL("It won't have any effect."))
-    next false
-  else
-    pbFadeOutInWithMusic(99999) {
-      evo = PokemonEvolutionScene.new
-      evo.pbStartScreen(pokemon, newspecies)
-      evo.pbEvolution(false)
-      evo.pbEndScreen
-      scene.pbRefreshAnnotations(proc { |p| pbCheckEvolution(p, item) > 0 })
-      scene.pbRefresh
-    }
-    next true
-  end
-})
-
-ItemHandlers::UseOnPokemon.add(:MAGNETSTONE, proc { |item, pokemon, scene|
-  if (pokemon.isShadow? rescue false)
-    scene.pbDisplay(_INTL("It won't have any effect."))
-    next false
-  end
-  newspecies = pbCheckEvolution(pokemon, item)
-  if newspecies <= 0
-    scene.pbDisplay(_INTL("It won't have any effect."))
-    next false
-  else
-    pbFadeOutInWithMusic(99999) {
-      evo = PokemonEvolutionScene.new
-      evo.pbStartScreen(pokemon, newspecies)
-      evo.pbEvolution(false)
-      evo.pbEndScreen
-      scene.pbRefreshAnnotations(proc { |p| pbCheckEvolution(p, item) > 0 })
-      scene.pbRefresh
-    }
-    next true
-  end
-})
-
-ItemHandlers::UseOnPokemon.add(:SHINYSTONE, proc { |item, pokemon, scene|
-  if (pokemon.isShadow? rescue false)
-    scene.pbDisplay(_INTL("It won't have any effect."))
-    next false
-  end
-  newspecies = pbCheckEvolution(pokemon, item)
-  if newspecies <= 0
-    scene.pbDisplay(_INTL("It won't have any effect."))
-    next false
-  else
-    pbFadeOutInWithMusic(99999) {
-      evo = PokemonEvolutionScene.new
-      evo.pbStartScreen(pokemon, newspecies)
-      evo.pbEvolution(false)
-      evo.pbEndScreen
-      scene.pbRefreshAnnotations(proc { |p| pbCheckEvolution(p, item) > 0 })
-      scene.pbRefresh
-    }
-    next true
-  end
-})
-
-ItemHandlers::UseOnPokemon.add(:DAWNSTONE, proc { |item, pokemon, scene|
-  if (pokemon.isShadow? rescue false)
-    scene.pbDisplay(_INTL("It won't have any effect."))
-    next false
-  end
-  newspecies = pbCheckEvolution(pokemon, item)
-  if newspecies <= 0
-    scene.pbDisplay(_INTL("It won't have any effect."))
-    next false
-  else
-    pbFadeOutInWithMusic(99999) {
-      evo = PokemonEvolutionScene.new
-      evo.pbStartScreen(pokemon, newspecies)
-      evo.pbEvolution(false)
-      evo.pbEndScreen
-      scene.pbRefreshAnnotations(proc { |p| pbCheckEvolution(p, item) > 0 })
-      scene.pbRefresh
-    }
-    next true
-  end
-})
+# ItemHandlers::UseOnPokemon.add(:SHINYSTONE, proc { |item, pokemon, scene|
+#   if (pokemon.isShadow? rescue false)
+#     scene.pbDisplay(_INTL("It won't have any effect."))
+#     next false
+#   end
+#   newspecies = pbCheckEvolution(pokemon, item)
+#   if newspecies <= 0
+#     scene.pbDisplay(_INTL("It won't have any effect."))
+#     next false
+#   else
+#     pbFadeOutInWithMusic(99999) {
+#       evo = PokemonEvolutionScene.new
+#       evo.pbStartScreen(pokemon, newspecies)
+#       evo.pbEvolution(false)
+#       evo.pbEndScreen
+#       scene.pbRefreshAnnotations(proc { |p| pbCheckEvolution(p, item) > 0 })
+#       scene.pbRefresh
+#     }
+#     next true
+#   end
+# })
+#
+# ItemHandlers::UseOnPokemon.add(:DAWNSTONE, proc { |item, pokemon, scene|
+#   if (pokemon.isShadow? rescue false)
+#     scene.pbDisplay(_INTL("It won't have any effect."))
+#     next false
+#   end
+#   newspecies = pbCheckEvolution(pokemon, item)
+#   if newspecies <= 0
+#     scene.pbDisplay(_INTL("It won't have any effect."))
+#     next false
+#   else
+#     pbFadeOutInWithMusic(99999) {
+#       evo = PokemonEvolutionScene.new
+#       evo.pbStartScreen(pokemon, newspecies)
+#       evo.pbEvolution(false)
+#       evo.pbEndScreen
+#       scene.pbRefreshAnnotations(proc { |p| pbCheckEvolution(p, item) > 0 })
+#       scene.pbRefresh
+#     }
+#     next true
+#   end
+# })
 
 #
 # ItemHandlers::UseOnPokemon.copy(:FIRESTONE,