Buu's Swords 2.0

Fixed a bunch of bugs caused from the shield update. Massive thanks to http://steamcommunity.com/id/piet_spanky/ For providing me with fixed code, as well as for helping me test fixes for this update.