Properly do 891e7aebb6 and extend to Embargo

The previous implementation caused the ModifyPokemon event to be interrupted for a pokemon holding a mega Stone in Magic Room.