silphscope 1.2.8 → 1.2.10

package/main.js

@@ -1,7 +1,7 @@
 import { renderMon } from "./src/graphics/mons/render-mons.js";
 import { renderMonIcon } from "./src/graphics/mons/render-mon-icon.js";
 import { renderMonFoot } from "./src/graphics/mons/render-mon-foot.js";
-import { extract } from "./src/graphics/extract.js";
+import { extract } from "./src/graphics/extract.js"; // random message for a commit lol
 
 export { renderMon, renderMonIcon, renderMonFoot, extract };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "silphscope",
-  "version": "1.2.8",
+  "version": "1.2.10",
   "description": "A firered/leafgreen ROM asset extractor for use in web applications",
   "main": "main.js",
   "exports": {
@@ -16,7 +16,8 @@
     "mon-data/",
     "rom-maps/",
     "item-data/",
-    "trainer-data"
+    "trainer-data",
+    "rom-configs/"
   ],
   "keywords": [],
   "author": "chickenPoo",

package/rom-configs/firered.js

@@ -0,0 +1,11 @@
+// I have an idea but it needs math D:
+
+export const firered = {
+    code: "BPRE", // I find this weird... like what does BP stand for? is it: "Battle Pokemon"? no idea :o
+    tables: { // so the idea is essentially instead of a big JSON like we have now we instead just view the table graphics and build from that... it in theory could be slower because more lookups instead of direct references but it should be more maintainable...
+        monFrontSprites: 0x2350AC,
+        monBackSprites: 0x23654C,
+        monPalettes: 0x23730C,
+        monShinyPalettes: 0x2380CC
+    } // if this works out... well hehe... :D
+}

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

@@ -7,7 +7,8 @@ import { extract } from "../extract.js";
 import { renderMonIcon } from "./render-mon-icon.js";
 import { renderMonFoot } from "./render-mon-foot.js";
 import { render4bppImage } from "../render-4bpp-image.js";
-import { resolveMonFrontSprite } from "./resolvers/mon-front-sprite-resolver.js";
+import { resolveMonSprite } from "./resolvers/mon-sprite-resolver.js";
+import { resolveMonPalette } from "./resolvers/mon-sprite-palette-resolver.js";
 
 const streamToBuffer = (stream) => new Promise((resolve, reject) => {
     const chunks = [];
@@ -43,15 +44,8 @@ export async function renderMon(monName, mons, assets, reader, rom, options = {}
         throw new Error(`Missing mon: ${monName}`);
     }
 
-    let monPic;
-    if (side === "front") {
-        monPic = resolveMonFrontSprite(mon, reader); // I wonder if this will work :O
-    } else {
-        const picName = mon.backPics;
-        monPic = assets.find(a => a.name === picName);
-    }
-    const palType = variant === "shiny" ? mon.shinyPalette : mon.normPalette;
-    const monPal = assets.find(a => a.name === palType);
+    const monPic = resolveMonSprite(mon, reader, side); // I wonder if this will work :O
+    const monPal = resolveMonPalette(mon, reader, variant);
 
     if (!monPic || !monPal) {
         throw new Error(`Missing assets for: ${monName}`);

package/src/graphics/mons/resolvers/mon-sprite-palette-resolver.js

@@ -0,0 +1,13 @@
+export function resolveMonPalette(mon, romReader, variant) {
+    const tableName = variant === "shiny"
+        ? "monShinyPalettes"
+        : "monPalettes";
+        const table = romReader.getTable(tableName);
+        const entryOffset = table + mon.index * 8;
+        const ptr = romReader.readPointer(entryOffset);
+        return {
+            name: `mon_${mon.name}_${variant}_palette`,
+            offset: ptr,
+            size: 40 // I hope thats right... from what I can tell all front/back pal's are 40 in size...
+        }
+}

package/src/graphics/mons/resolvers/mon-sprite-resolver.js

@@ -0,0 +1,19 @@
+// so the idea of "resolvers" is to essentially replace this line in the asset extraction:
+// const monPic = assets.find(a => a.name === picName);
+// of course though thats for the mon stuff specifically however!
+// this time instead of needing a giant lookup table we use this thingy
+// plus our rom-config to just infer all of this from the table in the ROM itself... in theory..
+
+export function resolveMonSprite(mon, romReader, side) {
+    const tableName = side === "back"
+        ? "monBackSprites"
+        : "monFrontSprites";
+    const table = romReader.getTable(tableName);
+    const entryOffset = table + mon.index * 8;
+    const ptr = romReader.readPointer(entryOffset);
+    return {
+        name: `mon_${mon.name}_${side}`, // really not needed anymore lol this was just for testing... but erm its ok for now I guess :p
+        offset: ptr
+        // just realized something... later resolvers will need a size value for assets not in need of lz77 decompressing... luckily these don't but erm... yea.. this could get slightly complicated...
+    };
+}

package/src/graphics/mons/resolvers/mon-front-sprite-resolver.js

@@ -1,15 +0,0 @@
-// so the idea of "resolvers" is to essentially replace this line in the asset extraction:
-// const monPic = assets.find(a => a.name === picName);
-// of course though thats for the mon stuff specifically however!
-// this time instead of needing a giant lookup table we use this thingy
-// plus our rom-config to just infer all of this from the table in the ROM itself... in theory..
-
-export function resolveMonFrontSprite(mon, romReader) {
-    const table = romReader.getTable("monFrontSprites");
-    const entryOffset = table + mon.index * 8;
-    const ptr = romReader.readPointer(entryOffset);
-    return {
-        name: `mon_${mon.name}_front`,
-        offset: ptr
-    };
-}