Sonic: Fix encoding in VADD (cross-project merge).