Battle logic mostly defined, began implementations of other event types, changed event control flow
Added battle logic