Make Oak's Parcel have priority over Poké Ball (fixes #3)
Change when wIsTrainerBattle is unset (fixes #7)