Always set random mii default names

XorTroll · Aug 19, 2023 · 506e141 · 506e141
1 parent 2e242d4
commit 506e141
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/emuiibo/Cargo.lock b/emuiibo/Cargo.lock
diff --git a/emuiibo/src/amiibo/fmt.rs b/emuiibo/src/amiibo/fmt.rs
@@ -150,8 +150,6 @@ impl VirtualAmiiboAreaInfo {
     }
 }
 
-const DEFAULT_MII_NAME: &'static str = "emuiibo";
-
 pub fn generate_areas_json(path: String) -> Result<Option<nfp::AccessId>> {
     let mut access_ids: Vec<nfp::AccessId> = Vec::new();
 
@@ -237,8 +235,6 @@ impl VirtualAmiibo {
         }
         else {
             let mut random_mii = miiext::generate_random_mii()?;
-            random_mii.name.set_str(DEFAULT_MII_NAME)?;
-
             let mut mii_charinfo_file = fs::open_file(mii_charinfo_path, fs::FileOpenOption::Create() | fs::FileOpenOption::Write() | fs::FileOpenOption::Append())?;
             mii_charinfo_file.write_val(&random_mii)?;
             Ok(random_mii)

diff --git a/emuiibo/src/miiext.rs b/emuiibo/src/miiext.rs
@@ -41,9 +41,14 @@ pub fn finalize() {
     }
 }
 
+const DEFAULT_MII_NAME: &'static str = "emuiibo";
+
 #[inline]
 pub fn generate_random_mii() -> Result<mii::CharInfo> {
-    get_database_service()?.get().build_random(sf::EnumAsPrimitiveType::from(mii::Age::All), sf::EnumAsPrimitiveType::from(mii::Gender::All), sf::EnumAsPrimitiveType::from(mii::Race::All))
+    let mut char_info = get_database_service()?.get().build_random(sf::EnumAsPrimitiveType::from(mii::Age::All), sf::EnumAsPrimitiveType::from(mii::Gender::All), sf::EnumAsPrimitiveType::from(mii::Race::All))?;
+    // Default name is "no name", use our own default instead
+    char_info.name.set_str(DEFAULT_MII_NAME)?;
+    Ok(char_info)
 }
 
 const MII_SOURCE_FLAG: mii::SourceFlag = mii::SourceFlag::Database();