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

randomizer fix - removes static encounter

Browse Source
This commit is contained in:
infinitefusion
2022-05-02 18:19:59 -04:00
parent a601e06d0b
commit 6034c3ecff
18 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Data/Scripts/012_Overworld/001_Overworld.rb
View File

@@ -231,6 +231,9 @@ def pbBattleOnStepTaken(repel_active)
end
end
if encounter[0].is_a?(Integer)
encounter[0] = getSpecies(encounter[0])
end
$game_switches[SWITCH_FORCE_FUSE_NEXT_POKEMON] = false

6
Data/Scripts/012_Overworld/002_Battle triggering/001_Overworld_BattleStarting.rb
View File

@@ -331,11 +331,7 @@ end
#===============================================================================
# Used when walking in tall grass, hence the additional code.
def pbWildBattle(species, level, outcomeVar=1, canRun=true, canLose=false)
if $game_switches[SWITCH_RANDOM_STATIC_ENCOUNTERS]
species = $PokemonGlobal.psuedoBSTHash[dexNum(species)]
else
species = GameData::Species.get(species).id
end
species = GameData::Species.get(species).id
# Potentially call a different pbWildBattle-type method instead (for roaming
# Pokémon, Safari battles, Bug Contest battles)
handled = [nil]