revert pokemontools to 7aa016fb