Get battle entry/exit working