Fixes

Fixed some errors, rewrote battle function, and made weapon into a
pointer.