Remove isDW from Gen 4 events

Also moved CAP to the bottom to match Gen 5/6