Gen IV: Fix Choice locking.

- Specifically, using Trick / Switcheroo while holding a Choice item and
receiving the same or a different Choice item keeps the user locked into
the move.