Optimizations to battle & mart.
Merge branch 'master' of https://github.com/tasosgretsistas/pokemontextgame.git