silphscope 1.3.1 → 1.3.2

package/README.md

@@ -1,5 +1,9 @@
 still a WIP however hopefully with some more work I can get this into a workable state...
 
+(Even Newer!) Update:
+
+moves now work... kinda... still working on getting it all the way done but it mostly works!
+
 (Newer!) Update:
 
 still a WIP :p but erm you can extract more graphics!
@@ -21,10 +25,11 @@ await renderAllGraphics(rom, {
     outputMonDir: "./Assets/monImages", // must I explain?
     outputIconDir: "./Assets/Icons", // same thing here :p
     outputTrainerDir: "./Assets/Trainers", // ...
+    outputMoveDir: "./Assets/Moves"
 });
 ```
 
-Of course though the above is for extracting all graphics (which is kinda a lie... In reality it only extracts mon images, item icons, and trainer images... but like I said this is a WIP :p so wait a bit please!).
+Of course though the above is for extracting all graphics (which is kinda a lie... In reality it only extracts mon images, item icons, trainer images, and move images... but like I said this is a WIP :p so wait a bit please!).
 
 But if you want say just the mon images or item icons refer below:
 
@@ -62,4 +67,15 @@ await renderAllTrainers(rom, {
     outputDir: "./Assets/trainers", // more stuff
     trainerBackPics: true, // renders the like 8 trainer back pics
 })
+```
+
+move image extraction:
+```JavaScript
+import fs from "fs";
+import { renderAllMoves } from "silphscope" // :O
+
+const rom = fs.readFileSync("pokefirered.gba") // stuff stuff stuff (more stuff!)
+await renderAllMoves(rom, {
+    outputDir: "./Assets/trainers", // (incredibly) more stuff
+})
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "silphscope",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "A firered/leafgreen ROM asset extractor for use in web applications",
   "main": "main.js",
   "exports": {

package/src/graphics/graphics-extractor-main.js

@@ -104,6 +104,7 @@ export async function renderAllMoves(rom, options = {}) {
     const {
         moves: providedMoves = moves,
         outputDir = "./out",
+        renderMasterImage = true,
     } = options;
 
     fs.mkdirSync(outputDir, { recursive: true });
@@ -112,7 +113,10 @@ export async function renderAllMoves(rom, options = {}) {
     const reader = new RomReader(rom, config);
 
     for (const moveName of Object.keys(providedMoves)) {
-        await renderMove(moveName, providedMoves, reader, rom, { outputDir });
+        await renderMove(moveName, providedMoves, reader, rom, { 
+            outputDir,
+            renderMasterImage, 
+        });
         console.log(`Done: ${moveName}`);
     }
 }
@@ -146,6 +150,7 @@ export async function renderAllGraphics(rom, options = {}) { // eventually I wil
 
     await renderAllMoves(rom, {
         outputDir: outputMoveDir,
+        renderMasterImage: true,
     })
 }
 

package/src/graphics/moves/render-moves.js

@@ -37,7 +37,8 @@ const extractFrameFromImage = (imageData, fullWidth, frameData) => { // in theor
 
 export async function renderMove(moveName, moves, reader, rom, options = {}) {
     const {
-        outputDir = null
+        outputDir = null,
+        renderMasterImage = false,
     } = options;
     if (!rom || !(rom instanceof Uint8Array || Buffer.isBuffer(rom))) {
         throw new TypeError("renderMove(..., rom) requires a ROM Buffer/Uint8Array");
@@ -69,7 +70,12 @@ export async function renderMove(moveName, moves, reader, rom, options = {}) {
     if (outputDir) { // I will update this later but in theory it should also work... eventually though it will need a split inside to handle full image generation :p
         const dir = `${outputDir}/${moveName}`;
         if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
-
+        if (renderMasterImage) {
+            const png = new PNG({ width, height });
+            png.data = image;
+            const pngBuffer = await streamToBuffer(png.pack());
+            fs.writeFileSync(`${dir}/master.png`, pngBuffer);
+        }
         for (let i = 0; i < move.frames.length; i++) {
             const frame = move.frames[i];
             const frameImageData = extractFrameFromImage(image, width, frame);