improved map loading time. might cause memory issues

2025-12-06 06:01:46 +00:00 · 2021-09-05 16:34:12 -04:00
parent a62ab706c5
commit 2c86a187af
16 changed files with 273 additions and 265 deletions
--- a/Data/Actors.rxdata
+++ b/Data/Actors.rxdata
--- a/Data/Animations.rxdata
+++ b/Data/Animations.rxdata
--- a/Data/Armors.rxdata
+++ b/Data/Armors.rxdata
--- a/Data/CommonEvents.rxdata
+++ b/Data/CommonEvents.rxdata
--- a/Data/Enemies.rxdata
+++ b/Data/Enemies.rxdata
--- a/Data/Items.rxdata
+++ b/Data/Items.rxdata
--- a/Data/Map081.rxdata
+++ b/Data/Map081.rxdata
--- a/Data/MapInfos.rxdata
+++ b/Data/MapInfos.rxdata
--- a/processing/002_Scene_Map.rb
+++ b/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
+    if cacheNeedsClearing()
      RPG::Cache.clear
+    end
    createSpritesets
    if $game_temp.transition_processing
      $game_temp.transition_processing = false
--- a/Data/Scripts/050_AddOns/New
+++ b/Data/Scripts/050_AddOns/New
@@ -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,
--- a/Data/Skills.rxdata
+++ b/Data/Skills.rxdata
--- a/Data/States.rxdata
+++ b/Data/States.rxdata
--- a/Data/System.rxdata
+++ b/Data/System.rxdata
--- a/Data/Tilesets.rxdata
+++ b/Data/Tilesets.rxdata
--- a/Data/Weapons.rxdata
+++ b/Data/Weapons.rxdata
--- a/PBS/items.txt
+++ b/PBS/items.txt
@@ -201,8 +201,8 @@
 201,CHILLDRIVE,Chill Drive,Chill Drives,1,1000,"A cassette to be held by Genesect. It changes Techno Blast to an Ice-type move.",0,0,0,
 202,EVERSTONE,Everstone,Everstones,1,3000,"An item to be held by a Pokémon. The Pokémon holding this peculiar stone is prevented from evolving.",0,0,0,
 203,DRAGONSCALE,Dragon Scale,Dragon Scales,1,2000,"A thick and tough scale. Dragon-type Pokémon may be holding this item when caught.",0,0,0,
-204,UPGRADE,Upgrade,Upgrades,1,2000,"A transparent device filled with all sorts of data. It was produced by Silph Co.",0,0,0,
-205,DUBIOUSDISC,Dubious Disc,Dubious Discs,1,2000,"A transparent device overflowing with dubious data.  Its producer is unknown.",0,0,0,
+204,UPGRADE,Upgrade,Upgrades,1,2000,"A transparent device filled with all sorts of data. It was produced by Silph Co.",1,0,7,
+205,DUBIOUSDISC,Dubious Disc,Dubious Discs,1,2000,"A transparent device overflowing with dubious data.  Its producer is unknown.",1,0,7,
 206,PROTECTOR,Protector,Protectors,1,2000,"A protective item of some sort. It is extremely stiff and heavy. It is loved by a certain Pokémon.",0,0,0,
 207,ELECTIRIZER,Electirizer,Electirizers,1,2000,"A box packed with a tremendous amount of electric energy. It is loved by a certain Pokémon.",0,0,0,
 208,MAGMARIZER,Magmarizer,Magmarizers,1,2000,"A box packed with a tremendous amount of magma energy. It is loved by a certain Pokémon.",0,0,0,
@@ -614,7 +614,7 @@
 607,DYNAMITE,Dynamite,Dynamites,1,100,"A stick of dynamite. Be careful with it!",1,1,0,
 606,BERSERKGENE,Berserk Gene,Berserk Genes,8,0,A strange gene. It appears to have some mysterious powers.,2,0,6,
 608,AZUREFLUTE,Azure Flute,Azure Flutes,8,0,"A flute that puts out echoing sounds that do not seem to be of this world. It is unknown who made it.",2,0,6,
-609,MAGNETSTONE,Magnet Stone,Magnet Stones,1,2100,A peculiar stone that makes certain species of Pokémon evolve. It has magnetic properties.,1,0,0,
+609,MAGNETSTONE,Magnet Stone,Magnet Stones,1,2100,A peculiar stone that makes certain species of Pokémon evolve. It has magnetic properties.,1,0,7,
 610,PIXIEPLATE,Pixie Plate,Pixie Plates,1,1000,An item to be held by a Pokémon. It is a stone tablet that boosts the power of Fairy-type moves.,0,0,0,
 611,OLDPENDANT,Old Pendant,Old Pendants,1,1000,A small locket found on a sunken ship. It belonged to someone long ago.,0,0,0,
 612,BELLSPROUTSTATUE,Bellsprout Statues,Bellsprout Statue,1,1000,A small golden statue of a Bellsprout. It looks valuable.,0,0,0,