summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar german772023-09-05 01:17:06 -0600
committerGravatar german772023-09-05 01:17:06 -0600
commitba4e5068bc2844dc6c5becdb2f0a17dfccad6c9a (patch)
treecc851c690b4b80c807e118c722110a3ec212978b
parentMerge pull request #11427 from zhaobot/tx-update-20230901020727 (diff)
downloadyuzu-ba4e5068bc2844dc6c5becdb2f0a17dfccad6c9a.tar.gz
yuzu-ba4e5068bc2844dc6c5becdb2f0a17dfccad6c9a.tar.xz
yuzu-ba4e5068bc2844dc6c5becdb2f0a17dfccad6c9a.zip
service: mii: Fix default mii database
Diffstat
-rw-r--r--src/core/hle/service/mii/mii_manager.cpp2
-rw-r--r--src/core/hle/service/mii/raw_data.cpp104
-rw-r--r--src/core/hle/service/mii/raw_data.h2
3 files changed, 3 insertions, 105 deletions
diff --git a/src/core/hle/service/mii/mii_manager.cpp b/src/core/hle/service/mii/mii_manager.cpp
index 46125d473..6b966f20d 100644
--- a/src/core/hle/service/mii/mii_manager.cpp
+++ b/src/core/hle/service/mii/mii_manager.cpp
@@ -21,7 +21,7 @@ constexpr Result ERROR_CANNOT_FIND_ENTRY{ErrorModule::Mii, 4};
21constexpr std::size_t BaseMiiCount{2}; 21constexpr std::size_t BaseMiiCount{2};
22constexpr std::size_t DefaultMiiCount{RawData::DefaultMii.size()}; 22constexpr std::size_t DefaultMiiCount{RawData::DefaultMii.size()};
23 23
24constexpr MiiStoreData::Name DefaultMiiName{u'y', u'u', u'z', u'u'}; 24constexpr MiiStoreData::Name DefaultMiiName{u'n', u'o', u' ', u'n', u'a', u'm', u'e'};
25constexpr std::array<u8, 8> HairColorLookup{8, 1, 2, 3, 4, 5, 6, 7}; 25constexpr std::array<u8, 8> HairColorLookup{8, 1, 2, 3, 4, 5, 6, 7};
26constexpr std::array<u8, 6> EyeColorLookup{8, 9, 10, 11, 12, 13}; 26constexpr std::array<u8, 6> EyeColorLookup{8, 9, 10, 11, 12, 13};
27constexpr std::array<u8, 5> MouthColorLookup{19, 20, 21, 22, 23}; 27constexpr std::array<u8, 5> MouthColorLookup{19, 20, 21, 22, 23};
diff --git a/src/core/hle/service/mii/raw_data.cpp b/src/core/hle/service/mii/raw_data.cpp
index 1442280c8..80369cdb0 100644
--- a/src/core/hle/service/mii/raw_data.cpp
+++ b/src/core/hle/service/mii/raw_data.cpp
@@ -5,109 +5,7 @@
5 5
6namespace Service::Mii::RawData { 6namespace Service::Mii::RawData {
7 7
8const std::array<Service::Mii::DefaultMii, 8> DefaultMii{ 8const std::array<Service::Mii::DefaultMii, 6> DefaultMii{
9 Service::Mii::DefaultMii{
10 .face_type = 0,
11 .face_color = 0,
12 .face_wrinkle = 0,
13 .face_makeup = 0,
14 .hair_type = 33,
15 .hair_color = 1,
16 .hair_flip = 0,
17 .eye_type = 2,
18 .eye_color = 0,
19 .eye_scale = 4,
20 .eye_aspect = 3,
21 .eye_rotate = 4,
22 .eye_x = 2,
23 .eye_y = 12,
24 .eyebrow_type = 6,
25 .eyebrow_color = 1,
26 .eyebrow_scale = 4,
27 .eyebrow_aspect = 3,
28 .eyebrow_rotate = 6,
29 .eyebrow_x = 2,
30 .eyebrow_y = 10,
31 .nose_type = 1,
32 .nose_scale = 4,
33 .nose_y = 9,
34 .mouth_type = 23,
35 .mouth_color = 0,
36 .mouth_scale = 4,
37 .mouth_aspect = 3,
38 .mouth_y = 13,
39 .mustache_type = 0,
40 .beard_type = 0,
41 .beard_color = 0,
42 .mustache_scale = 4,
43 .mustache_y = 10,
44 .glasses_type = 0,
45 .glasses_color = 0,
46 .glasses_scale = 4,
47 .glasses_y = 10,
48 .mole_type = 0,
49 .mole_scale = 4,
50 .mole_x = 2,
51 .mole_y = 20,
52 .height = 64,
53 .weight = 64,
54 .gender = Gender::Male,
55 .favorite_color = 0,
56 .region = 0,
57 .font_region = FontRegion::Standard,
58 .type = 0,
59 },
60 Service::Mii::DefaultMii{
61 .face_type = 0,
62 .face_color = 0,
63 .face_wrinkle = 0,
64 .face_makeup = 0,
65 .hair_type = 12,
66 .hair_color = 1,
67 .hair_flip = 0,
68 .eye_type = 4,
69 .eye_color = 0,
70 .eye_scale = 4,
71 .eye_aspect = 3,
72 .eye_rotate = 3,
73 .eye_x = 2,
74 .eye_y = 12,
75 .eyebrow_type = 0,
76 .eyebrow_color = 1,
77 .eyebrow_scale = 4,
78 .eyebrow_aspect = 3,
79 .eyebrow_rotate = 6,
80 .eyebrow_x = 2,
81 .eyebrow_y = 10,
82 .nose_type = 1,
83 .nose_scale = 4,
84 .nose_y = 9,
85 .mouth_type = 23,
86 .mouth_color = 0,
87 .mouth_scale = 4,
88 .mouth_aspect = 3,
89 .mouth_y = 13,
90 .mustache_type = 0,
91 .beard_type = 0,
92 .beard_color = 0,
93 .mustache_scale = 4,
94 .mustache_y = 10,
95 .glasses_type = 0,
96 .glasses_color = 0,
97 .glasses_scale = 4,
98 .glasses_y = 10,
99 .mole_type = 0,
100 .mole_scale = 4,
101 .mole_x = 2,
102 .mole_y = 20,
103 .height = 64,
104 .weight = 64,
105 .gender = Gender::Female,
106 .favorite_color = 0,
107 .region = 0,
108 .font_region = FontRegion::Standard,
109 .type = 0,
110 },
111 Service::Mii::DefaultMii{ 9 Service::Mii::DefaultMii{
112 .face_type = 0, 10 .face_type = 0,
113 .face_color = 4, 11 .face_color = 4,
diff --git a/src/core/hle/service/mii/raw_data.h b/src/core/hle/service/mii/raw_data.h
index c2bec68d4..5b81b013b 100644
--- a/src/core/hle/service/mii/raw_data.h
+++ b/src/core/hle/service/mii/raw_data.h
@@ -9,7 +9,7 @@
9 9
10namespace Service::Mii::RawData { 10namespace Service::Mii::RawData {
11 11
12extern const std::array<Service::Mii::DefaultMii, 8> DefaultMii; 12extern const std::array<Service::Mii::DefaultMii, 6> DefaultMii;
13extern const std::array<Service::Mii::RandomMiiData4, 18> RandomMiiFaceline; 13extern const std::array<Service::Mii::RandomMiiData4, 18> RandomMiiFaceline;
14extern const std::array<Service::Mii::RandomMiiData3, 6> RandomMiiFacelineColor; 14extern const std::array<Service::Mii::RandomMiiData3, 6> RandomMiiFacelineColor;
15extern const std::array<Service::Mii::RandomMiiData4, 18> RandomMiiFacelineWrinkle; 15extern const std::array<Service::Mii::RandomMiiData4, 18> RandomMiiFacelineWrinkle;
HIC SVNT DRACONES