Return from battle/inventory with controller working