silphscope 1.3.1 → 1.3.3

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/move-data/moveData.json

@@ -161,6 +161,7 @@
     "possibleFrameWidth": 64,
     "possibleFrameHeight": 64,
     "note": "so I think this image is actually 4 images slapped into one... as such to extract the image will need to be unusually large... so let me test this I guess :p of course though without image slicing for now",
+    "note2": "erm I can't really figure this out... it appears when this image was concat(ed) it got very finely mushed together... so it is kinda hard to tell where the frames are... sure the image is separated but it doesn't line up with the pret image refrences...",
     "imageSize": "64x192",
     "imageWidth": 64,
     "imageHeight": 192,
@@ -227,9 +228,12 @@
     "imageHeight": 40,
     "frameCount": 1,
     "frames": [
-      { "x": 0, "y": 0, "width": 32, "height": 40 }
+      { "x": 0, "y": 0, "width": 32, "height": 32 },
+      { "x": 0, "y": 32, "width": 16, "height": 8 },
+      { "x": 16, "y": 32, "width": 8, "height": 8 }
     ],
-    "note": "yup so this is weird :p from what I can tell the image is actually made up of a 32x32 main area then on the bottom there are 2 I think 8x16 images? I don't know :p will fix later like everything else in this repo..."
+    "note": "yup so this is weird :p from what I can tell the image is actually made up of a 32x32 main area then on the bottom there are 2 I think 8x16 images? I don't know :p will fix later like everything else in this repo...",
+    "note2": "fixed! I think..."
   },
   "TIED_BAG": {
     "index": 15,
@@ -1740,9 +1744,10 @@
     "frameCount": 2,
     "frames": [
       { "x": 0, "y": 0, "width": 8, "height": 8 },
-      { "x": 0, "y": 8, "width": 16, "height": 16 }
+      { "x": 8, "y": 0, "width": 8, "height": 16 },
+      { "x": 0, "y": 8, "width": 8, "height": 16 }
     ],
-    "note": "oh how I hate concat images... hopefully though my understaing of how they are working should result in a correct image..."
+    "note": "unless the image data itself was wrong... the resulting image was kinda weird... but this should \"fix it\" granted it is still weird..."
   },
   "ALERT": {
     "index": 75,
@@ -2324,9 +2329,9 @@
   "PENCIL_2": {
     "index": 95,
     "animTag": "ANIM_TAG_PENCIL_2",
-    "imageSize": "16x42",
+    "imageSize": "16x48",
     "imageWidth": 16,
-    "imageHeight": 42,
+    "imageHeight": 48,
     "frameCount": 3,
     "frames": [
       {
@@ -2514,7 +2519,7 @@
     "frames": [
       {
         "x": 0,
-        "y": 16,
+        "y": 0,
         "width": 16,
         "height": 16
       }
@@ -3284,7 +3289,7 @@
         "x": 0,
         "y": 0,
         "width": 16,
-        "height": 32
+        "height": 16
       }
     ],
     "unused": true
@@ -3610,19 +3615,20 @@
     "possibleFrameSize": "8x8",
     "possibleFrameWidth": 8,
     "possibleFrameHeight": 8,
-    "imageSize": "16x80",
+    "imageSize": "16x56",
     "imageWidth": 16,
-    "imageHeight": 80,
-    "frameCount": 6,
+    "imageHeight": 56,
+    "frameCount": 7,
     "frames": [
       { "x": 0, "y": 0, "width": 16, "height": 16 },
-      { "x": 0, "y": 16, "width": 8, "height": 16 },
-      { "x": 0, "y": 32, "width": 8, "height": 8 },
-      { "x": 0, "y": 40, "width": 8, "height": 8 },
-      { "x": 0, "y": 48, "width": 16, "height": 16 },
-      { "x": 0, "y": 64, "width": 8, "height": 16 }
+      { "x": 0, "y": 16, "width": 8, "height": 8 },
+      { "x": 8, "y": 16, "width": 8, "height": 8 },
+      { "x": 0, "y": 24, "width": 8, "height": 8 },
+      { "x": 8, "y": 24, "width": 8, "height": 8 },
+      { "x": 0, "y": 32, "width": 16, "height": 16 },
+      { "x": 0, "y": 48, "width": 16, "height": 8 }
     ],
-    "note": "concat images strike again! seriously though I hope this works..."
+    "note": "should be fixed... I think... if not I have to redo the math on how these strange frames are arranged..."
   },
   "ICE_SPIKES": {
     "index": 142,
@@ -5613,7 +5619,7 @@
     "imageHeight": 16,
     "frameCount": 1,
     "frames": [
-      { "x": 0, "y": 0, "width": 8, "height": 8 }
+      { "x": 0, "y": 0, "width": 16, "height": 16 }
     ]
   },
   "WHITE_FEATHER": {

package/move-data/unusedTags.json

@@ -510,9 +510,9 @@
         "note": "once again I have to open aseprite for this one... but I am too lazy to do so right now :p"
     },
     "ANIM_TAG_PENCIL_2": {
-        "imageSize": "16x42",
+        "imageSize": "16x48",
         "imageWidth": 16,
-        "imageHeight": 42,
+        "imageHeight": 48,
         "frameCount": 3,
         "frames": [
             { "x": 0, "y": 0, "width": 16, "height": 16 },
@@ -568,7 +568,7 @@
         "imageHeight": 16,
         "frameCount": 1,
         "frames": [
-            { "x": 0, "y": 16, "width": 16, "height": 16 }
+            { "x": 0, "y": 0, "width": 16, "height": 16 }
         ]
     },
     "ANIM_TAG_FANGS": {
@@ -830,7 +830,7 @@
         "imageHeight": 16,
         "frameCount": 1,
         "frames": [
-            { "x": 0, "y": 0, "width": 16, "height": 32 }
+            { "x": 0, "y": 0, "width": 16, "height": 16 }
         ]
     },
     "ANIM_TAG_MONSTER_DOLL": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "silphscope",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "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);