Fix Primordial Sea glitch
Merge pull request #1296 from ascriptmaster/oras-weather

Fix Primordial Sea glitch
Update OMs
Geomancy is viable
Merge pull request #1301 from ascriptmaster/geomancy

Geomancy is viable
Aromatherapy triggers Sap Sipper
Merge pull request #1300 from ascriptmaster/aromasipper

Aromatherapy triggers Sap Sipper
Remove ended XY battle competition
Merge branch 'master' of https://github.com/Zarel/Pokemon-Showdown

Conflicts:
	config/formats.js