Adding hit animation to battle, finishing code refactoring