Merge reinforce_during and reinforce_after into reinforce.

This removes code duplication, and also fixes an bug where
we (rarely) called reinforce_during when the battle had actually
ended, causing an assertion failure because it was no longer the
correct battle phase.
Merge summon_angel_during and summon_angel_after into summon_angel

Just to make the public interface smaller.