better mapping
Merge pull request #54 from masarakki/better_battle

better mapping