Clean up `battleOnly` and `inheritsFrom`
Clean up `battleOnly` and `inheritsFrom`

Zarel/Pokemon-Showdown-Client,Zarel/Pokemon-Showdown-Client,Zarel/Pokemon-Showdown-Client,Zarel/Pokemon-Showdown-Client