merged with dev and started implementing battle dialogue