Changes to allow easier integration with Pokemon-sim