Sayoko combat progress 6

Redoing the timing on when the characters attack/defend, so the weapons don't exactly match up yet.