Magic Power-Up fixes.

Just some bugfixes.

Also, if you need help, use the Psychic Shield to get through 2-1.