Merge fixes of Wifi sounds

We kinda derped and accidentally merged ALL of the wifi sounds ahead of time. HERPADERP