Fix confusion damage message
Gen 1: Fix partial trapping moves at 0 PP.

In gen 1, previous to this fix, when you used the last PP of a partial trapping move you couldn't continue the sequence and would be forced into Struggle. This fixes it.
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/Cosym/Pokemon-Showdown