Merge pull request #856 from Hiroku/master

Recharge moves fixed
Uh... I think i was working on charge up moves? Can't remember