Btw I'm super glad surface effects now evaporate after battle 'cos previously, I'd to clear them up using HammerTime, Rain, etc.