OOIION-1118 Fixes a bunch of sprite mismatches R2