Gen IV: Fix rampage moves against Detect/Protect.
Gen IV: Wish comes before weather damage.
Magician's handler is now purely a global event
Reverts 3b5d455
Merge remote-tracking branch 'upstream/master'