VERY experimental Nintendo Switch 2 emulator
C++
service: mii: Fix reported bugs
german7724eb40cb709d
diff --git a/src/core/hle/service/am/applets/applet_mii_edit.cpp b/src/core/hle/service/am/applets/applet_mii_edit.cppindex ff77830d25..50adc7c02e 100644--- a/src/core/hle/service/am/applets/applet_mii_edit.cpp+++ b/src/core/hle/service/am/applets/applet_mii_edit.cpp@@ -145,6 +145,8 @@ void MiiEdit::MiiEditOutput(MiiEditResult result, s32 index) {.index{index},};+ LOG_INFO(Input, "called, result={}, index={}", result, index);+std::vector<u8> out_data(sizeof(MiiEditAppletOutput));std::memcpy(out_data.data(), &applet_output, sizeof(MiiEditAppletOutput));diff --git a/src/core/hle/service/mii/mii_database_manager.cpp b/src/core/hle/service/mii/mii_database_manager.cppindex c39898594a..0080b67051 100644--- a/src/core/hle/service/mii/mii_database_manager.cpp+++ b/src/core/hle/service/mii/mii_database_manager.cpp@@ -168,7 +168,7 @@ Result DatabaseManager::FindIndex(s32& out_index, const Common::UUID& create_id,return ResultSuccess;}- for (std::size_t i = 0; i <= index; ++i) {+ for (std::size_t i = 0; i < index; ++i) {if (database.Get(i).IsSpecial()) {continue;}diff --git a/src/core/hle/service/mii/types/char_info.cpp b/src/core/hle/service/mii/types/char_info.cppindex c82186c73a..e90124af4c 100644--- a/src/core/hle/service/mii/types/char_info.cpp+++ b/src/core/hle/service/mii/types/char_info.cpp@@ -37,7 +37,7 @@ void CharInfo::SetFromStoreData(const StoreData& store_data) {eyebrow_aspect = store_data.GetEyebrowAspect();eyebrow_rotate = store_data.GetEyebrowRotate();eyebrow_x = store_data.GetEyebrowX();- eyebrow_y = store_data.GetEyebrowY();+ eyebrow_y = store_data.GetEyebrowY() + 3;nose_type = store_data.GetNoseType();nose_scale = store_data.GetNoseScale();nose_y = store_data.GetNoseY();diff --git a/src/core/hle/service/mii/types/core_data.cpp b/src/core/hle/service/mii/types/core_data.cppindex 1068031e32..970c748cad 100644--- a/src/core/hle/service/mii/types/core_data.cpp+++ b/src/core/hle/service/mii/types/core_data.cpp@@ -113,7 +113,7 @@ void CoreData::BuildRandom(Age age, Gender gender, Race race) {.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_y{race == Race::Asian ? 6 : 7};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())]};diff --git a/src/core/hle/service/nfc/common/device.cpp b/src/core/hle/service/nfc/common/device.cppindex 05951d8cbb..68c407f810 100644--- a/src/core/hle/service/nfc/common/device.cpp+++ b/src/core/hle/service/nfc/common/device.cpp@@ -1374,7 +1374,7 @@ NFP::AmiiboName NfcDevice::GetAmiiboName(const NFP::AmiiboSettings& settings) co// Convert from utf16 to utf8const auto amiibo_name_utf8 = Common::UTF16ToUTF8(settings_amiibo_name.data());- memcpy(amiibo_name.data(), amiibo_name_utf8.data(), amiibo_name_utf8.size() - 1);+ memcpy(amiibo_name.data(), amiibo_name_utf8.data(), amiibo_name_utf8.size());return amiibo_name;}