Update aliases

Adding BP for Baton Pass, Obama for Abomasnow (including its Mega), Sitrus for Sitrus berry and Leppa for Leppa Berry;
Moved sash's location for alphabetic consistency
Missing comma. Also capitalize "berry"