Fix up table based on nintendo docs