Merge branch 'master' into dev

This commit is contained in:
Maruno17
2021-08-29 23:50:52 +01:00
2 changed files with 2 additions and 2 deletions

View File

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