Undo the silleh use of ID macro in battle()