Merge changes from 23b9366cb341c0c91926316ad7803305800ccfbd

Add equip menu stuff & use correct sound