Yeah, I agree with redoing all of those except water. It was done entirely on B8, whether it was rushed or not (and there wasn't really any alt voting or anything) so there's no reason to redo it. But yes to Normal and Psychic.
--
"Whee, I'm starfox" - GenesisSaga