Reworked Enemy and Battle System