From 1b551b30f47b141865b3178d1c229633dd566c55 Mon Sep 17 00:00:00 2001
From: Maruno17 <serialcolour@hotmail.com>
Date: Sun, 1 May 2022 01:08:33 +0100
Subject: [PATCH] Fixed fishing/Rock Smash/Headbutt being able to cause double
 wild battles

---
 .../002_Battle triggering/003_Overworld_WildEncounters.rb   | 6 +++---
 Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb      | 2 +-
 Data/Scripts/016_UI/009_UI_RegionMap.rb                     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Data/Scripts/012_Overworld/002_Battle triggering/003_Overworld_WildEncounters.rb b/Data/Scripts/012_Overworld/002_Battle triggering/003_Overworld_WildEncounters.rb
index 45f21a9ce..1dee64b93 100644
--- a/Data/Scripts/012_Overworld/002_Battle triggering/003_Overworld_WildEncounters.rb	
+++ b/Data/Scripts/012_Overworld/002_Battle triggering/003_Overworld_WildEncounters.rb	
@@ -451,13 +451,13 @@ def pbGenerateWildPokemon(species, level, isRoamer = false)
 end
 
 # Used by fishing rods and Headbutt/Rock Smash/Sweet Scent to generate a wild
-# Pokémon (or two) for a triggered wild encounter.
-def pbEncounter(enc_type)
+# Pokémon (or two if it's Sweet Scent) for a triggered wild encounter.
+def pbEncounter(enc_type, only_single = true)
   $game_temp.encounter_type = enc_type
   encounter1 = $PokemonEncounters.choose_wild_pokemon(enc_type)
   EventHandlers.trigger(:on_wild_species_chosen, encounter1)
   return false if !encounter1
-  if $PokemonEncounters.have_double_wild_battle?
+  if !only_single && $PokemonEncounters.have_double_wild_battle?
     encounter2 = $PokemonEncounters.choose_wild_pokemon(enc_type)
     EventHandlers.trigger(:on_wild_species_chosen, encounter2)
     return false if !encounter2
diff --git a/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb b/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb
index c269ec5f6..2eec1841b 100644
--- a/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb
+++ b/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb
@@ -877,7 +877,7 @@ def pbSweetScent
   viewport.dispose
   enctype = $PokemonEncounters.encounter_type
   if !enctype || !$PokemonEncounters.encounter_possible_here? ||
-     !pbEncounter(enctype)
+     !pbEncounter(enctype, false)
     pbMessage(_INTL("There appears to be nothing here..."))
   end
 end
diff --git a/Data/Scripts/016_UI/009_UI_RegionMap.rb b/Data/Scripts/016_UI/009_UI_RegionMap.rb
index 82c875c04..916b35bc7 100644
--- a/Data/Scripts/016_UI/009_UI_RegionMap.rb
+++ b/Data/Scripts/016_UI/009_UI_RegionMap.rb
@@ -75,7 +75,7 @@ class PokemonRegionMap_Scene
     @map_data = pbLoadTownMapData
     @fly_map = fly_map
     @mode    = fly_map ? 1 : 0
-    map_metadata = GameData::MapMetadata.try_get($game_map.map_id)
+    map_metadata = $game_map.metadata
     playerpos = (map_metadata) ? map_metadata.town_map_position : nil
     if !playerpos
       mapindex = 0