Added enemies to room. Also refactored battle code a little.