Making Pokemon controller more uniform