palette effects

small fixes
palette effects

small fixes

Merge branch 'test'

Conflicts:
	src/window_music_credits.c
palette effects
Merge branch 'master' of https://github.com/zsilencer/OpenRCT2