silphscope 1.2.29 → 1.2.31

package/package.json

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

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

@@ -87,13 +87,12 @@ export async function renderAllTrainers(rom, options = {}) {
     } = options;
 
     fs.mkdirSync(outputDir, { recursive: true });
-    const backTrainerName = Object.keys(providedBackTrainers);
 
     const config = getRomConfig(rom);
     const reader = new RomReader(rom, config);
 
     for (const trainerName of Object.keys(providedTrainers)) {
-        await renderTrainer(trainerName, providedTrainers, backTrainerName, providedBackTrainers, reader, rom, {
+        await renderTrainer(trainerName, providedTrainers, providedBackTrainers, reader, rom, {
             trainerBackPics, 
             outputDir 
         });

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

@@ -16,7 +16,7 @@ const streamToBuffer = (stream) => new Promise((resolve, reject) => {
     stream.on("error", reject);
 });
 
-export async function renderTrainer(trainerName, trainers, backTrainerName, backTrainers, reader, rom, options = {}) {
+export async function renderTrainer(trainerName, trainers, backTrainers, reader, rom, options = {}) {
     const {
         trainerBackPics = false,
         outputDir = null,
@@ -30,7 +30,16 @@ export async function renderTrainer(trainerName, trainers, backTrainerName, back
         throw new Error(`Missing Trainer: ${trainerName}`);
     }
     if (trainerBackPics) {
-        renderTrainerBackPic(backTrainerName, backTrainers, reader, rom, { outputDir });
+        const backTrainerName = backTrainers[trainerName]
+            ? trainerName
+            : false;
+        if (backTrainerName) {
+            await renderTrainerBackPic(backTrainerName, backTrainers, reader, rom, { outputDir }); // that could have been bad lol I forgot to add await :p
+        }
+        else if (backTrainerName === false && trainerName === "PAINTER") {
+            await renderTrainerBackPic("OLDMAN", backTrainers, reader, rom, { outputDir });
+            await renderTrainerBackPic("POKEDUDE", backTrainers, reader, rom, { outputDir });
+        }
     }
     const trainerPal = resolveTrainerFrontPicPal(trainer, reader, trainerName);
     const trainerPic = resolveTrainerFrontPic(trainer, reader, trainerName);

package/src/graphics/trainers/resolvers/trainer-back-pic-resolver.js

@@ -2,8 +2,15 @@ export function resolveTrainerBackPic(trainer, reader, trainerName) {
     const table = reader.getTable("trainerBackPicTable");
     const entryOffset = table + trainer.index * 8;
     const ptr = reader.readPointer(entryOffset);
+    let size;
+    if (trainerName === "RED" || trainerName === "LEAF") {
+        size = 10240;
+    } else {
+        size = 8192;
+    }
     return {
         name: `trainer_${trainerName}_back_pic`,
         offset: ptr,
+        size,
     }
 }