silphscope 1.2.21 → 1.2.22

package/package.json

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

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

@@ -26,8 +26,8 @@ export async function renderIcon(itemName, items, assets, reader, rom, options =
         throw new Error(`Missing Item: ${itemName}`);
     }
 
-    const iconPal = resolveItemIconObject(item, reader, "gfx");
-    const iconPic = resolveItemIconObject(item, reader, "pal");
+    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

@@ -1,4 +1,4 @@
-export function resolveItemIconObject(item, reader, gfxOrPal) {
+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;
@@ -8,13 +8,13 @@ export function resolveItemIconObject(item, reader, gfxOrPal) {
     if (gfxOrPal === "gfx") {
         finalPtr = iconPtr;
         return {
-            name: `item_${item.name}_${gfxOrPal}`,
+            name: `item_${itemName}_${gfxOrPal}`,
             offset: finalPtr,
         }
     } else if (gfxOrPal === "pal") {
         finalPtr = palettePtr;
         return {
-            name: `item_${item.name}_${gfxOrPal}`,
+            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

@@ -42,8 +42,8 @@ export async function renderMon(monName, mons, 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...
     };