silphscope 1.2.20 → 1.2.22

package/package.json

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

package/rom-configs/firered.js

@@ -11,5 +11,10 @@ export const firered = {
         monIconPaletteIndices: 0x3D3E80,
         monIconPaletteTable: 0x3D4038,
         monFootprintTable: 0x43FAB0,
+        trainerFrontPicTable: 0x23957C,
+        trainerFrontPicPaletteTable: 0x239a1C,
+        trainerBackPicTable: 0x239FA4,
+        trainerBackPicPaletteTable: 0x239FD4,
+        itemIconTable: 0x09899C, // so this was very hard to find since it isn't labeled in the .map of ROMs... luckily Ghidra and the ROM decomps exist so that helped a ton... issue is I believe this contains both the palette and gfx in each listing (should probably double check pokefirered to confirm...) so it will be interesting to extract assets I suppose...
     } // if this works out... well hehe... :D
 }

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

@@ -28,7 +28,6 @@ export async function renderAllMons(rom, options = {}) {
     }
 
     const {
-        assets: providedAssets = assets,
         mons: providedMons = mons,
         outputDir = "./out",
         icon = true,
@@ -41,28 +40,28 @@ export async function renderAllMons(rom, options = {}) {
     const reader = new RomReader(rom, config);
 
     for (const monName of Object.keys(providedMons)) {
-        await renderMon(monName, providedMons, providedAssets, reader, rom, {
+        await renderMon(monName, providedMons, reader, rom, {
             side: "front",
             variant: "normal",
             icon,
             footprint,
             outputDir,
         });
-        await renderMon(monName, providedMons, providedAssets, reader, rom, {
+        await renderMon(monName, providedMons, reader, rom, {
             side: "front",
             variant: "shiny",
             icon: false,
             footprint: false,
             outputDir,
         });
-        await renderMon(monName, providedMons, providedAssets, reader, rom, {
+        await renderMon(monName, providedMons, reader, rom, {
             side: "back",
             variant: "normal",
             icon: false,
             footprint: false,
             outputDir,
         });
-        await renderMon(monName, providedMons, providedAssets, reader, rom, {
+        await renderMon(monName, providedMons, reader, rom, {
             side: "back",
             variant: "shiny",
             icon: false,
@@ -86,8 +85,11 @@ export async function renderAllIcons(rom, options = {}) {
 
     fs.mkdirSync(outputDir, { recursive: true });
 
+    const config = getRomConfig(rom);
+    const reader = new RomReader(rom, config);
+
     for (const itemName of Object.keys(providedIcons)) {
-        await renderIcon(itemName, providedIcons, providedAssets, rom, { outputDir });
+        await renderIcon(itemName, providedIcons, providedAssets, reader, rom, { outputDir });
         console.log(`Done: ${itemName}`);
     }
 }

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

@@ -5,6 +5,7 @@ import { extract } from "../extract.js";
 import { PNG } from "pngjs";
 import fs from "fs";
 import { render4bppImage } from "../render-4bpp-image.js";
+import { resolveItemIconObject } from "./resolvers/item-icons-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 renderIcon(itemName, items, assets, rom, options = {}) {
+export async function renderIcon(itemName, items, assets, reader, rom, options = {}) {
     const { outputDir = null } = options;
 
     if (!rom || !(rom instanceof Uint8Array || Buffer.isBuffer(rom))) {
@@ -25,8 +26,8 @@ export async function renderIcon(itemName, items, assets, rom, options = {}) {
         throw new Error(`Missing Item: ${itemName}`);
     }
 
-    const iconPal = assets.find(a => a.name === item.palette);
-    const iconPic = assets.find(a => a.name === item.icon);
+    const iconPal = resolveItemIconObject(item, reader, itemName, "pal");
+    const iconPic = resolveItemIconObject(item, reader, itemName, "gfx");
     if (!iconPal || !iconPic) {
         throw new Error(`Missing assets for: ${itemName}`);
     }

package/src/graphics/icons/resolvers/item-icons-resolver.js

@@ -0,0 +1,22 @@
+export function resolveItemIconObject(item, reader, itemName, gfxOrPal) {
+    const table = reader.getTable("itemIconTable");
+    const entrySize = 8; // why did I make this variable... hmmm... I really can't remember... eh it doesn't do any harm other than being kinda useless since we could just pass 8 as is...
+    const entryOffset = table + item.index * entrySize;
+    const iconPtr = reader.readPointer(entryOffset);
+    const palettePtr = reader.readPointer(entryOffset + 4);
+    let finalPtr;
+    if (gfxOrPal === "gfx") {
+        finalPtr = iconPtr;
+        return {
+            name: `item_${itemName}_${gfxOrPal}`,
+            offset: finalPtr,
+        }
+    } else if (gfxOrPal === "pal") {
+        finalPtr = palettePtr;
+        return {
+            name: `item_${itemName}_${gfxOrPal}`,
+            offset: finalPtr,
+            size: 40, // this might be extremely dumb... or! It might just work... idk lol (I mean its worked so far so...)
+        }
+    }
+}

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

@@ -28,7 +28,7 @@ export async function renderMonFoot(monName, mons, reader, rom, options = {}) {
 
     if (monName.includes("UNOWN")) return;
 
-    const footAsset = resolveMonFootprint(mon, reader); // possibly the easiest change ive had to do if it works first try :o
+    const footAsset = resolveMonFootprint(mon, reader, monName); // 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/render-mon-icon.js

@@ -27,8 +27,8 @@ export async function renderMonIcon(monName, mons, reader, rom, options = {}) {
         throw new Error(`Missing mon entry for ${monName}`);
     }
 
-    const iconAsset = resolveMonIcon(mon, reader);
-    const iconPalette = resolveMonIconPalette(mon, reader);
+    const iconAsset = resolveMonIcon(mon, reader, monName);
+    const iconPalette = resolveMonIconPalette(mon, reader, monName);
     if (!iconAsset || !iconPalette) throw new Error(`Missing icon asset for ${monName}`);
 
     const iconData = extract(iconAsset, rom);

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

@@ -17,7 +17,7 @@ const streamToBuffer = (stream) => new Promise((resolve, reject) => {
     stream.on("error", reject);
 });
 
-export async function renderMon(monName, mons, assets, reader, rom, options = {}) {
+export async function renderMon(monName, mons, reader, rom, options = {}) {
     const {
         side = "front",
         variant = "normal",
@@ -42,8 +42,8 @@ export async function renderMon(monName, mons, assets, reader, rom, options = {}
         throw new Error(`Missing mon: ${monName}`);
     }
 
-    const monPic = resolveMonSprite(mon, reader, side); // I wonder if this will work :O
-    const monPal = resolveMonPalette(mon, reader, variant);
+    const monPic = resolveMonSprite(mon, reader, monName, side); // I wonder if this will work :O
+    const monPal = resolveMonPalette(mon, reader, monName, variant);
 
     if (!monPic || !monPal) {
         throw new Error(`Missing assets for: ${monName}`);

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

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

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

@@ -1,11 +1,11 @@
-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
+export function resolveMonIconPalette(mon, reader, monName) { // 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 entryOffset = paletteTable + paletteIndex * 8;
     const palettePtr = reader.readPointer(entryOffset);
     return {
-        name: `mon_${mon.name}_icon_palette`,
+        name: `mon_${monName}_icon_palette`,
         offset: palettePtr,
         size: 32,
     };

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

@@ -1,4 +1,4 @@
-export function resolveMonIcon(mon, reader) {
+export function resolveMonIcon(mon, reader, monName) {
     const table = reader.getTable("monIconTable");
     const entryOffset = table + mon.index * 4;
     const ptr = reader.readPointer(entryOffset);

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

@@ -1,4 +1,4 @@
-export function resolveMonPalette(mon, romReader, variant) {
+export function resolveMonPalette(mon, romReader, monName, variant) {
     const tableName = variant === "shiny"
         ? "monShinyPalettes"
         : "monPalettes";
@@ -6,7 +6,7 @@ export function resolveMonPalette(mon, romReader, variant) {
         const entryOffset = table + mon.index * 8;
         const ptr = romReader.readPointer(entryOffset);
         return {
-            name: `mon_${mon.name}_${variant}_palette`,
+            name: `mon_${monName}_${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

@@ -4,7 +4,7 @@
 // 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) {
+export function resolveMonSprite(mon, romReader, monName, side) {
     const tableName = side === "back"
         ? "monBackSprites"
         : "monFrontSprites";
@@ -12,7 +12,7 @@ export function resolveMonSprite(mon, romReader, side) {
     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
+        name: `mon_${monName}_${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/icon-data-parser.js

@@ -5,6 +5,7 @@ const itemIconDataMap = path.resolve("../item_graphics/item_icon_table.h");
 const iconDataLines = fs.readFileSync(itemIconDataMap, "utf-8").split("\n");
 
 const itemData = {};
+let itemIndex = 0;
 
 for (let i = 0; i < iconDataLines.length; i++) {
     const match = iconDataLines[i].match(/\[(ITEMS?_[A-Z0-9_]+)\]\s*=\s*\{\s*([^,]+),\s*([^}]+)\}/);
@@ -17,6 +18,10 @@ for (let i = 0; i < iconDataLines.length; i++) {
         if (!itemData[itemName]) {
             itemData[itemName] = {};
         }
+        if (!itemData[itemName]["index"]) {
+            itemData[itemName]["index"] = itemIndex;
+            itemIndex++;
+        }
         itemData[itemName]["icon"] = icon;
         itemData[itemName]["palette"] = palette;
     }

package/src/trainer-data-parser.js

@@ -5,6 +5,7 @@ const trainerFrontPicMap = path.resolve("../trainer_graphics/front_pic_tables.h"
 const frontPicLines = fs.readFileSync(trainerFrontPicMap, "utf-8").split("\n");
 
 const trainerData = {};
+let trainerIndex = 0;
 
 for (let i = 0; i < frontPicLines.length; i++) {
     const match = frontPicLines[i].match(/TRAINER_(SPRITE|PAL)\(\s*([A-Z0-9_]+)\s*,\s*(gTrainer(?:FrontPic|Palette)_[A-Za-z0-9_]+)/);
@@ -18,6 +19,10 @@ for (let i = 0; i < frontPicLines.length; i++) {
         } else {
             trainerData[trainerName]["Palette"] = match[3];
         }
+        if (!trainerData[trainerName]["index"]) {
+            trainerData[trainerName]["index"] = trainerIndex;
+            trainerIndex++;
+        }
     }
 }