Fixes to partial trapping moves so they work as they should in gen 1