RPS: Improve matchup handling (#7497)
RPS: Improve matchup handling (#7497)


sirDonovan/Pokemon-Showdown,svivian/Pokemon-Showdown,xfix/Pokemon-Showdown,Zarel/Pokemon-Showdown,sirDonovan/Pokemon-Showdown,xfix/Pokemon-Showdown,svivian/Pokemon-Showdown,Zarel/Pokemon-Showdown,svivian/Pokemon-Showdown,sirDonovan/Pokemon-Showdown,Zarel/Pokemon-Showdown,svivian/Pokemon-Showdown,xfix/Pokemon-Showdown,xfix/Pokemon-Showdown,svivian/Pokemon-Showdown,xfix/Pokemon-Showdown