miijs 2.4.1 → 2.5.0

package/.github/workflows/npm-publish-github-packages.yml

@@ -0,0 +1,36 @@
+# This workflow will run tests using node and then publish a package to GitHub Packages when a release is created
+# For more information see: https://docs.github.com/en/actions/publishing-packages/publishing-nodejs-packages
+
+name: Node.js Package
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - run: npm ci
+      - run: npm test
+
+  publish-gpr:
+    needs: build
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          registry-url: https://npm.pkg.github.com/
+      - run: npm ci
+      - run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}

package/README.md

@@ -50,6 +50,7 @@ MiiJS is a complete and comprehensive Mii library for reading, converting, modif
 - **`miiWeightToRealWeight(miiWeight)`** - Converts Mii weight value (0-127) to real-world weight values. Returns `{pounds, kilograms}`.
 - **`imperialHeightWeightToMiiWeight(heightInches, weightLbs)`** - Converts real-world imperial measurements to Mii weight values.
 - **`metricHeightWeightToMiiWeight(heightCentimeters, weightKilograms)`** - Converts real-world metric measurements to Mii weight values.
+- **`miiIdToTimestamp(miiId, consoleMiiIdIsFrom)`** - Converts the Mii ID into a JS Date/Timestamp.
 
 ### Other Functions
 - **`makeChild(miiJson1, miiJson2, options?)`** - Returns an array of 6 different Mii JSONs, which represent a child generated from the two parent Miis passed to the function at different stages of life. This is somewhat experimental, but should be accurate to my current knowledge. You can pass any or none of { name: "The Name", creatorName: "The Name", favoriteColor: 0-11, gender: 0-1/\*0:Male, 1:Female\*/ }
@@ -62,12 +63,11 @@ MiiJS is a complete and comprehensive Mii library for reading, converting, modif
 ```javascript
 const miijs = require('miijs');
 
-// Read from file path
+// Read from file path for image, or buffer of the data - encrypted or decrypted
 const miiJson = await miijs.read3DSQR('./example3DSQR.jpg');
 console.log('Mii Name:', miiJson.meta.name);
-console.log('Favorite Color:', miiJson.general.favoriteColor);
 
-// Or get just the decrypted binary data
+// Get the decrypted binary data
 const decryptedBin = await miijs.read3DSQR('./example3DSQR.jpg', true);
 console.log('Decrypted binary length:', decryptedBin.length);
 ```
@@ -79,7 +79,6 @@ const miijs = require('miijs');
 // Read from file path
 const miiJson = await miijs.readWiiBin('./exampleWii.bin');
 console.log('Mii Name:', miiJson.meta.name);
-console.log('Gender:', miiJson.general.gender === 0 ? 'Male' : 'Female');
 
 // Or pass binary data directly
 const fs = require('fs');
@@ -94,13 +93,10 @@ const miijs = require('miijs');
 // First, read or create a Mii JSON
 const miiJson = await miijs.read3DSQR('./example3DSQR.jpg');
 
-// Write QR code with Studio rendering (no FFLResHigh.dat needed)
+// Write QR code. If FFLResHigh.dat is in the same directory, will be used automatically. You can pass a buffer containing FFLResHigh.dat as a fourth parameter. Will use Studio rendering instead of local without FFLResHigh.dat.
 await miijs.write3DSQR(miiJson, './output_qr.jpg');
-
-// Or with local rendering (requires FFLResHigh.dat in project root or passed as buffer)
-const fs = require('fs');
-const fflRes = fs.readFileSync('./FFLResHigh.dat');
-await miijs.write3DSQR(miiJson, './output_qr_local.jpg', fflRes);
+//The third parameter asks MiiJS to return an encrypted 3DS data instead
+const encryptedData=await miijs.write3DSQR(miiJson,'',true);
 ```
 
 ## Writing a Wii Mii Binary
@@ -108,11 +104,8 @@ await miijs.write3DSQR(miiJson, './output_qr_local.jpg', fflRes);
 const miijs = require('miijs');
 const fs = require('fs');
 
-// Read a Mii (from any format)
-const miiJson = await miijs.read3DSQR('./example3DSQR.jpg');
-
-// Convert to Wii format first if needed
-const wiiMii = miijs.convertMii(miiJson, 'wii');
+// Read a Mii
+const miiJson = await miijs.readWiiBin('./exampleWii.bin');
 
 // Write to file
 await miijs.writeWiiBin(wiiMii, './output_wii.bin');
@@ -127,16 +120,16 @@ fs.writeFileSync('./manual_write.bin', buffer);
 const miijs = require('miijs');
 
 // Read a 3DS Mii
-const ds3Mii = await miijs.read3DSQR('./example3DSQR.jpg');
+const mii3DS = await miijs.read3DSQR('./example3DSQR.jpg');
 
 // Convert to Wii format
-const wiiMii = miijs.convertMii(ds3Mii, 'wii');
+const miiWii = miijs.convertMii(mii3DS, 'wii');
 
 // Convert back to 3DS
-const backTo3DS = miijs.convertMii(wiiMii, '3ds');
+const backTo3DS = miijs.convertMii(miiWii, '3ds');
 
 // Auto-detect and convert to opposite
-const autoConverted = miijs.convertMii(ds3Mii);
+const autoConverted = miijs.convertMii(mii3DS);
 ```
 
 ## Converting to/from Studio Format
