asm writing for mapmacos

Author: kirjavascript

CHANGELOG

@@ -3,6 +3,7 @@
 ## [unreleased]
 - Assembler now uses AS Macro Assembler for full macro support
 - MapMacros.asm definitions added
+- Custom ASM output support added
 - Make (de)compression threaded
 - Change DPLC limit to 255
 - Fix issue where image data would be cached incorrectly

TODO

@@ -12,11 +12,8 @@
 
 
 macros for mappings
-    specify mapmacros in definition
-    format hooks for defining asm output
-    define macro files in script??
-    fix prelude
     perf
+    autoload mapping label if blank
 
 redo tile rendering
 remove rotsprite

app/components/file/file-object.js

@@ -198,7 +198,13 @@ export const FileObject = observer(({ obj }) => {
                 await fs.writeFile(path, writeBIN(dplcs));
             } else {
                 const label = obj.dplcs.label || 'DPLC_' + uuid().slice(0, 4);
-                await fs.writeFile(path, writeASM(label, dplcs));
+                const asmOutput = script.generateDPLCsASM({
+                    label,
+                    listing: dplcs,
+                    sprites: environment.sprites,
+                });
+
+                await fs.writeFile(path, asmOutput);
             }
         });
     }
@@ -317,7 +323,7 @@ export const FileObject = observer(({ obj }) => {
                 </div>
             )}
 
-            {script.PLCs && (
+            {script.DPLCs && (
                 <>
                     <div className="menu-item" onClick={toggleDPLCs}>
                         <Item>DPLCs Enabled</Item>

app/formats/scripts/run-script.js

@@ -373,7 +373,7 @@ paddingSoFar		set paddingSoFar+1
         }
 
         if (writeDPLCsArgs[0]) {
-            asm.writeDPLCs = writeDPLCs[0];
+            asm.writeDPLCs = writeDPLCsArgs[0];
         }
     }
 
@@ -403,8 +403,19 @@ paddingSoFar		set paddingSoFar+1
         });
     };
 
-    exports.generateDPLCsASM = function() {
+    exports.generateDPLCsASM = function({
+        label,
+        sprites,
+        listing,
+    }) {
+        if (!asm.writeDPLCs) {
+            return writeASM(label, listing);
+        }
 
+        return asm.writeDPLCs({
+            label, sprites, listing,
+            renderHex,
+        });
     };
 
     return exports;

package.json

@@ -1,5 +1,5 @@
 {
-    "version": "1.2.2",
+    "version": "1.3.0",
     "scripts": {
         "start": "electron ./static --dev"
     },

scripts/Sonic 1.js

@@ -78,4 +78,71 @@ SonicMappingsVer := 1
 SonicDplcVer = 1
     `);
     importScript('MapMacros.asm');
+
+    writeMappings(({ label, sprites, renderHex }) => {
+        const list = [];
+
+        list.push(`${label}: mappingsTable`);
+        sprites.forEach((_, i) => {
+	        list.push(`\tmappingsTableEntry.w\t${label}_${i}`);
+        });
+        list.push('');
+
+        sprites.forEach((sprite, i) => {
+            list.push(`${label}_${i}:\tspriteHeader`);
+
+            sprite.mappings.forEach(mapping => {
+                const pieceInfo = [
+                    mapping.left,
+                    mapping.top,
+                    mapping.width,
+                    mapping.height,
+                    mapping.art,
+                    mapping.hflip,
+                    mapping.vflip,
+                    mapping.palette,
+                    mapping.priority,
+                ].map(renderHex).join(', ');
+
+                list.push(` spritePiece ${pieceInfo}`);
+            });
+
+            list.push(`${label}_${i}_End`);
+            list.push('');
+        });
+
+        list.push('\teven');
+
+        return list.join('\n');
+    });
+
+    writeDPLCs(({ label, sprites, renderHex }) => {
+        const list = [];
+
+        list.push(`${label}: mappingsTable`);
+        sprites.forEach((_, i) => {
+	        list.push(`\tmappingsTableEntry.w\t${label}_${i}`);
+        });
+        list.push('');
+
+        sprites.forEach((sprite, i) => {
+            list.push(`${label}_${i}:\tdplcHeader`);
+
+            sprite.dplcs.forEach(dplc => {
+                const pieceInfo = [
+                    dplc.size,
+                    dplc.art,
+                ].map(renderHex).join(', ');
+
+                list.push(` dplcEntry ${pieceInfo}`);
+            });
+
+            list.push(`${label}_${i}_End`);
+            list.push('');
+        });
+
+        list.push('\teven');
+
+        return list.join('\n');
+    });
 });

scripts/Sonic 2.js

@@ -83,7 +83,7 @@ dplcs([
     ],
 ]);
 
-asm(({ addScript, importScript, writeMappings }) => {
+asm(({ addScript, importScript, writeMappings, writeDPLCs }) => {
     addScript(`
 SonicMappingsVer := 2
 SonicDplcVer = 2
@@ -95,7 +95,7 @@ SonicDplcVer = 2
 
         list.push(`${label}: mappingsTable`);
         sprites.forEach((_, i) => {
-	        list.push(`\tmappingsTableEntry.w\tMap_Sonic_${i}`);
+	        list.push(`\tmappingsTableEntry.w\t${label}_${i}`);
         });
         list.push('');
 
@@ -126,4 +126,34 @@ SonicDplcVer = 2
 
         return list.join('\n');
     });
+
+    writeDPLCs(({ label, sprites, renderHex }) => {
+        const list = [];
+
+        list.push(`${label}: mappingsTable`);
+        sprites.forEach((_, i) => {
+	        list.push(`\tmappingsTableEntry.w\t${label}_${i}`);
+        });
+        list.push('');
+
+        sprites.forEach((sprite, i) => {
+            list.push(`${label}_${i}:\tdplcHeader`);
+
+            sprite.dplcs.forEach(dplc => {
+                const pieceInfo = [
+                    dplc.size,
+                    dplc.art,
+                ].map(renderHex).join(', ');
+
+                list.push(` dplcEntry ${pieceInfo}`);
+            });
+
+            list.push(`${label}_${i}_End`);
+            list.push('');
+        });
+
+        list.push('\teven');
+
+        return list.join('\n');
+    });
 });