Send 'trapped' flag in requests for pokémon that are known trapped
- Implement BattlePokemon#isLastActive to do the check for whether this is the last non-fainted active pokémon in a team.
- BattlePokemon#tryTrap now accepts an argument that, if true, will hide the fact that a pokémon is trapped.
- This should revert an small (annoying) change in the UI for locked moves introduced as a secondary effect in 8afc588e4.
- NEXT: Shadow Tag shouldn't activate the 'maybeTrapped' flag after the suspected Shadow Tagger has made a move.
Merge pull request #1294 from Slayer95/trapping

Send 'trapped' flag in requests for pokémon that are known trapped
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
Add joim as an alias of join

In recognition of your outstanding accomplishments in the field of
Pokémon sciences, we hereby award you the highest of honors; a
commemorative alias.
Merge pull request #1303 from ScottehMax/patch-1

Add joim as an alias of join
Remove unnecessary checks for sound immunity
As of ecbc9bfd62, no effect provides an "immunity" to sound.
Correct Cheek Pouch mechanics

Didn't know this was still set to 25%...
Add sprites for Blue and Red Orb.
Fix Aromatic Mist.
Update UU suspect
Correct Gen 6 move targets.
Only Hoopa-Forme can use Hyperspace Fury.
Add the FAQ entry of custom avatar to /faq