adjusted 2 function calls in battle
Merge branch 'master' of https://github.com/Psiryu/4000War