silphscope 1.2.9 → 1.2.11

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.9",
+  "version": "1.2.11",
   "description": "A firered/leafgreen ROM asset extractor for use in web applications",
   "main": "main.js",
   "exports": {

package/rom-configs/firered.js

@@ -6,6 +6,9 @@ export const firered = {
         monFrontSprites: 0x2350AC,
         monBackSprites: 0x23654C,
         monPalettes: 0x23730C,
-        monShinyPalettes: 0x2380CC
+        monShinyPalettes: 0x2380CC,
+        monIconTable: 0x3D37A0,
+        monIconPaletteIndices: 0x3D3E80,
+        monIconPaletteTable: 0x3D4038,
     } // if this works out... well hehe... :D
 }

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

@@ -5,6 +5,8 @@ import { extract } from "../extract.js";
 import { PNG } from "pngjs";
 import fs from "fs";
 import { render4bppImage } from "../render-4bpp-image.js";
+import { resolveMonIcon } from "./resolvers/mon-icon-resolver.js";
+import { resolveMonIconPalette } from "./resolvers/mon-icon-palette-resolver.js";
 
 const streamToBuffer = (stream) => new Promise((resolve, reject) => {
     const chunks = [];
@@ -13,7 +15,7 @@ const streamToBuffer = (stream) => new Promise((resolve, reject) => {
     stream.on("error", reject);
 });
 
-export async function renderMonIcon(monName, mons, assets, iconPalettes, rom, options = {}) {
+export async function renderMonIcon(monName, mons, reader, rom, options = {}) {
     const { outputDir = null } = options;
 
     if (!rom || !(rom instanceof Uint8Array || Buffer.isBuffer(rom))) {
@@ -25,13 +27,12 @@ export async function renderMonIcon(monName, mons, assets, iconPalettes, rom, op
         throw new Error(`Missing mon entry for ${monName}`);
     }
 
-    const iconAsset = assets.find(a => a.name === mon.Icon);
-    if (!iconAsset) throw new Error(`Missing icon asset for ${monName}`);
+    const iconAsset = resolveMonIcon(mon, reader);
+    const iconPalette = resolveMonIconPalette(mon, reader);
+    if (!iconAsset || !iconPalette) throw new Error(`Missing icon asset for ${monName}`);
 
     const iconData = extract(iconAsset, rom);
-    const palIndex = Number(mon.iconPalIndex);
-    const palSize = 32;
-    const rawIconPalData = extract(iconPalettes, rom);
+    const rawIconPalData = extract(iconPalette, rom);
     const width = 32;
     const height = 64;
 
@@ -40,8 +41,6 @@ export async function renderMonIcon(monName, mons, assets, iconPalettes, rom, op
         paletteData: rawIconPalData.data, 
         width, 
         height, 
-        paletteOffset: palIndex * palSize, 
-        paletteSize: palSize
     });
 
     const frameHeight = 32;

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 = [];
@@ -30,9 +31,7 @@ export async function renderMon(monName, mons, assets, reader, rom, options = {}
     }
 
     if (icon === true) {
-        const comboPal = assets.find(a => a.name === "gMonIconPalettes");
-        if (!comboPal) throw new Error("Missing gMonIconPalettes asset");
-        await renderMonIcon(monName, mons, assets, comboPal, rom, { outputDir });
+        await renderMonIcon(monName, mons, reader, rom, { outputDir });
     }
     if (footprint === true) {
         await renderMonFoot(monName, mons, assets, rom, { outputDir });
@@ -43,15 +42,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-icon-palette-resolver.js

@@ -0,0 +1,9 @@
+export function resolveMonIconPalette(mon, reader) { // I kinda think this might be wrong... but erm who knows :o maybe I got it right first try lol
+    const indexTable = reader.getTable("monIconPaletteIndices");
+    const paletteIndex = reader.readU8(indexTable + mon.index);
+    const paletteTable = reader.getTable("monIconPaletteTable");
+    const palettePtr = reader.readPointer(paletteTable + paletteIndex * 4);
+    return {
+        offset: palettePtr
+    };
+}

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

@@ -0,0 +1,8 @@
+export function resolveMonIcon(mon, reader) {
+    const table = reader.getTable("monIconTable");
+    const entryOffset = table + mon.index * 4;
+    const ptr = reader.readPointer(entryOffset);
+    return {
+        offset: ptr
+    };
+}

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
-    };
-}