Merge branch 'master' into mkxp-z

This commit is contained in:
Maruno17
2020-11-09 19:26:44 +00:00
79 changed files with 3367 additions and 3235 deletions

View File

@@ -241,6 +241,6 @@ def pbRoamingPokemonBattle(species, level)
return (decision!=2 && decision!=5)
end
EncounterModifier.registerEncounterEnd(proc{
EncounterModifier.registerEncounterEnd(proc {
$PokemonTemp.roamerIndex = nil
})