Re-lettered the scenery to match the order in the spritesheet
Finished most data changes