@@ -151,7 +144,6 @@ console.log('Studio URL:', `https://studio.mii.nintendo.com/miis/image.png?data=
 // Convert Studio format back to JSON
 const studioData = '000d142a303f434b717a7b84939ba6b2bbbec5cbc9d0e2ea...';
 const miiFromStudio = miijs.convertStudioToMii(studioData);
-console.log('Converted Mii:', miiFromStudio.meta.name);
 ```
 
 ## Rendering Miis
@@ -162,16 +154,15 @@ const fs = require('fs');
 // Read a Mii
 const miiJson = await miijs.read3DSQR('./example3DSQR.jpg');
 
-// Render using Studio API (simple, no setup needed)
+// Render using Studio API (simple, no setup needed, requires internet access)
 const studioPng = await miijs.renderMiiWithStudio(miiJson);
 fs.writeFileSync('./mii_studio_render.png', studioPng);
 
 // Render locally with full body (requires FFLResHigh.dat)
+// FFLResHigh.dat can be placed in the project directory to automatically use
 const fflRes = fs.readFileSync('./FFLResHigh.dat');
 const localPng = await miijs.renderMii(miiJson, fflRes);
 fs.writeFileSync('./mii_local_render.png', localPng);
-
-// Shirt color comes from miiJson.general.favoriteColor
 ```
 
 ## Working with Amiibos
@@ -183,13 +174,11 @@ const fs = require('fs');
 const amiiboDump = fs.readFileSync('./exampleAmiiboDump.bin');
 
 // Extract the Mii from the Amiibo (returns 92 bytes decrypted)
-const miiData = miijs.extractMiiFromAmiibo(amiiboDump);
-
+let miiData = miijs.extractMiiFromAmiibo(amiiboDump);
 // Convert the raw Mii data to readable JSON
-// (miiData is already decrypted 3DS format)
-const miiJson = miijs.decode3DSMii(miiData); // Note: decode3DSMii not exported, use read3DSQR workflow
+const miiJson = miijs.read3DSQR(miiData);
 
-// Better workflow: Read from QR, get decrypted data, insert into Amiibo
+// Read from QR, get decrypted data, insert into Amiibo
 const qrMiiJson = await miijs.read3DSQR('./example3DSQR.jpg');
 const decryptedMiiData = await miijs.read3DSQR('./example3DSQR.jpg', true);
 
@@ -224,23 +213,28 @@ Object.entries(fullInstructions).forEach(([field, instruction]) => {
 ```javascript
 const miijs = require('miijs');
 
-// Convert Mii height (0-127) to feet/inches
-const heightInfo = miijs.miiHeightToFeetInches(64); // midpoint value
-console.log(`Height: ${heightInfo.feet}'${heightInfo.inches}" (${heightInfo.totalInches} inches)`);
+// Convert Mii height (0-127) to feet/inches and centimeters
+const heightInfo = miijs.miiHeightToMeasurements(64); // midpoint value
+console.log(`Height: ${heightInfo.feet}'${heightInfo.inches}" (${heightInfo.centimeters} cm)`);
 
 // Convert real height to Mii value
-const miiHeightValue = miijs.inchesToMiiHeight(72); // 6'0"
+const miiHeightValue = miijs.inchesToMiiHeight(72);
 console.log('Mii height value for 6\'0":', miiHeightValue);
 
-// EXPERIMENTAL: Convert real weight to Mii weight
-const heightInches = 69; // 5'9"
-const weightLbs = 160;
-const miiWeightValue = miijs.heightWeightToMiiWeight(heightInches, weightLbs);
+// Convert Mii weight to real weight (requires height)
+const miiHeight = 64;
+const miiWeight = 64;
+const weightInfo = miijs.miiWeightToRealWeight(miiHeight, miiWeight);
+console.log(`Weight: ${weightInfo.pounds.toFixed(1)} lbs (${weightInfo.kilograms} kg)`);
+
+// Convert real weight to Mii weight value
+const heightInches=70;
+const weightLbs = 150;
+const miiWeightValue = miijs.imperialHeightWeightToMiiWeight(heightInches, weightLbs);
 console.log('Mii weight value:', miiWeightValue);
 
-// EXPERIMENTAL: Convert Mii weight to real weight
-const weightInfo = miijs.miiWeightToRealWeight(heightInches, 64);
-console.log(`Weight: ${weightInfo.pounds.toFixed(1)} lbs, BMI: ${weightInfo.bmi.toFixed(1)}`);
+// Or use metric
+const miiWeightMetric = miijs.metricHeightWeightToMiiWeight(175, 72.5);
 ```
 
 ## Creating and Modifying a Mii
@@ -251,10 +245,10 @@ const miijs = require('miijs');
 const miiJson = await miijs.read3DSQR('./example3DSQR.jpg');
 
 // Modify properties
-miiJson.meta.name = 'Custom Name';
-miiJson.general.favoriteColor = 5; // Blue
-miiJson.hair.color = 0; // Black
-miiJson.eyes.color = 2; // Brown
+miiJson.meta.name = 'CustomName';
+miiJson.general.favoriteColor = 5;
+miiJson.hair.color = 0;
+miiJson.eyes.color = 2;
 
 // Make it a Special Mii (3DS only)
 miiJson.meta.type = 'Special';
@@ -287,6 +281,19 @@ for(var i=0;i<child.length;i++){
 }
 ```
 
+## Getting the Time the Mii Was Created From the Mii ID
+```javascript
+const miijs=require('miijs');
+
+//Read miis into JSON 
+const mii3DS=await miijs.read3DSQR('./example_mii.jpg');
+const miiWii=await miijs.readWiiBin('./example_mii.bin');
+
+//Same process for both, returns a JS Date/Timestamp
+console.log(miijs.miiIdToTimestamp(mii3DS.meta.miiId,mii3DS.console));
+console.log(miijs.miiIdToTimestamp(miiWii.meta.miiId,miiWii.console));
+```
+
 <hr>
 
 ## Special Miis
@@ -360,4 +367,4 @@ You can find FFLResHigh using a Wii U with an FTP program installed at `sys/titl
  - **[kazuki-4ys' MiiInfoEditorCTR](https://github.com/kazuki-4ys/kazuki-4ys.github.io/tree/master/web_apps/MiiInfoEditorCTR)** - I repurposed how to decrypt and reencrypt the QR codes from here, including repurposing the asmCrypto.js file in its entirety with very small modifications (it has since been stripped down to only include the functions this library uses). I believe I also modified the code for rendering the Mii using Nintendo's Mii Studio from here as well, though I do not remember for certain.
  - **[ariankordi's FFL.js](https://github.com/ariankordi/FFL.js/)** - Rendering Miis locally would not be possible without this library. Instructions for finding FFLResHigh are also learned from [ariankordi's FFL-Testing repository](https://github.com/ariankordi/FFL-Testing).
  - **[Models Resource](https://models.spriters-resource.com/3ds/systembios/asset/306260/)** - For the bodies used in Mii rendering
- - **[socram8888's Amiitools](https://github.com/socram8888/amiitool)** - I _think_, for the code reverse engineered to help with aspects of Amiibo dump processing. I went through so many iterations in research and coding, there may be other credits due as well but I _think_ this was the only repo actually used for the reverse engineering in the final working code.
+ - **[socram8888's Amiitools](https://github.com/socram8888/amiitool)** - I _think_, for the code reverse engineered to help with aspects of Amiibo dump processing. I went through so many iterations in research and coding, there may be other credits due as well but I _think_ this was the only repo actually used for the reverse engineering in the final working code.

package/index.js

@@ -12,7 +12,6 @@ const httpsLib = require('https');
 const asmCrypto = require("./asmCrypto.js");
 const path = require("path");
 const createGL = require('gl');
-const typeCheat = [1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3];
 const {
     createCharModel, initCharModelTextures,
     initializeFFL, exitFFL, parseHexOrB64ToUint8Array,
@@ -20,6 +19,7 @@ const {
 } = require("./fflWrapper.js");
 const ModuleFFL = require("ffl.js/examples/ffl-emscripten-single-file.js");
 const FFLShaderMaterial = require("ffl.js/FFLShaderMaterial.js");
+const typeCheat = [1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3];
 
 // Typedefs for intellisence
 /** @typedef {import('./types').WiiMii} WiiMii */
@@ -181,7 +181,7 @@ var aes_key = new Uint8Array([0x59, 0xFC, 0x81, 0x7E, 0x64, 0x46, 0xEA, 0x61, 0x
 var pad = new Uint8Array([0, 0, 0, 0]);
 function decodeAesCcm(data) {
     var nonce = Uint8Cat(data.subarray(0, NONCE_LENGTH), pad);
-    var ciphertext = data.subarray(NONCE_LENGTH, 0x70);
+    var ciphertext = data.subarray(NONCE_LENGTH, data.length);
     var plaintext = asmCrypto.AES_CCM.decrypt(ciphertext, aes_key, nonce, undefined, TAG_LENGTH);
     return Uint8Cat(plaintext.subarray(0, NONCE_OFFSET), data.subarray(0, NONCE_LENGTH), plaintext.subarray(NONCE_OFFSET, plaintext.length - 4));
 }
@@ -278,10 +278,28 @@ function convertMii(jsonIn, typeTo) {
             miiTo.beard.mustache.type = 0;
             miiTo.beard.type = 1;
         }
-        if (mii.beard.type > 3) {
-            mii.beard.type = 3;
+        if (miiTo.beard.type > 3) {
+            miiTo.beard.type = 3;
+        }
+
+        //System IDs are only 4 bytes on the Wii
+        if(miiTo.meta.systemId){
+            miiTo.meta.systemId=miiTo.meta.systemId.slice(0,8);
+        }
+
+        if (miiTo.meta.miiId) {
+            const miiIdInt = parseInt(miiTo.meta.miiId.replaceAll(' ', ''), 16);
+            // Extract 28-bit timestamp (bits 0-27), multiply by 2 to get seconds since 2010
+            const secsSince2010 = (miiIdInt & 0x0FFFFFFF) * 2;
+            // Convert to 4-second intervals since 2006
+            const secondsOffset = 126230400; // Seconds between 2006 and 2010
+            const intervals = Math.floor((secsSince2010 + secondsOffset) / 4);
+            // Combine with type bits
+            const typePrefix = miiTo.meta.type === "Special" ? 0b010 : 0b100;
+            miiTo.meta.miiId = ((typePrefix << 29) | intervals).toString(16).toUpperCase().padStart(8, '0');
         }
-        miiTo.console = "wii";
+
+        miiTo.console = "Wii";
     }
     else if (typeFrom === "wii") {
         miiTo.perms.sharing = mii.perms.mingle;
@@ -291,12 +309,9 @@ function convertMii(jsonIn, typeTo) {
         const hairConv = convTables.hairWiiTo3DS[mii.hair.page][mii.hair.type];
         miiTo.hair.page = hairConv[0];
         miiTo.hair.type = hairConv[1];
-        miiTo.hair.color = mii.hair.color;
-        miiTo.hair.flipped = mii.hair.flipped;
 
         // Convert face
         miiTo.face.type = convTables.faceWiiTo3DS[mii.face.type];
-        miiTo.face.color = mii.face.color;
         miiTo.face.makeup = 0;
         miiTo.face.feature = 0;
 
@@ -308,62 +323,27 @@ function convertMii(jsonIn, typeTo) {
             miiTo.face.feature = +convTables.featureWiiTo3DS[mii.face.feature];
         }
 
-        // Convert eyes - preserve page/type structure
-        miiTo.eyes.page = mii.eyes.page;
-        miiTo.eyes.type = mii.eyes.type;
-        miiTo.eyes.color = mii.eyes.color;
-        miiTo.eyes.size = mii.eyes.size;
         miiTo.eyes.squash = 3; // Default for 3DS
-        miiTo.eyes.rotation = mii.eyes.rotation;
-        miiTo.eyes.distanceApart = mii.eyes.distanceApart;
-        miiTo.eyes.yPosition = mii.eyes.yPosition;
-
-        // Convert eyebrows - preserve page/type structure
-        miiTo.eyebrows.page = mii.eyebrows.page;
-        miiTo.eyebrows.type = mii.eyebrows.type;
-        miiTo.eyebrows.color = mii.eyebrows.color;
-        miiTo.eyebrows.size = mii.eyebrows.size;
         miiTo.eyebrows.squash = 3; // Default for 3DS
-        miiTo.eyebrows.rotation = mii.eyebrows.rotation;
-        miiTo.eyebrows.distanceApart = mii.eyebrows.distanceApart;
-        miiTo.eyebrows.yPosition = mii.eyebrows.yPosition;
-
-        // Convert nose - preserve page/type structure
         miiTo.nose.page = mii.nose.page || 0;
-        miiTo.nose.type = mii.nose.type;
-        miiTo.nose.size = mii.nose.size;
-        miiTo.nose.yPosition = mii.nose.yPosition;
-
-        // Convert mouth - preserve page/type structure
-        miiTo.mouth.page = mii.mouth.page;
-        miiTo.mouth.type = mii.mouth.type;
-        miiTo.mouth.color = mii.mouth.color;
-        miiTo.mouth.size = mii.mouth.size;
         miiTo.mouth.squash = 3; // Default for 3DS
-        miiTo.mouth.yPosition = mii.mouth.yPosition;
 
-        // Convert glasses
-        miiTo.glasses.type = mii.glasses.type;
-        miiTo.glasses.color = mii.glasses.color;
-        miiTo.glasses.size = mii.glasses.size;
-        miiTo.glasses.yPosition = mii.glasses.yPosition;
-
-        // Convert beard
-        miiTo.beard.mustache.type = mii.beard.mustache.type;
-        miiTo.beard.mustache.size = mii.beard.mustache.size;
-        miiTo.beard.mustache.yPosition = mii.beard.mustache.yPosition;
-        miiTo.beard.type = mii.beard.type;
-        miiTo.beard.color = mii.beard.color;
-
-        // Convert mole
-        miiTo.mole.on = mii.mole.on;
-        miiTo.mole.size = mii.mole.size;
-        miiTo.mole.xPosition = mii.mole.xPosition;
-        miiTo.mole.yPosition = mii.mole.yPosition;
-
-        // Copy general info
-        miiTo.general = { ...mii.general };
-        miiTo.meta = { ...mii.meta };
+        //System IDs are twice as long on 3DS
+        if(miiTo.meta.systemId){
+            miiTo.meta.systemId=miiTo.meta.systemId.padEnd(16,'0');
+        }
+
+        if (miiTo.meta.miiId) {
+            const miiIdInt = parseInt(miiTo.meta.miiId.replaceAll(' ', ''), 16);
+            // Extract 29-bit timestamp (bits 0-28), multiply by 4 to get seconds since 2006
+            const secsSince2006 = (miiIdInt & 0x1FFFFFFF) * 4;
+            // Convert to 2-second intervals since 2010
+            const secondsOffset = 126230400; // Seconds between 2006 and 2010
+            const intervals = Math.floor((secsSince2006 - secondsOffset) / 2);
+            // Combine with flag bits
+            const flags = miiTo.meta.type === "Special" ? 0b0001 : 0b1001;
+            miiTo.meta.miiId = ((intervals & 0x0FFFFFFF) | (flags << 28)).toString(16).toUpperCase().padStart(8, '0');
+        }
 
         miiTo.console = "3DS";
     }
@@ -604,7 +584,7 @@ async function readWiiBin(binOrPath) {
     }
     thisMii.meta.creatorName = cname.replaceAll("\x00", "");
     thisMii.general.gender = +get(0x00)[1];//0 for Male, 1 for Female
-    thisMii.meta.miiId = parseInt(get(0x18), 2).toString(16) + parseInt(get(0x19), 2).toString(16) + parseInt(get(0x1A), 2).toString(16) + parseInt(get(0x1B), 2).toString(16);
+    thisMii.meta.miiId = data.readUInt32BE(0x18).toString(16).padStart(8, '0');
     switch (thisMii.meta.miiId.slice(0, 3)) {
         case "010":
             thisMii.meta.type = "Special";
@@ -612,11 +592,11 @@ async function readWiiBin(binOrPath) {
         case "110":
             thisMii.meta.type = "Foreign";
             break;
-        default:
+        default://100
             thisMii.meta.type = "Default";
             break;
     }
-    thisMii.meta.systemId = parseInt(get(0x1C), 2).toString(16) + parseInt(get(0x1D), 2).toString(16) + parseInt(get(0x1E), 2).toString(16) + parseInt(get(0x1F), 2).toString(16);
+    thisMii.meta.systemId = data.readUInt32BE(0x1C).toString(16).padStart(8, '0').toUpperCase();
     var temp = get(0x20);
     thisMii.face.type = parseInt(temp.slice(0, 3), 2);//0-7
     thisMii.face.color = parseInt(temp.slice(3, 6), 2);//0-5
@@ -639,12 +619,13 @@ async function readWiiBin(binOrPath) {
     thisMii.general.birthMonth = parseInt(temp.slice(2, 6), 2);
     thisMii.general.birthday = parseInt(temp.slice(6, 8) + temp2.slice(0, 3), 2);
     thisMii.general.favoriteColor = parseInt(temp2.slice(3, 7), 2);//0-11, refer to cols array
+    thisMii.meta.favorited = temp2[7]=="1";
     thisMii.general.height = parseInt(get(0x16), 2);//0-127
     thisMii.general.weight = parseInt(get(0x17), 2);//0-127
-    thisMii.perms.fromCheckMiiOut = get(0x21)[7] === "0" ? false : true;
+    thisMii.perms.fromCheckMiiOut = get(0x21)[7] == "1";
     temp = get(0x34);
     temp2 = get(0x35);
-    thisMii.mole.on = temp[0] === "0" ? false : true;//0 for Off, 1 for On
+    thisMii.mole.on = temp[0] == "1";//0 for Off, 1 for On
     thisMii.mole.size = parseInt(temp.slice(1, 5), 2);//0-8, default 4
     thisMii.mole.xPosition = parseInt(temp2.slice(2, 7), 2);//0-16, Default 2
     thisMii.mole.yPosition = parseInt(temp.slice(5, 8) + temp2.slice(0, 2), 2);//Top to bottom
@@ -653,7 +634,7 @@ async function readWiiBin(binOrPath) {
     thisMii.hair.page = +lookupTables.hairTable["" + parseInt(temp.slice(0, 7), 2)][0] - 1;
     thisMii.hair.type = +convTables.formatTo[lookupTables.hairTable["" + parseInt(temp.slice(0, 7), 2)][2] - 1][lookupTables.hairTable["" + parseInt(temp.slice(0, 7), 2)][1] - 1];//0-71, Needs lookup table
     thisMii.hair.color = parseInt(temp[7] + temp2.slice(0, 2), 2);//0-7, refer to hairCols array
-    thisMii.hair.flipped = temp2[2] === "0" ? false : true;
+    thisMii.hair.flipped = temp2[2] == "1";
     temp = get(0x24);
     temp2 = get(0x25);
     thisMii.eyebrows.page = +lookupTables.eyebrowTable["" + parseInt(temp.slice(0, 5), 2)][0] - 1;
@@ -709,6 +690,14 @@ function decode3DSMii(data) {
         }
     };
     const get = address => getBinaryFromAddress(address, data);
+    miiJson.perms.copying = get(0x01)[7] === "1" ? true : false;
+    const miiIdValue = data.readUInt32BE(0x0C);
+    const systemIdHigh = data.readUInt32BE(0x04);
+    const systemIdLow = data.readUInt32BE(0x08);
+
+    miiJson.meta.type = (miiIdValue & 0x80000000) === 0 ? "Special" : "Default";
+    miiJson.meta.systemId = systemIdHigh.toString(16).padStart(8, '0') + systemIdLow.toString(16).padStart(8, '0');
+    miiJson.meta.miiId = miiIdValue.toString(16).padStart(8, '0');
     var temp = get(0x18);
     var temp2 = get(0x19);
     miiJson.general.birthday = parseInt(temp2.slice(6, 8) + temp.slice(0, 3), 2);
@@ -742,7 +731,6 @@ function decode3DSMii(data) {
     temp = get(0x30);
     miiJson.perms.sharing = temp[7] === "1" ? false : true;
     miiJson.general.favoriteColor = parseInt(temp2.slice(2, 6), 2);
-    miiJson.perms.copying = get(0x01)[7] === "1" ? true : false;
     miiJson.hair.page = lookupTable("hairs", parseInt(get(0x32), 2), true)[0];
     miiJson.hair.type = lookupTable("hairs", parseInt(get(0x32), 2), true)[1];
     miiJson.face.type = lookupTable("faces", parseInt(temp.slice(3, 7), 2), false);
@@ -811,11 +799,10 @@ function decode3DSMii(data) {
     temp2 = get(0x47);
     miiJson.mole.xPosition = parseInt(temp2.slice(6, 8) + temp.slice(0, 3), 2);
     miiJson.mole.yPosition = parseInt(temp2.slice(1, 6), 2);
-    miiJson.meta.type = "Default";//qk, Make this actually retrieve MiiID, SystemID, and Mii type
     miiJson.console = "3DS";
     return miiJson;
 }
-async function read3DSQR(binOrPath, returnDecryptedBin) {
+async function read3DSQR(binOrPath, returnDecryptedBin, returnEncryptedBin) {
     let qrCode;
     if (Buffer.isBuffer(binOrPath)) {//Buffer
         qrCode = binOrPath;
@@ -841,6 +828,9 @@ async function read3DSQR(binOrPath, returnDecryptedBin) {
         });
     }
     if (qrCode) {
+        if (returnEncryptedBin) {
+            return new Uint8Array(qrCode);
+        }
         var data;
         data = Buffer.from(decodeAesCcm(new Uint8Array(qrCode)));
         if (returnDecryptedBin) {
@@ -1245,7 +1235,7 @@ async function writeWiiBin(jsonIn, outPath) {
     miiBin += mii.general.birthMonth.toString(2).padStart(4, "0");
     miiBin += mii.general.birthday.toString(2).padStart(5, "0");
     miiBin += mii.general.favoriteColor.toString(2).padStart(4, "0");
-    miiBin += '0';
+    miiBin += mii.perms.favorited?'1':'0';
     for (var i = 0; i < 10; i++) {
         if (i < mii.meta.name.length) {
             miiBin += mii.meta.name.charCodeAt(i).toString(2).padStart(16, "0");
@@ -1256,23 +1246,33 @@ async function writeWiiBin(jsonIn, outPath) {
     }
     miiBin += mii.general.height.toString(2).padStart(8, "0");
     miiBin += mii.general.weight.toString(2).padStart(8, "0");
-    let miiId = "";
+    let miiTypeIdentifier = "";
     switch (mii.meta.type) {
         case "Special":
-            miiId = "01000110";
+            miiTypeIdentifier = "010";
             break;
         case "Foreign":
-            miiId = "11000110";
+            miiTypeIdentifier = "110";
             break;
         default:
-            miiId = "10001001";
+            miiTypeIdentifier = "100";
             break;
     }
-    for (var i = 0; i < 3; i++) {
-        miiId += Math.floor(Math.random() * 255).toString(2).padStart(8, "0");
+    if (mii.meta.miiId) {
+        let temp = mii.meta.miiId.replaceAll(' ', '').match(/.{1,2}/g).map(b => parseInt(b, 16).toString(2).padStart(8, '0')).join('');
+        miiBin += `${miiTypeIdentifier}${temp.padStart(32, '0').slice(-29)}`; // Take rightmost 29 bits
+    }
+    else {
+        // Calculate the number of 4-second intervals since Jan 1, 2006
+        const miiIdBase = Math.floor((Date.now() - Date.UTC(2006, 0, 1)) / 4000).toString(2).padStart(29, '0');
+        miiBin += `${miiTypeIdentifier}${miiIdBase}`;
+    }
+    if(mii.meta.systemId){
+        miiBin += mii.meta.systemId.replaceAll(' ','').match(/.{1,2}/g).map(b=>parseInt(b,16).toString(2).padStart(8,'0')).join('').padStart(32,'0').slice(-32); // Use slice(-32)
+    }
+    else{
+        miiBin += "11111111".repeat(4);//FF FF FF FF, completely nonsense System ID if none is set
     }
-    miiBin += miiId;
-    miiBin += "11111111".repeat(4);//System ID
     miiBin += mii.face.type.toString(2).padStart(3, "0");
     miiBin += mii.face.color.toString(2).padStart(3, "0");
     miiBin += mii.face.feature.toString(2).padStart(4, "0");
@@ -1315,7 +1315,7 @@ async function writeWiiBin(jsonIn, outPath) {
     miiBin += mii.mouth.yPosition.toString(2).padStart(5, "0");
     miiBin += mii.glasses.type.toString(2).padStart(4, "0");
     miiBin += mii.glasses.color.toString(2).padStart(3, "0");
-    miiBin += "0";
+    miiBin += "0";//Invalidates Mii when set to 1
     miiBin += mii.glasses.size.toString(2).padStart(3, "0");
     miiBin += mii.glasses.yPosition.toString(2).padStart(5, "0");
     miiBin += mii.beard.mustache.type.toString(2).padStart(2, "0");
@@ -1359,26 +1359,39 @@ async function write3DSQR(miiJson, outPath, returnBin, fflRes = getFFLRes()) {
 
     //Make the binary
     var mii = miiJson;
-    var miiBin = "00000011";
+    var miiBin = "00000011";//Mii version, which for 3DS is 3
     //If Special Miis are being used improperly, fix it and warn the user
     if (mii.meta.type.toLowerCase() === "special" && (mii.console.toLowerCase() === "wii u" || mii.console.toLowerCase() === "wiiu")) {
         mii.meta.type = "Default";
-        console.warn("Wii Us do not work with Special Miis. Reverted to Default Mii.");
+        console.warn("Wii Us do not work with Special Miis. Reverted output to Default Mii.");
     }
     if (mii.perms.sharing && mii.meta.type === "Special") {
         mii.perms.sharing = false;
         console.warn("Cannot have Sharing enabled for Special Miis. Disabled Sharing in the output.");
     }
-    miiBin += "0000000";
+    //Revisit this if translating MiiJS out of English ever, for now this is fine
+    miiBin += "0000000";//00 JPN/US/EUR, 01 CHN, 10 KOR, 11 TWN Character Set | Region Lock Off 00 | Profanity Flag 0/1
     miiBin += mii.perms.copying ? "1" : "0";
     miiBin += "00000000";
     miiBin += "00110000";
-    miiBin += "1000101011010010000001101000011100011000110001100100011001100110010101100111111110111100000001110101110001000101011101100000001110100100010000000000000000000000".slice(0, 8 * 8);
+    if(mii.meta.systemId){
+        miiBin += mii.meta.systemId.replaceAll(' ','').match(/.{1,2}/g).map(b=>parseInt(b,16).toString(2).padStart(8,'0')).join('').padStart(64,'0').slice(-64); // Use slice(-64)
+    }
+    else{
+        //Donor System ID
+        miiBin += "1000101011010010000001101000011100011000110001100100011001100110010101100111111110111100000001110101110001000101011101100000001110100100010000000000000000000000";
+    }
     miiBin += mii.meta.type === "Special" ? "0" : "1";
-    miiBin += "0000000";
-    for (var i = 0; i < 3; i++) {
-        miiBin += Math.floor(Math.random() * 255).toString(2).padStart(8, "0");
+    miiBin += "001";
+    let temp = '';
+    if (mii.meta.miiId) {
+        // Convert Mii ID to binary
+        temp += mii.meta.miiId.replaceAll(' ', '').match(/.{1,2}/g).map(b => parseInt(b, 16).toString(2).padStart(8, '0')).join('');
+    } else {
+        // Number of 2-second intervals since Jan 1, 2010
+        temp += Math.floor((Date.now() - Date.UTC(2010, 0, 1)) / 2000).toString(2);
     }
+    miiBin += temp.padStart(32, '0').slice(-27); // Take rightmost 27 bits
     miiBin += "0000000001000101011101100000001110100100010000000000000000000000";
     miiBin += mii.general.birthday.toString(2).padStart(5, "0").slice(2, 5);
     miiBin += mii.general.birthMonth.toString(2).padStart(4, "0");
@@ -1686,7 +1699,7 @@ function makeChild(parent0, parent1, options) {
         delete child.stages[iStage].stages;//Because we're just cloning the baseline object repeatedly to make the stages a little bit cleaner, we need to clear this on subsequent clones
     }
 
-    //If this looks odd, it is setup in a specific way to mimic the research I did into hair generation as 1:1 as possible
+    //Basically there's a random chance for a hairstyle to not advance throughout the years, so it's possible to end up with a hairstyle from a younger stage. This is slightly more likely for boys than girls.
     let ageGroup = 0;
     for (let iHairStage = 0; iHairStage < 4; iHairStage++) {
         const subgroup = childGenTables.hairStyleGroups[hairGroupIndex][ageGroup];
@@ -1716,25 +1729,8 @@ function makeChild(parent0, parent1, options) {
                 child.stages[5].hair.type = hairType;
             break;
         }
-        if (child.stages[0].general.gender === 0) {
-            if (iHairStage === 0) {
-                ageGroup = Math.min(ageGroup + 1, 3);
-            }
-            else {
-                if (Math.floor(Math.random() * 3) !== 0) {
-                    ageGroup = Math.min(ageGroup + 1, 3);
-                }
-            }
-        }
-        else {
-            if (iHairStage === 0) {
-                ageGroup = Math.min(ageGroup + 1, 3);
-            }
-            else {
-                if (Math.floor(Math.random() * 4) !== 0) {
-                    ageGroup = Math.min(ageGroup + 1, 3);
-                }
-            }
+        if (iHairStage === 0 || Math.floor(Math.random() * (child.stages[0].general.gender === 0 ? 3 : 4)) !== 0) {//For each stage of life there is a 33% chance for boys, and a 25% chance for girls, of staying on the same hairstyle as they had already. However, they are guaranteed to never have the same hairstyle stage as their newborn stage.
+            ageGroup = Math.min(ageGroup + 1, 3);
         }
     }
     return child.stages;
@@ -1898,7 +1894,6 @@ function miiWeightToRealWeight(heightInches, miiWeight) {
 
     This is approximate, not guaranteed accurate nor intended to be taken that way. This is for entertainment value only.
     */
-    if (!heightInches || heightInches < 0) throw new Error("heightInches must be >= 0");
     const H = miiHeightToMeasurements(heightInches).totalInches;
     const BMI = bmiFromWeightSlider(miiWeight);
     return {
@@ -1907,8 +1902,6 @@ function miiWeightToRealWeight(heightInches, miiWeight) {
     };
 }
 function imperialHeightWeightToMiiWeight(heightInches, weightLbs) {
-    if (!heightInches || heightInches < 0) throw new Error("heightInches must be >= 0");
-
     const H = miiHeightToMeasurements(heightInches).totalInches;
     const BMI = weightLbs * 703 / (H * H);
 
@@ -1922,8 +1915,6 @@ function imperialHeightWeightToMiiWeight(heightInches, weightLbs) {
 function metricHeightWeightToMiiWeight(heightCentimeters, weightKilograms) {
     const heightInches = Math.round(heightCentimeters / 2.54);
     const weightLbs = Math.round(weightKilograms / 0.4535924);
-    if (!heightInches || heightInches < 0) throw new Error("heightCentimeters must be >= 0");
-
     const H = miiHeightToMeasurements(heightInches).totalInches;
     const BMI = weightLbs * 703 / (H * H);
 
@@ -1935,6 +1926,25 @@ function metricHeightWeightToMiiWeight(heightCentimeters, weightKilograms) {
     }
 }
 
+function miiIdToTimestamp(miiId, mode){
+    miiId = miiId.replaceAll(' ', '');
+    const idBigInt = BigInt('0x' + miiId);
+    
+    switch(mode.toLowerCase().replaceAll(' ', '')){
+        case "3ds":
+        case "wiiu":
+            const seconds3ds = (idBigInt & 0x0FFFFFFFn) * 2n;
+            return new Date(Number(BigInt(Date.UTC(2010, 0, 1)) + seconds3ds * 1000n));
+        
+        case "wii":
+            // Extract bits 0-27 (28 bits), multiply by 4 for seconds
+            const secondsWii = (idBigInt & 0x0FFFFFFFn) * 4n;
+            return new Date(Number(BigInt(Date.UTC(2006, 0, 1)) + secondsWii * 1000n));
+        
+        default:
+            return "No valid mode specified";
+    }
+}
 
 
 module.exports = {
@@ -1972,6 +1982,8 @@ module.exports = {
     imperialHeightWeightToMiiWeight,
     metricHeightWeightToMiiWeight,
 
+    miiIdToTimestamp,
+
     /*
     Handle Amiibo Functions
     insertMiiIntoAmiibo(amiiboDump, decrypted3DSMiiBuffer),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miijs",
-  "version": "2.4.1",
+  "version": "2.5.0",
   "description": "The most complete and easy to use Mii library on the market.",
   "main": "index.js",
   "scripts": {