Fix Parental Bond Explosion
Make sure battle numbers never overlap
Make abilities activate after all after-faint switches
Merge remote-tracking branch 'upstream/master'