VERY experimental Nintendo Switch 2 emulator
C++
service: mii: Move core data operations
german771675343e86f4
diff --git a/src/core/hle/service/mii/mii_manager.cpp b/src/core/hle/service/mii/mii_manager.cppindex 9ae7fb960d..3483d95e54 100644--- a/src/core/hle/service/mii/mii_manager.cpp+++ b/src/core/hle/service/mii/mii_manager.cpp@@ -90,256 +90,21 @@ CharInfo ConvertStoreDataToInfo(const StoreData& data) {}StoreData BuildRandomStoreData(Age age, Gender gender, Race race, const Common::UUID& user_id) {- StoreDataBitFields bf{};+ CoreData core_data{};+ core_data.BuildRandom(age, gender, race);- if (gender == Gender::All) {- gender = MiiUtil::GetRandomValue<Gender>(Gender::Maximum);- }-- bf.gender.Assign(gender);- bf.favorite_color.Assign(MiiUtil::GetRandomValue<u8>(11));- bf.region_move.Assign(0);- bf.font_region.Assign(FontRegion::Standard);- bf.type.Assign(0);- bf.height.Assign(64);- bf.build.Assign(64);-- if (age == Age::All) {- const auto temp{MiiUtil::GetRandomValue<int>(10)};- if (temp >= 8) {- age = Age::Old;- } else if (temp >= 4) {- age = Age::Normal;- } else {- age = Age::Young;- }- }-- if (race == Race::All) {- const auto temp{MiiUtil::GetRandomValue<int>(10)};- if (temp >= 8) {- race = Race::Black;- } else if (temp >= 4) {- race = Race::White;- } else {- race = Race::Asian;- }- }-- u32 axis_y{};- if (gender == Gender::Female && age == Age::Young) {- axis_y = MiiUtil::GetRandomValue<u32>(3);- }-- const std::size_t index{3 * static_cast<std::size_t>(age) +- 9 * static_cast<std::size_t>(gender) + static_cast<std::size_t>(race)};-- const auto& faceline_type_info{RawData::RandomMiiFaceline.at(index)};- const auto& faceline_color_info{RawData::RandomMiiFacelineColor.at(- 3 * static_cast<std::size_t>(gender) + static_cast<std::size_t>(race))};- const auto& faceline_wrinkle_info{RawData::RandomMiiFacelineWrinkle.at(index)};- const auto& faceline_makeup_info{RawData::RandomMiiFacelineMakeup.at(index)};- const auto& hair_type_info{RawData::RandomMiiHairType.at(index)};- const auto& hair_color_info{RawData::RandomMiiHairColor.at(3 * static_cast<std::size_t>(race) +- static_cast<std::size_t>(age))};- const auto& eye_type_info{RawData::RandomMiiEyeType.at(index)};- const auto& eye_color_info{RawData::RandomMiiEyeColor.at(static_cast<std::size_t>(race))};- const auto& eyebrow_type_info{RawData::RandomMiiEyebrowType.at(index)};- const auto& nose_type_info{RawData::RandomMiiNoseType.at(index)};- const auto& mouth_type_info{RawData::RandomMiiMouthType.at(index)};- const auto& glasses_type_info{RawData::RandomMiiGlassType.at(static_cast<std::size_t>(age))};-- bf.faceline_type.Assign(- faceline_type_info- .values[MiiUtil::GetRandomValue<std::size_t>(faceline_type_info.values_count)]);- bf.faceline_color.Assign(- faceline_color_info- .values[MiiUtil::GetRandomValue<std::size_t>(faceline_color_info.values_count)]);- bf.faceline_wrinkle.Assign(- faceline_wrinkle_info- .values[MiiUtil::GetRandomValue<std::size_t>(faceline_wrinkle_info.values_count)]);- bf.faceline_makeup.Assign(- faceline_makeup_info- .values[MiiUtil::GetRandomValue<std::size_t>(faceline_makeup_info.values_count)]);-- bf.hair_type.Assign(- hair_type_info.values[MiiUtil::GetRandomValue<std::size_t>(hair_type_info.values_count)]);- bf.hair_color.Assign(RawData::GetHairColorFromVer3(- hair_color_info- .values[MiiUtil::GetRandomValue<std::size_t>(hair_color_info.values_count)]));- bf.hair_flip.Assign(MiiUtil::GetRandomValue<HairFlip>(HairFlip::Maximum));-- bf.eye_type.Assign(- eye_type_info.values[MiiUtil::GetRandomValue<std::size_t>(eye_type_info.values_count)]);-- const auto eye_rotate_1{gender != Gender::Male ? 4 : 2};- const auto eye_rotate_2{gender != Gender::Male ? 3 : 4};- const auto eye_rotate_offset{32 - RawData::EyeRotateLookup[eye_rotate_1] + eye_rotate_2};- const auto eye_rotate{32 - RawData::EyeRotateLookup[bf.eye_type]};-- bf.eye_color.Assign(RawData::GetEyeColorFromVer3(- eye_color_info.values[MiiUtil::GetRandomValue<std::size_t>(eye_color_info.values_count)]));- bf.eye_scale.Assign(4);- bf.eye_aspect.Assign(3);- bf.eye_rotate.Assign(eye_rotate_offset - eye_rotate);- bf.eye_x.Assign(2);- bf.eye_y.Assign(axis_y + 12);-- bf.eyebrow_type.Assign(- eyebrow_type_info- .values[MiiUtil::GetRandomValue<std::size_t>(eyebrow_type_info.values_count)]);-- const auto eyebrow_rotate_1{race == Race::Asian ? 6 : 0};- const auto eyebrow_y{race == Race::Asian ? 9 : 10};- const auto eyebrow_rotate_offset{32 - RawData::EyebrowRotateLookup[eyebrow_rotate_1] + 6};- const auto eyebrow_rotate{- 32 - RawData::EyebrowRotateLookup[static_cast<std::size_t>(bf.eyebrow_type.Value())]};-- bf.eyebrow_color.Assign(bf.hair_color);- bf.eyebrow_scale.Assign(4);- bf.eyebrow_aspect.Assign(3);- bf.eyebrow_rotate.Assign(eyebrow_rotate_offset - eyebrow_rotate);- bf.eyebrow_x.Assign(2);- bf.eyebrow_y.Assign(axis_y + eyebrow_y);-- const auto nose_scale{gender == Gender::Female ? 3 : 4};-- bf.nose_type.Assign(- nose_type_info.values[MiiUtil::GetRandomValue<std::size_t>(nose_type_info.values_count)]);- bf.nose_scale.Assign(nose_scale);- bf.nose_y.Assign(axis_y + 9);-- const auto mouth_color{gender == Gender::Female ? MiiUtil::GetRandomValue<int>(4) : 0};-- bf.mouth_type.Assign(- mouth_type_info.values[MiiUtil::GetRandomValue<std::size_t>(mouth_type_info.values_count)]);- bf.mouth_color.Assign(RawData::GetMouthColorFromVer3(mouth_color));- bf.mouth_scale.Assign(4);- bf.mouth_aspect.Assign(3);- bf.mouth_y.Assign(axis_y + 13);-- bf.beard_color.Assign(bf.hair_color);- bf.mustache_scale.Assign(4);-- if (gender == Gender::Male && age != Age::Young && MiiUtil::GetRandomValue<int>(10) < 2) {- const auto mustache_and_beard_flag{- MiiUtil::GetRandomValue<BeardAndMustacheFlag>(BeardAndMustacheFlag::All)};-- auto beard_type{BeardType::None};- auto mustache_type{MustacheType::None};-- if ((mustache_and_beard_flag & BeardAndMustacheFlag::Beard) ==- BeardAndMustacheFlag::Beard) {- beard_type = MiiUtil::GetRandomValue<BeardType>(BeardType::Beard1, BeardType::Beard5);- }-- if ((mustache_and_beard_flag & BeardAndMustacheFlag::Mustache) ==- BeardAndMustacheFlag::Mustache) {- mustache_type = MiiUtil::GetRandomValue<MustacheType>(MustacheType::Mustache1,- MustacheType::Mustache5);- }-- bf.mustache_type.Assign(mustache_type);- bf.beard_type.Assign(beard_type);- bf.mustache_y.Assign(10);- } else {- bf.mustache_type.Assign(MustacheType::None);- bf.beard_type.Assign(BeardType::None);- bf.mustache_y.Assign(axis_y + 10);- }-- const auto glasses_type_start{MiiUtil::GetRandomValue<std::size_t>(100)};- u8 glasses_type{};- while (glasses_type_start < glasses_type_info.values[glasses_type]) {- if (++glasses_type >= glasses_type_info.values_count) {- ASSERT(false);- break;- }- }-- bf.glasses_type.Assign(glasses_type);- bf.glasses_color.Assign(RawData::GetGlassColorFromVer3(0));- bf.glasses_scale.Assign(4);- bf.glasses_y.Assign(axis_y + 10);-- bf.mole_type.Assign(0);- bf.mole_scale.Assign(4);- bf.mole_x.Assign(2);- bf.mole_y.Assign(20);-- return {DefaultMiiName, bf, user_id};+ return {DefaultMiiName, core_data.data, user_id};}StoreData BuildDefaultStoreData(const DefaultMii& info, const Common::UUID& user_id) {- StoreDataBitFields bf{};-- bf.font_region.Assign(info.font_region);- bf.favorite_color.Assign(info.favorite_color);- bf.gender.Assign(info.gender);- bf.height.Assign(info.height);- bf.build.Assign(info.weight);- bf.type.Assign(info.type);- bf.region_move.Assign(info.region_move);- bf.faceline_type.Assign(info.face_type);- bf.faceline_color.Assign(info.face_color);- bf.faceline_wrinkle.Assign(info.face_wrinkle);- bf.faceline_makeup.Assign(info.face_makeup);- bf.hair_type.Assign(info.hair_type);- bf.hair_color.Assign(RawData::GetHairColorFromVer3(info.hair_color));- bf.hair_flip.Assign(static_cast<HairFlip>(info.hair_flip));- bf.eye_type.Assign(info.eye_type);- bf.eye_color.Assign(RawData::GetEyeColorFromVer3(info.eye_color));- bf.eye_scale.Assign(info.eye_scale);- bf.eye_aspect.Assign(info.eye_aspect);- bf.eye_rotate.Assign(info.eye_rotate);- bf.eye_x.Assign(info.eye_x);- bf.eye_y.Assign(info.eye_y);- bf.eyebrow_type.Assign(info.eyebrow_type);- bf.eyebrow_color.Assign(RawData::GetHairColorFromVer3(info.eyebrow_color));- bf.eyebrow_scale.Assign(info.eyebrow_scale);- bf.eyebrow_aspect.Assign(info.eyebrow_aspect);- bf.eyebrow_rotate.Assign(info.eyebrow_rotate);- bf.eyebrow_x.Assign(info.eyebrow_x);- bf.eyebrow_y.Assign(info.eyebrow_y - 3);- bf.nose_type.Assign(info.nose_type);- bf.nose_scale.Assign(info.nose_scale);- bf.nose_y.Assign(info.nose_y);- bf.mouth_type.Assign(info.mouth_type);- bf.mouth_color.Assign(RawData::GetMouthColorFromVer3(info.mouth_color));- bf.mouth_scale.Assign(info.mouth_scale);- bf.mouth_aspect.Assign(info.mouth_aspect);- bf.mouth_y.Assign(info.mouth_y);- bf.beard_color.Assign(RawData::GetHairColorFromVer3(info.beard_color));- bf.beard_type.Assign(static_cast<BeardType>(info.beard_type));- bf.mustache_type.Assign(static_cast<MustacheType>(info.mustache_type));- bf.mustache_scale.Assign(info.mustache_scale);- bf.mustache_y.Assign(info.mustache_y);- bf.glasses_type.Assign(info.glasses_type);- bf.glasses_color.Assign(RawData::GetGlassColorFromVer3(static_cast<u8>(info.glasses_color)));- bf.glasses_scale.Assign(info.glasses_scale);- bf.glasses_y.Assign(info.glasses_y);- bf.mole_type.Assign(info.mole_type);- bf.mole_scale.Assign(info.mole_scale);- bf.mole_x.Assign(info.mole_x);- bf.mole_y.Assign(info.mole_y);-- return {DefaultMiiName, bf, user_id};+ CoreData core_data{};+ core_data.SetDefault();++ return {DefaultMiiName, core_data.data, user_id};}} // namespace-StoreData::StoreData() = default;--StoreData::StoreData(const Nickname& name, const StoreDataBitFields& bit_fields,- const Common::UUID& user_id) {- core_data.name = name;- create_id = Common::UUID::MakeRandomRFC4122V4();-- core_data.data = bit_fields;- data_crc = MiiUtil::CalculateCrc16(&core_data.data, sizeof(core_data.data));- device_crc = MiiUtil::CalculateCrc16(&user_id, sizeof(Common::UUID));-}-MiiManager::MiiManager() : user_id{Service::Account::ProfileManager().GetLastOpenedUser()} {}bool MiiManager::CheckAndResetUpdateCounter(SourceFlag source_flag, u64& current_update_counter) {diff --git a/src/core/hle/service/mii/types/core_data.cpp b/src/core/hle/service/mii/types/core_data.cppindex a7b12ad8dd..76c57fff2e 100644--- a/src/core/hle/service/mii/types/core_data.cpp+++ b/src/core/hle/service/mii/types/core_data.cpp@@ -1,6 +1,601 @@// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project// SPDX-License-Identifier: GPL-2.0-or-later+#include "core/hle/service/mii/mii_util.h"#include "core/hle/service/mii/types/core_data.h"+#include "core/hle/service/mii/types/raw_data.h"-namespace Service::Mii {} // namespace Service::Mii+namespace Service::Mii {++void CoreData::SetDefault() {+ data = {};+ name = GetDefaultNickname();+}++void CoreData::BuildRandom(Age age, Gender gender, Race race) {+ if (gender == Gender::All) {+ gender = MiiUtil::GetRandomValue<Gender>(Gender::Maximum);+ }++ data.gender.Assign(gender);+ data.favorite_color.Assign(MiiUtil::GetRandomValue<u8>(11));+ data.region_move.Assign(0);+ data.font_region.Assign(FontRegion::Standard);+ data.type.Assign(0);+ data.height.Assign(64);+ data.build.Assign(64);++ if (age == Age::All) {+ const auto temp{MiiUtil::GetRandomValue<int>(10)};+ if (temp >= 8) {+ age = Age::Old;+ } else if (temp >= 4) {+ age = Age::Normal;+ } else {+ age = Age::Young;+ }+ }++ if (race == Race::All) {+ const auto temp{MiiUtil::GetRandomValue<int>(10)};+ if (temp >= 8) {+ race = Race::Black;+ } else if (temp >= 4) {+ race = Race::White;+ } else {+ race = Race::Asian;+ }+ }++ u32 axis_y{};+ if (gender == Gender::Female && age == Age::Young) {+ axis_y = MiiUtil::GetRandomValue<u32>(3);+ }++ const std::size_t index{3 * static_cast<std::size_t>(age) ++ 9 * static_cast<std::size_t>(gender) + static_cast<std::size_t>(race)};++ const auto& faceline_type_info{RawData::RandomMiiFaceline.at(index)};+ const auto& faceline_color_info{RawData::RandomMiiFacelineColor.at(+ 3 * static_cast<std::size_t>(gender) + static_cast<std::size_t>(race))};+ const auto& faceline_wrinkle_info{RawData::RandomMiiFacelineWrinkle.at(index)};+ const auto& faceline_makeup_info{RawData::RandomMiiFacelineMakeup.at(index)};+ const auto& hair_type_info{RawData::RandomMiiHairType.at(index)};+ const auto& hair_color_info{RawData::RandomMiiHairColor.at(3 * static_cast<std::size_t>(race) ++ static_cast<std::size_t>(age))};+ const auto& eye_type_info{RawData::RandomMiiEyeType.at(index)};+ const auto& eye_color_info{RawData::RandomMiiEyeColor.at(static_cast<std::size_t>(race))};+ const auto& eyebrow_type_info{RawData::RandomMiiEyebrowType.at(index)};+ const auto& nose_type_info{RawData::RandomMiiNoseType.at(index)};+ const auto& mouth_type_info{RawData::RandomMiiMouthType.at(index)};+ const auto& glasses_type_info{RawData::RandomMiiGlassType.at(static_cast<std::size_t>(age))};++ data.faceline_type.Assign(+ faceline_type_info+ .values[MiiUtil::GetRandomValue<std::size_t>(faceline_type_info.values_count)]);+ data.faceline_color.Assign(+ faceline_color_info+ .values[MiiUtil::GetRandomValue<std::size_t>(faceline_color_info.values_count)]);+ data.faceline_wrinkle.Assign(+ faceline_wrinkle_info+ .values[MiiUtil::GetRandomValue<std::size_t>(faceline_wrinkle_info.values_count)]);+ data.faceline_makeup.Assign(+ faceline_makeup_info+ .values[MiiUtil::GetRandomValue<std::size_t>(faceline_makeup_info.values_count)]);++ data.hair_type.Assign(+ hair_type_info.values[MiiUtil::GetRandomValue<std::size_t>(hair_type_info.values_count)]);+ data.hair_color.Assign(RawData::GetHairColorFromVer3(+ hair_color_info+ .values[MiiUtil::GetRandomValue<std::size_t>(hair_color_info.values_count)]));+ data.hair_flip.Assign(MiiUtil::GetRandomValue<HairFlip>(HairFlip::Maximum));++ data.eye_type.Assign(+ eye_type_info.values[MiiUtil::GetRandomValue<std::size_t>(eye_type_info.values_count)]);++ const auto eye_rotate_1{gender != Gender::Male ? 4 : 2};+ const auto eye_rotate_2{gender != Gender::Male ? 3 : 4};+ const auto eye_rotate_offset{32 - RawData::EyeRotateLookup[eye_rotate_1] + eye_rotate_2};+ const auto eye_rotate{32 - RawData::EyeRotateLookup[data.eye_type]};++ data.eye_color.Assign(RawData::GetEyeColorFromVer3(+ eye_color_info.values[MiiUtil::GetRandomValue<std::size_t>(eye_color_info.values_count)]));+ data.eye_scale.Assign(4);+ data.eye_aspect.Assign(3);+ data.eye_rotate.Assign(eye_rotate_offset - eye_rotate);+ data.eye_x.Assign(2);+ data.eye_y.Assign(axis_y + 12);++ data.eyebrow_type.Assign(+ eyebrow_type_info+ .values[MiiUtil::GetRandomValue<std::size_t>(eyebrow_type_info.values_count)]);++ const auto eyebrow_rotate_1{race == Race::Asian ? 6 : 0};+ const auto eyebrow_y{race == Race::Asian ? 9 : 10};+ const auto eyebrow_rotate_offset{32 - RawData::EyebrowRotateLookup[eyebrow_rotate_1] + 6};+ const auto eyebrow_rotate{+ 32 - RawData::EyebrowRotateLookup[static_cast<std::size_t>(data.eyebrow_type.Value())]};++ data.eyebrow_color.Assign(data.hair_color);+ data.eyebrow_scale.Assign(4);+ data.eyebrow_aspect.Assign(3);+ data.eyebrow_rotate.Assign(eyebrow_rotate_offset - eyebrow_rotate);+ data.eyebrow_x.Assign(2);+ data.eyebrow_y.Assign(axis_y + eyebrow_y);++ const auto nose_scale{gender == Gender::Female ? 3 : 4};++ data.nose_type.Assign(+ nose_type_info.values[MiiUtil::GetRandomValue<std::size_t>(nose_type_info.values_count)]);+ data.nose_scale.Assign(nose_scale);+ data.nose_y.Assign(axis_y + 9);++ const auto mouth_color{gender == Gender::Female ? MiiUtil::GetRandomValue<int>(4) : 0};++ data.mouth_type.Assign(+ mouth_type_info.values[MiiUtil::GetRandomValue<std::size_t>(mouth_type_info.values_count)]);+ data.mouth_color.Assign(RawData::GetMouthColorFromVer3(mouth_color));+ data.mouth_scale.Assign(4);+ data.mouth_aspect.Assign(3);+ data.mouth_y.Assign(axis_y + 13);++ data.beard_color.Assign(data.hair_color);+ data.mustache_scale.Assign(4);++ if (gender == Gender::Male && age != Age::Young && MiiUtil::GetRandomValue<int>(10) < 2) {+ const auto mustache_and_beard_flag{+ MiiUtil::GetRandomValue<BeardAndMustacheFlag>(BeardAndMustacheFlag::All)};++ auto beard_type{BeardType::None};+ auto mustache_type{MustacheType::None};++ if ((mustache_and_beard_flag & BeardAndMustacheFlag::Beard) ==+ BeardAndMustacheFlag::Beard) {+ beard_type = MiiUtil::GetRandomValue<BeardType>(BeardType::Beard1, BeardType::Beard5);+ }++ if ((mustache_and_beard_flag & BeardAndMustacheFlag::Mustache) ==+ BeardAndMustacheFlag::Mustache) {+ mustache_type = MiiUtil::GetRandomValue<MustacheType>(MustacheType::Mustache1,+ MustacheType::Mustache5);+ }++ data.mustache_type.Assign(mustache_type);+ data.beard_type.Assign(beard_type);+ data.mustache_y.Assign(10);+ } else {+ data.mustache_type.Assign(MustacheType::None);+ data.beard_type.Assign(BeardType::None);+ data.mustache_y.Assign(axis_y + 10);+ }++ const auto glasses_type_start{MiiUtil::GetRandomValue<std::size_t>(100)};+ u8 glasses_type{};+ while (glasses_type_start < glasses_type_info.values[glasses_type]) {+ if (++glasses_type >= glasses_type_info.values_count) {+ ASSERT(false);+ break;+ }+ }++ data.glasses_type.Assign(glasses_type);+ data.glasses_color.Assign(RawData::GetGlassColorFromVer3(0));+ data.glasses_scale.Assign(4);+ data.glasses_y.Assign(axis_y + 10);++ data.mole_type.Assign(0);+ data.mole_scale.Assign(4);+ data.mole_x.Assign(2);+ data.mole_y.Assign(20);+}++u32 CoreData::IsValid() const {+ // TODO: Complete this+ return 0;+}++void CoreData::SetFontRegion(FontRegion value) {+ data.font_region.Assign(value);+}++void CoreData::SetFavoriteColor(u8 value) {+ data.favorite_color.Assign(value);+}++void CoreData::SetGender(Gender value) {+ data.gender.Assign(value);+}++void CoreData::SetHeight(u8 value) {+ data.height.Assign(value);+}++void CoreData::SetBuild(u8 value) {+ data.build.Assign(value);+}++void CoreData::SetType(u8 value) {+ data.type.Assign(value);+}++void CoreData::SetRegionMove(u8 value) {+ data.region_move.Assign(value);+}++void CoreData::SetFacelineType(u8 value) {+ data.faceline_type.Assign(value);+}++void CoreData::SetFacelineColor(u8 value) {+ data.faceline_color.Assign(value);+}++void CoreData::SetFacelineWrinkle(u8 value) {+ data.faceline_wrinkle.Assign(value);+}++void CoreData::SetFacelineMake(u8 value) {+ data.faceline_makeup.Assign(value);+}++void CoreData::SetHairType(u8 value) {+ data.hair_type.Assign(value);+}++void CoreData::SetHairColor(u8 value) {+ data.hair_color.Assign(value);+}++void CoreData::SetHairFlip(HairFlip value) {+ data.hair_flip.Assign(value);+}++void CoreData::SetEyeType(u8 value) {+ data.eye_type.Assign(value);+}++void CoreData::SetEyeColor(u8 value) {+ data.eye_color.Assign(value);+}++void CoreData::SetEyeScale(u8 value) {+ data.eye_scale.Assign(value);+}++void CoreData::SetEyeAspect(u8 value) {+ data.eye_aspect.Assign(value);+}++void CoreData::SetEyeRotate(u8 value) {+ data.eye_rotate.Assign(value);+}++void CoreData::SetEyeX(u8 value) {+ data.eye_x.Assign(value);+}++void CoreData::SetEyeY(u8 value) {+ data.eye_y.Assign(value);+}++void CoreData::SetEyebrowType(u8 value) {+ data.eyebrow_type.Assign(value);+}++void CoreData::SetEyebrowColor(u8 value) {+ data.eyebrow_color.Assign(value);+}++void CoreData::SetEyebrowScale(u8 value) {+ data.eyebrow_scale.Assign(value);+}++void CoreData::SetEyebrowAspect(u8 value) {+ data.eyebrow_aspect.Assign(value);+}++void CoreData::SetEyebrowRotate(u8 value) {+ data.eyebrow_rotate.Assign(value);+}++void CoreData::SetEyebrowX(u8 value) {+ data.eyebrow_x.Assign(value);+}++void CoreData::SetEyebrowY(u8 value) {+ data.eyebrow_y.Assign(value);+}++void CoreData::SetNoseType(u8 value) {+ data.nose_type.Assign(value);+}++void CoreData::SetNoseScale(u8 value) {+ data.nose_scale.Assign(value);+}++void CoreData::SetNoseY(u8 value) {+ data.nose_y.Assign(value);+}++void CoreData::SetMouthType(u8 value) {+ data.mouth_type.Assign(value);+}++void CoreData::SetMouthColor(u8 value) {+ data.mouth_color.Assign(value);+}++void CoreData::SetMouthScale(u8 value) {+ data.mouth_scale.Assign(value);+}++void CoreData::SetMouthAspect(u8 value) {+ data.mouth_aspect.Assign(value);+}++void CoreData::SetMouthY(u8 value) {+ data.mouth_y.Assign(value);+}++void CoreData::SetBeardColor(u8 value) {+ data.beard_color.Assign(value);+}++void CoreData::SetBeardType(BeardType value) {+ data.beard_type.Assign(value);+}++void CoreData::SetMustacheType(MustacheType value) {+ data.mustache_type.Assign(value);+}++void CoreData::SetMustacheScale(u8 value) {+ data.mustache_scale.Assign(value);+}++void CoreData::SetMustacheY(u8 value) {+ data.mustache_y.Assign(value);+}++void CoreData::SetGlassType(u8 value) {+ data.glasses_type.Assign(value);+}++void CoreData::SetGlassColor(u8 value) {+ data.glasses_color.Assign(value);+}++void CoreData::SetGlassScale(u8 value) {+ data.glasses_scale.Assign(value);+}++void CoreData::SetGlassY(u8 value) {+ data.glasses_y.Assign(value);+}++void CoreData::SetMoleType(u8 value) {+ data.mole_type.Assign(value);+}++void CoreData::SetMoleScale(u8 value) {+ data.mole_scale.Assign(value);+}++void CoreData::SetMoleX(u8 value) {+ data.mole_x.Assign(value);+}++void CoreData::SetMoleY(u8 value) {+ data.mole_y.Assign(value);+}++void CoreData::SetNickname(Nickname nickname) {+ name = nickname;+}++u8 CoreData::GetFavoriteColor() const {+ return static_cast<u8>(data.favorite_color.Value());+}++u8 CoreData::GetGender() const {+ return static_cast<u8>(data.gender.Value());+}++u8 CoreData::GetHeight() const {+ return static_cast<u8>(data.height.Value());+}++u8 CoreData::GetBuild() const {+ return static_cast<u8>(data.build.Value());+}++u8 CoreData::GetType() const {+ return static_cast<u8>(data.type.Value());+}++u8 CoreData::GetRegionMove() const {+ return static_cast<u8>(data.region_move.Value());+}++u8 CoreData::GetFacelineType() const {+ return static_cast<u8>(data.faceline_type.Value());+}++u8 CoreData::GetFacelineColor() const {+ return static_cast<u8>(data.faceline_color.Value());+}++u8 CoreData::GetFacelineWrinkle() const {+ return static_cast<u8>(data.faceline_wrinkle.Value());+}++u8 CoreData::GetFacelineMake() const {+ return static_cast<u8>(data.faceline_makeup.Value());+}++u8 CoreData::GetHairType() const {+ return static_cast<u8>(data.hair_type.Value());+}++u8 CoreData::GetHairColor() const {+ return static_cast<u8>(data.hair_color.Value());+}++u8 CoreData::GetHairFlip() const {+ return static_cast<u8>(data.hair_flip.Value());+}++u8 CoreData::GetEyeType() const {+ return static_cast<u8>(data.eye_type.Value());+}++u8 CoreData::GetEyeColor() const {+ return static_cast<u8>(data.eye_color.Value());+}++u8 CoreData::GetEyeScale() const {+ return static_cast<u8>(data.eye_scale.Value());+}++u8 CoreData::GetEyeAspect() const {+ return static_cast<u8>(data.eye_aspect.Value());+}++u8 CoreData::GetEyeRotate() const {+ return static_cast<u8>(data.eye_rotate.Value());+}++u8 CoreData::GetEyeX() const {+ return static_cast<u8>(data.eye_x.Value());+}++u8 CoreData::GetEyeY() const {+ return static_cast<u8>(data.eye_y.Value());+}++u8 CoreData::GetEyebrowType() const {+ return static_cast<u8>(data.eyebrow_type.Value());+}++u8 CoreData::GetEyebrowColor() const {+ return static_cast<u8>(data.eyebrow_color.Value());+}++u8 CoreData::GetEyebrowScale() const {+ return static_cast<u8>(data.eyebrow_scale.Value());+}++u8 CoreData::GetEyebrowAspect() const {+ return static_cast<u8>(data.eyebrow_aspect.Value());+}++u8 CoreData::GetEyebrowRotate() const {+ return static_cast<u8>(data.eyebrow_rotate.Value());+}++u8 CoreData::GetEyebrowX() const {+ return static_cast<u8>(data.eyebrow_x.Value());+}++u8 CoreData::GetEyebrowY() const {+ return static_cast<u8>(data.eyebrow_y.Value());+}++u8 CoreData::GetNoseType() const {+ return static_cast<u8>(data.nose_type.Value());+}++u8 CoreData::GetNoseScale() const {+ return static_cast<u8>(data.nose_scale.Value());+}++u8 CoreData::GetNoseY() const {+ return static_cast<u8>(data.nose_y.Value());+}++u8 CoreData::GetMouthType() const {+ return static_cast<u8>(data.mouth_type.Value());+}++u8 CoreData::GetMouthColor() const {+ return static_cast<u8>(data.mouth_color.Value());+}++u8 CoreData::GetMouthScale() const {+ return static_cast<u8>(data.mouth_scale.Value());+}++u8 CoreData::GetMouthAspect() const {+ return static_cast<u8>(data.mouth_aspect.Value());+}++u8 CoreData::GetMouthY() const {+ return static_cast<u8>(data.mouth_y.Value());+}++u8 CoreData::GetBeardColor() const {+ return static_cast<u8>(data.beard_color.Value());+}++u8 CoreData::GetBeardType() const {+ return static_cast<u8>(data.beard_type.Value());+}++u8 CoreData::GetMustacheType() const {+ return static_cast<u8>(data.mustache_type.Value());+}++u8 CoreData::GetMustacheScale() const {+ return static_cast<u8>(data.mustache_scale.Value());+}++u8 CoreData::GetMustacheY() const {+ return static_cast<u8>(data.mustache_y.Value());+}++u8 CoreData::GetGlassType() const {+ return static_cast<u8>(data.glasses_type.Value());+}++u8 CoreData::GetGlassColor() const {+ return static_cast<u8>(data.glasses_color.Value());+}++u8 CoreData::GetGlassScale() const {+ return static_cast<u8>(data.glasses_scale.Value());+}++u8 CoreData::GetGlassY() const {+ return static_cast<u8>(data.glasses_y.Value());+}++u8 CoreData::GetMoleType() const {+ return static_cast<u8>(data.mole_type.Value());+}++u8 CoreData::GetMoleScale() const {+ return static_cast<u8>(data.mole_scale.Value());+}++u8 CoreData::GetMoleX() const {+ return static_cast<u8>(data.mole_x.Value());+}++u8 CoreData::GetMoleY() const {+ return static_cast<u8>(data.mole_y.Value());+}++Nickname CoreData::GetNickname() const {+ return name;+}++Nickname CoreData::GetDefaultNickname() const {+ return {u'n', u'o', u' ', u'n', u'a', u'm', u'e'};+}++Nickname CoreData::GetInvalidNickname() const {+ return {u'?', u'?', u' ', u'?'};+}++} // namespace Service::Miidiff --git a/src/core/hle/service/mii/types/core_data.h b/src/core/hle/service/mii/types/core_data.hindex 9dd7a53806..76daf4e6e8 100644--- a/src/core/hle/service/mii/types/core_data.h+++ b/src/core/hle/service/mii/types/core_data.h@@ -96,7 +96,116 @@ static_assert(sizeof(StoreDataBitFields) == 0x1c, "StoreDataBitFields has incorrstatic_assert(std::is_trivially_copyable_v<StoreDataBitFields>,"StoreDataBitFields is not trivially copyable.");-struct CoreData {+class CoreData {+public:+ void SetDefault();+ void BuildRandom(Age age, Gender gender, Race race);++ u32 IsValid() const;++ void SetFontRegion(FontRegion value);+ void SetFavoriteColor(u8 value);+ void SetGender(Gender value);+ void SetHeight(u8 value);+ void SetBuild(u8 value);+ void SetType(u8 value);+ void SetRegionMove(u8 value);+ void SetFacelineType(u8 value);+ void SetFacelineColor(u8 value);+ void SetFacelineWrinkle(u8 value);+ void SetFacelineMake(u8 value);+ void SetHairType(u8 value);+ void SetHairColor(u8 value);+ void SetHairFlip(HairFlip value);+ void SetEyeType(u8 value);+ void SetEyeColor(u8 value);+ void SetEyeScale(u8 value);+ void SetEyeAspect(u8 value);+ void SetEyeRotate(u8 value);+ void SetEyeX(u8 value);+ void SetEyeY(u8 value);+ void SetEyebrowType(u8 value);+ void SetEyebrowColor(u8 value);+ void SetEyebrowScale(u8 value);+ void SetEyebrowAspect(u8 value);+ void SetEyebrowRotate(u8 value);+ void SetEyebrowX(u8 value);+ void SetEyebrowY(u8 value);+ void SetNoseType(u8 value);+ void SetNoseScale(u8 value);+ void SetNoseY(u8 value);+ void SetMouthType(u8 value);+ void SetMouthColor(u8 value);+ void SetMouthScale(u8 value);+ void SetMouthAspect(u8 value);+ void SetMouthY(u8 value);+ void SetBeardColor(u8 value);+ void SetBeardType(BeardType value);+ void SetMustacheType(MustacheType value);+ void SetMustacheScale(u8 value);+ void SetMustacheY(u8 value);+ void SetGlassType(u8 value);+ void SetGlassColor(u8 value);+ void SetGlassScale(u8 value);+ void SetGlassY(u8 value);+ void SetMoleType(u8 value);+ void SetMoleScale(u8 value);+ void SetMoleX(u8 value);+ void SetMoleY(u8 value);+ void SetNickname(Nickname nickname);++ u8 GetFavoriteColor() const;+ u8 GetGender() const;+ u8 GetHeight() const;+ u8 GetBuild() const;+ u8 GetType() const;+ u8 GetRegionMove() const;+ u8 GetFacelineType() const;+ u8 GetFacelineColor() const;+ u8 GetFacelineWrinkle() const;+ u8 GetFacelineMake() const;+ u8 GetHairType() const;+ u8 GetHairColor() const;+ u8 GetHairFlip() const;+ u8 GetEyeType() const;+ u8 GetEyeColor() const;+ u8 GetEyeScale() const;+ u8 GetEyeAspect() const;+ u8 GetEyeRotate() const;+ u8 GetEyeX() const;+ u8 GetEyeY() const;+ u8 GetEyebrowType() const;+ u8 GetEyebrowColor() const;+ u8 GetEyebrowScale() const;+ u8 GetEyebrowAspect() const;+ u8 GetEyebrowRotate() const;+ u8 GetEyebrowX() const;+ u8 GetEyebrowY() const;+ u8 GetNoseType() const;+ u8 GetNoseScale() const;+ u8 GetNoseY() const;+ u8 GetMouthType() const;+ u8 GetMouthColor() const;+ u8 GetMouthScale() const;+ u8 GetMouthAspect() const;+ u8 GetMouthY() const;+ u8 GetBeardColor() const;+ u8 GetBeardType() const;+ u8 GetMustacheType() const;+ u8 GetMustacheScale() const;+ u8 GetMustacheY() const;+ u8 GetGlassType() const;+ u8 GetGlassColor() const;+ u8 GetGlassScale() const;+ u8 GetGlassY() const;+ u8 GetMoleType() const;+ u8 GetMoleScale() const;+ u8 GetMoleX() const;+ u8 GetMoleY() const;+ Nickname GetNickname() const;+ Nickname GetDefaultNickname() const;+ Nickname GetInvalidNickname() const;+StoreDataBitFields data{};Nickname name{};};diff --git a/src/core/hle/service/mii/types/store_data.cpp b/src/core/hle/service/mii/types/store_data.cppindex aadc0e1afd..459e8699fc 100644--- a/src/core/hle/service/mii/types/store_data.cpp+++ b/src/core/hle/service/mii/types/store_data.cpp@@ -1,6 +1,20 @@// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project// SPDX-License-Identifier: GPL-2.0-or-later+#include "core/hle/service/mii/mii_util.h"#include "core/hle/service/mii/types/store_data.h"-namespace Service::Mii {} // namespace Service::Mii+namespace Service::Mii {+StoreData::StoreData() = default;++StoreData::StoreData(const Nickname& name, const StoreDataBitFields& bit_fields,+ const Common::UUID& user_id) {+ core_data.name = name;+ create_id = Common::UUID::MakeRandomRFC4122V4();++ core_data.data = bit_fields;+ data_crc = MiiUtil::CalculateCrc16(&core_data.data, sizeof(core_data.data));+ device_crc = MiiUtil::CalculateCrc16(&user_id, sizeof(Common::UUID));+}++} // namespace Service::Miidiff --git a/src/core/hle/service/mii/types/store_data.h b/src/core/hle/service/mii/types/store_data.hindex 54a263b056..be69509672 100644--- a/src/core/hle/service/mii/types/store_data.h+++ b/src/core/hle/service/mii/types/store_data.h@@ -8,7 +8,8 @@namespace Service::Mii {-struct StoreData {+class StoreData {+public:StoreData();StoreData(const Nickname& name, const StoreDataBitFields& bit_fields,const Common::UUID& user_id);