Waiting dialog fixes


(Also implemeted for find battle but commented)