DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-09 14:14:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed fishing/Rock Smash/Headbutt being able to cause double wild battles

Browse Source
This commit is contained in:
Maruno17
2022-05-01 01:08:33 +01:00
parent 140ba4c622
commit 1b551b30f4
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Data/Scripts/012_Overworld/002_Battle triggering/003_Overworld_WildEncounters.rb
View File

@@ -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