Merge pull request #122 from Beinmann/make_black_and_white_flute_persist_between_routes

Make black and white flute effects persist when entering a new route
This commit is contained in:
infinitefusion
2025-04-08 21:35:47 -04:00
committed by GitHub
2 changed files with 13 additions and 5 deletions

View File

@@ -283,7 +283,13 @@ Events.onMapChange += proc { |_sender, e|
if new_map_metadata && new_map_metadata.teleport_destination
$PokemonGlobal.healingSpot = new_map_metadata.teleport_destination
end
$PokemonMap.clear if $PokemonMap
if $PokemonMap
blackFluteUsed = $PokemonMap.blackFluteUsed
whiteFluteUsed = $PokemonMap.whiteFluteUsed
$PokemonMap.clear
$PokemonMap.blackFluteUsed = blackFluteUsed
$PokemonMap.whiteFluteUsed = whiteFluteUsed
end
$PokemonEncounters.setup($game_map.map_id) if $PokemonEncounters
$PokemonGlobal.visitedMaps[$game_map.map_id] = true
next if old_map_ID == 0 || old_map_ID == $game_map.map_id