Revert "Revert "Changed select map screen, scrapped wave mode and turned it into""

This reverts commit a43f37a5836d798e0c75bce75ba18c5d1afac822.