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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Maruno17
2021-08-29 23:50:52 +01:00
parent f411867c52 a9426b0802
commit 70ef588190
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb
View File

@@ -837,7 +837,7 @@ def pbSweetScent
end end
viewport.dispose viewport.dispose
enctype = $PokemonEncounters.encounter_type enctype = $PokemonEncounters.encounter_type
if enctype || !$PokemonEncounters.encounter_possible_here? || if !enctype || !$PokemonEncounters.encounter_possible_here? ||
!pbEncounter(enctype) !pbEncounter(enctype)
pbMessage(_INTL("There appears to be nothing here...")) pbMessage(_INTL("There appears to be nothing here..."))
end end

2
Data/Scripts/014_Pokemon/001_Pokemon.rb
View File

@@ -166,7 +166,7 @@ class Pokemon
yield if block_given? yield if block_given?
MultipleForms.call("onSetForm", self, value, oldForm) MultipleForms.call("onSetForm", self, value, oldForm)
calc_stats calc_stats
$Trainer.pokedex.register(self) $Trainer.pokedex.register(self) if $Trainer
end end
def form_simple=(value) def form_simple=(value)