Fix rgbgfx -Z palette overgeneration on merged color sets#1912

vulcandth wants to merge 3 commits into

gbdev:mastergbdev/rgbds:masterfrom

vulcandth:color-setsvulcandth/rgbds:color-setsCopy head branch name to clipboard