silphscope 1.2.17 → 1.2.19

package/package.json

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

package/rom-configs/firered.js

@@ -10,5 +10,6 @@ export const firered = {
         monIconTable: 0x3D37A0,
         monIconPaletteIndices: 0x3D3E80,
         monIconPaletteTable: 0x3D4038,
+        monFootprintTable: 0x43FAB0,
     } // if this works out... well hehe... :D
 }

package/src/graphics/extract.js

@@ -18,7 +18,9 @@ export function extract(asset, rom) {
             console.warn(`lz77 failed for ${asset.name}... treating as raw :p`);
         }
     }
-
+    if (!asset.size) {
+        throw new Error(`Attempted to read ${asset.name} however it is missing a size attribute`);
+    }
     const slice = rom.slice(start, start + asset.size);
     return { ...asset, data: slice, compressed: false };
 }

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

@@ -5,6 +5,7 @@ import { PNG } from "pngjs";
 import { extract } from "../extract.js";
 import { decode1bppTile } from "../decode-1bpp.js";
 import fs from "fs";
+import { resolveMonFootprint } from "./resolvers/mon-footprint-sprite-resolver.js";
 
 const streamToBuffer = (stream) => new Promise((resolve, reject) => {
     const chunks = [];
@@ -13,7 +14,7 @@ const streamToBuffer = (stream) => new Promise((resolve, reject) => {
     stream.on("error", reject);
 });
 
-export async function renderMonFoot(monName, mons, assets, rom, options = {}) {
+export async function renderMonFoot(monName, mons, reader, rom, options = {}) {
     const { outputDir = null } = options;
 
     if (!rom || !(rom instanceof Uint8Array || Buffer.isBuffer(rom))) {
@@ -25,9 +26,9 @@ export async function renderMonFoot(monName, mons, assets, rom, options = {}) {
         throw new Error(`Missing mon entry for ${monName}`);
     }
 
-    if (!mon.footprintPics && monName.includes("UNOWN")) return;
+    if (monName.includes("UNOWN")) return;
 
-    const footAsset = assets.find(a => a.name === mon.footprintPics);
+    const footAsset = resolveMonFootprint(mon, reader); // possibly the easiest change ive had to do if it works first try :o
     if (!footAsset) {
         throw new Error(`Missing foot asset for ${monName}`);
     }

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

@@ -0,0 +1,10 @@
+export function resolveMonFootprint(mon, reader) {
+    const table = reader.getTable("monFootprintTable");
+    const entryOffset = table + mon.index * 4;
+    const ptr = reader.readPointer(entryOffset);
+    return {
+        name: `mon_${mon.name}_footprint`,
+        offset: ptr,
+        size: 32,
+    };
+}

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

@@ -5,6 +5,7 @@ export function resolveMonIconPalette(mon, reader) { // I kinda think this might
     const entryOffset = paletteTable + paletteIndex * 8;
     const palettePtr = reader.readPointer(entryOffset);
     return {
+        name: `mon_${mon.name}_icon_palette`,
         offset: palettePtr,
         size: 32,
     };

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

@@ -1,8 +1,9 @@
 export function resolveMonIcon(mon, reader) {
     const table = reader.getTable("monIconTable");
-    const entryOffset = table + mon.index * 8;
+    const entryOffset = table + mon.index * 4;
     const ptr = reader.readPointer(entryOffset);
     return {
+        name: `mon_${mon.name}_icon`,
         offset: ptr,
         size: 1024 // idk anymore :o
     };