Fixed most battle system bugs.

Also, I'm in the process of adding a viewable inventory that displays
current weapon, shield, and consumable. Needs equipping setup to work
properly.