Fixed registration bug and added UNTESTED battle code. I would have tested it, but there is no way for a battle to occur yet...
Quick fix.
Finished getMapLoc function, but did not test.
Merge pull request #1 from superreg/dev

Dev