Sounds like you have it set up in RetroArch fine, but not in emulation station. Navigate to /home/pi/.emulationstation/ and delete es_input.cfg then restart. When it boots up make sure you have your controller on, and it will take you through the key mappings for emulation station again. Hope this helps.
