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

fusion incense

Browse Source
This commit is contained in:
infinitefusion
2022-04-30 11:40:01 -04:00
parent ce93ca7919
commit e97a845870
3 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -160,6 +160,11 @@ Events.onStepTakenFieldMovement += proc { |_sender, e|
end
}
def isRepelActive()
return false if $game_switches[USED_AN_INCENSE_SWITCH]
return ($PokemonGlobal.repel > 0) || $PokemonTemp.pokeradar
end
def pbOnStepTaken(eventTriggered)
if $game_player.move_route_forcing || pbMapInterpreterRunning?
Events.onStepTakenFieldMovement.trigger(nil, $game_player)
@@ -168,7 +173,7 @@ def pbOnStepTaken(eventTriggered)
$PokemonGlobal.stepcount = 0 if !$PokemonGlobal.stepcount
$PokemonGlobal.stepcount += 1
$PokemonGlobal.stepcount &= 0x7FFFFFFF
repel_active = ($PokemonGlobal.repel > 0) || $PokemonTemp.pokeradar
repel_active = isRepelActive()
Events.onStepTaken.trigger(nil)
# Events.onStepTakenFieldMovement.trigger(nil,$game_player)
@@ -181,7 +186,7 @@ end
# Start wild encounters while turning on the spot
Events.onChangeDirection += proc {
repel_active = ($PokemonGlobal.repel > 0) || $PokemonTemp.pokeradar
repel_active = isRepelActive()
pbBattleOnStepTaken(repel_active) if !$game_temp.in_menu
}