Gen 4: Fix Beat Up
NEXT: Mega Gengar no longer levitates
Merge branch 'master', remote-tracking branch 'upstream/master'
Fix crash.