Some refactoring, a lot more pokemon animations