Revert "Battle Revamp"

This reverts commit c330e709be6c11439f0168800cc396d9b6d730fb.